From nobody Mon Feb 9 17:59:01 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518525026450340.61294977757746; Tue, 13 Feb 2018 04:30:26 -0800 (PST) Received: from localhost ([::1]:50675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZj4-0001rr-FC for importer@patchew.org; Tue, 13 Feb 2018 07:30:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elZHg-0004NR-1p for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elZHa-0007im-4w for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:02:04 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:54774) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elZHZ-0007iZ-Uj for qemu-devel@nongnu.org; Tue, 13 Feb 2018 07:01:58 -0500 Received: by mail-wm0-x244.google.com with SMTP id i186so15519645wmi.4 for ; Tue, 13 Feb 2018 04:01:57 -0800 (PST) Received: from 640k.lan ([82.84.102.245]) by smtp.gmail.com with ESMTPSA id f9sm6870298wmf.12.2018.02.13.04.01.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 04:01:55 -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=ReBBniFfdaIhDbXP8RXF4SyJKZVdfuVRiXzKObPZ7d4=; b=Mu5nBfCzxwhubpWdZpzcRHxoUMfylrP8UFuNyl3XFl9QsI4jQ1EFCf9Xc/TExTePP0 77qShXAm6mPMUN5tumw64gKCO33rdXrezBOJkF+uD5ZeMROPQqwVn6fMWXZeJ6tN/KtN Kji7Nxv4G8RcCFBsvn5Hq3waPWPy/qGpym23785578MXKASAGXN2OzJQ5InTYYd9Qkoz GT2d37XrhWhChWtIm0Q2FBYkDEuITrEvU1ruc9ppE/oFcqYWXsDT2AyahvsciEliqx9q HPsIeuqva/CDHTh3+bfhlQxELpY/abN3iyUJAjPaeqHppuZ/L2pF+z3do10nh491MHTC EVuw== 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=ReBBniFfdaIhDbXP8RXF4SyJKZVdfuVRiXzKObPZ7d4=; b=UQFIJfuBs6oLBxt1TZuT65RyPCqQpnjnP++DggeNKgEY8jlsMADDKdjxfHrt+i9JTt m8wb9ha0yhPco+vSQmghBaYAaT6M2RwgFdqkPOtIa4TVINsMoB6IYTr7QdiQg8e9PyoC 6o+XsBcl9/H59PnoyczRL9zMDveQ9IdrCAQGcpEty1IU9Lj19R+IpebSE8fM+vmGedNJ mhIjGtErXvGSneu4XrIJQgGTNw0fNa6lYR/IkZ1srce2fvJ8AklbuTrzSEEMHsmA74XC oJT/k1kaxX4AwF0okFi1FryEHKeNbmaGeP4dkAvDb9SbVBagpjCYdIx9EkzidY0NRud/ DXqw== X-Gm-Message-State: APf1xPAHnUDns4FdQGOxWkthfU2DsjCzep48uAXky0kPz7SqpSWLGA6y /3hK1toqIJAIat7OVXmRfnQyeB6c X-Google-Smtp-Source: AH8x2275IH2hBbq2ABsAtMWyZNPKL/JjRtkTbKAWbb+kSF261Hdgct4kEaC9sofHYnFYN00AtDg2/g== X-Received: by 10.28.118.13 with SMTP id r13mr1071932wmc.95.1518523316418; Tue, 13 Feb 2018 04:01:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Feb 2018 13:00:26 +0100 Message-Id: <1518523252-49106-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> References: <1518523252-49106-1-git-send-email-pbonzini@redhat.com> 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: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 22/48] 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Message-Id: <20180208164818.7961-10-f4bug@amsat.org> --- 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 6455648..def1c7f 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 @@ -185,7 +187,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 491e624..f22ed91 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -58,6 +58,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 1.8.3.1