From nobody Wed Feb 11 05:35:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516674069328447.7936338875378; Mon, 22 Jan 2018 18:21:09 -0800 (PST) Received: from localhost ([::1]:55347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edoCy-00067D-GS for importer@patchew.org; Mon, 22 Jan 2018 21:21:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edo1L-0005Y2-HA for qemu-devel@nongnu.org; Mon, 22 Jan 2018 21:09:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edo1K-0003Xy-Ia for qemu-devel@nongnu.org; Mon, 22 Jan 2018 21:09:07 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edo1K-0003Xg-DK for qemu-devel@nongnu.org; Mon, 22 Jan 2018 21:09:06 -0500 Received: by mail-qt0-x241.google.com with SMTP id a27so12960368qtd.1 for ; Mon, 22 Jan 2018 18:09:06 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id j19sm6514120qtc.1.2018.01.22.18.09.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 18:09:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4HDmHK5RhF3x53gUKSJbYBh6oZfLUkRElggYLz/alBg=; b=mBE2Tdq1iw9CS95pr5rZwsLvoXorIN7LYMUn/oonIi7Vvdvd1VWEYa64hXjL2bl/eC z0R43LsJNAaa2+6AqopDKkmttHruYpnkUW+1jCTroTutDxr3jwAZh/2ukiyyDVRCgROH Kh4FWaMkcKxBwhJQIB15ccFzuTURQdCjsJSgiwmHTBSVzlABoRLJcuilxnec7aB1IhH2 ax7nrqsvI/X/g3Iv5nhtVHWr1+LPAOGpzVrOvSqBdmLCnAGVzBn7pobuQwFk9JZiZvez fKqE9sJrQu0sk8cIA9/aIaegLDCVqxVaNZQ7weeaLpZ6Fxa/BtxAGBp/ooacowjZCZzH ouGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4HDmHK5RhF3x53gUKSJbYBh6oZfLUkRElggYLz/alBg=; b=b5jc7XQ0haa/bnZumGJtjTXhtYP0gcXElAc12dzmrfGyPlglvTMHQPIbZMRTIQpFpr D6C40J0CZ2FY+T2ECGZiYD3vfH5VQ0seGca0Z1O04WCbHhxLMBLlQdfGYHDHyKz7sCUf GzYgmB6Ge+NEdax+6tr0YjE9kX8DJRbLupyyg6JjHk3z0h9vQnhZ5d4HP60n9DAoZ4hK QH62z7nEUKuh0WqpYxfHv2DpRnKbidEtqdqlYbWA4pqnsCdCnjYUzJLWb13ccNew49vC nVOBs1uMdkIiGZ98qV0KXjz66lyF66SRjZOOLEV8bmaEpc1gk0nQau6QcyjU/qfUnig1 lTLQ== X-Gm-Message-State: AKwxytfruoxRu1zkAaco9fgbljBLV93IQPrn1oTAmosSXxQHCR6y/YXb j6zF4muYzbQSbCG2KWQkAc8= X-Google-Smtp-Source: AH8x2245g/kzPMogDDqJYB4DNcm7CrPG9YAmT2RcT81rrctvioyjO1VW5pfh+NIrv/R4a/dMLJIRiA== X-Received: by 10.55.82.197 with SMTP id g188mr1406972qkb.335.1516673346038; Mon, 22 Jan 2018 18:09:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell , Stefan Hajnoczi Date: Mon, 22 Jan 2018 23:08:13 -0300 Message-Id: <20180123020820.1288-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123020820.1288-1-f4bug@amsat.org> References: <20180123020820.1288-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v9 09/16] sdhci: simplify sdhci_get_fifolen() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Marcel Apfelbaum Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 4 +++- hw/sd/sdhci.c | 20 +++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index b7751c815f..577ca9da54 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -24,6 +24,8 @@ #ifndef SDHCI_INTERNAL_H #define SDHCI_INTERNAL_H =20 +#include "hw/registerfields.h" + /* R/W SDMA System Address register 0x0 */ #define SDHC_SYSAD 0x00 =20 @@ -179,7 +181,7 @@ #define SDHC_CAN_DO_ADMA2 0x00080000 #define SDHC_CAN_DO_ADMA1 0x00100000 #define SDHC_64_BIT_BUS_SUPPORT (1 << 28) -#define SDHC_CAPAB_BLOCKSIZE(x) (((x) >> 16) & 0x3) +FIELD(SDHC_CAPAB, MAXBLOCKLENGTH, 16, 2); =20 /* HWInit Maximum Current Capabilities Register 0x0 */ #define SDHC_MAXCURR 0x48 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 1c781c4ba5..dce1a49af1 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -59,6 +59,11 @@ */ #define SDHC_CAPAB_REG_DEFAULT 0x057834b4 =20 +static inline unsigned int sdhci_get_fifolen(SDHCIState *s) +{ + return 1 << (9 + FIELD_EX32(s->capareg, SDHC_CAPAB, MAXBLOCKLENGTH)); +} + static uint8_t sdhci_slotint(SDHCIState *s) { return (s->norintsts & s->norintsigen) || (s->errintsts & s->errintsig= en) || @@ -1118,21 +1123,6 @@ static const MemoryRegionOps sdhci_mmio_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 -static inline unsigned int sdhci_get_fifolen(SDHCIState *s) -{ - switch (SDHC_CAPAB_BLOCKSIZE(s->capareg)) { - case 0: - return 512; - case 1: - return 1024; - case 2: - return 2048; - default: - hw_error("SDHC: unsupported value for maximum block size\n"); - return 0; - } -} - static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) { if (s->sd_spec_version !=3D 2) { --=20 2.15.1