From nobody Sun Oct 26 00:02:38 2025 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 1516279270243382.07539324103664; Thu, 18 Jan 2018 04:41:10 -0800 (PST) Received: from localhost ([::1]:56268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ec9VA-0006Yn-Qn for importer@patchew.org; Thu, 18 Jan 2018 07:41:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ec9NJ-000054-Bx for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ec9NH-0007D8-So for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:57 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:37252) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ec9NH-0007Cr-Mc for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:55 -0500 Received: by mail-qt0-x242.google.com with SMTP id d54so17652401qtd.4 for ; Thu, 18 Jan 2018 04:32:55 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id s12sm4489623qke.4.2018.01.18.04.32.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 04:32:54 -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=oWdogtoHfdx0bPP+5J0o2DRWbZfHXgiJyj8Wk7i/pwk=; b=DSduI5el0oZySwVLb0FSKsWyVIPXwLFnr9MYQG9rHhoCkWQpiA5FcLPxWwPvB3V4QR 6kNh0WKIl+NlC8quBx1A+iQYBW2On5XtuhIhJT/NIVcZLpxGFdz5M3i6Ev4wsDc9dEAM E9x6s3VGt5J0bUhfZ2kCTVtvnvFkUxkpJ9oVcMv4/lmJD9oK2pkwONB5LEF7C0HmxzWe yq4dvbyOi4IzLVHjZnnvjTqjkPktNtErpXDKSj6Z7TNh6iZYez3Kz/btMeaaHxM07p1c EUatK7icQYp0TTo5BsyPHEm0bXRUypCVb41GYkoWh3gYOECRC3x1yb4pS6MCtNNzFLRf JM4w== 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=oWdogtoHfdx0bPP+5J0o2DRWbZfHXgiJyj8Wk7i/pwk=; b=Jw4lL6mENP81xpY09nisxRnbl/RlwCfhymNJP7EWQfmfnJPGUSYZcl95Q/wRQrq9Q3 Z3Hf6zpkpjd6tVPTOX5J/ar0wczosiJuGXq58+BubYWdyt74tK8m3VBugnYtCdJYPNk0 ZDO1HM/ZYA5ELTkZfD3YGekboTzK+d79AOEGX7pbO5f7fsalupqzjNvp0qmTOMs6wMQg 7gYicgFdmeI3QBirYJ2QVfhcJ1rKLTN788kWKDV2bVRr+AMEVEv98dYIycJ7ACySc0ZP vpT5B2G3VH99xw113wA7rTZJhbWwrvd27BuIklGtEJL9kU7xSew4wh3hix7sa/3NgZfp h3EA== X-Gm-Message-State: AKwxytdD6lUFjAlV6WuUImaJP/2ZvRdf3eDFQqI8Mli0QVYyNq5PEVRb hNDwQLCkpHMUXhHNdaU+yPs= X-Google-Smtp-Source: ACJfBouoVZJuthqMlixI2PdK7P9r4XgSjpEwfSOs2OKaKzxIvS/HujTLzzlYoE0KGVAbYCwLiyuiXw== X-Received: by 10.237.61.175 with SMTP id i44mr40709110qtf.89.1516278775136; Thu, 18 Jan 2018 04:32:55 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell , Stefan Hajnoczi Date: Thu, 18 Jan 2018 09:32:10 -0300 Message-Id: <20180118123219.19410-9-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180118123219.19410-1-f4bug@amsat.org> References: <20180118123219.19410-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::242 Subject: [Qemu-devel] [PATCH v7 08/16] sdhci: add basic Spec v1 capabilities 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 (Note than Spec v2 is supported by default) we emit a warning for missing capabilities bits. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci-internal.h | 24 ++++++++++++++++++- include/hw/sd/sdhci.h | 11 +++++++++ hw/sd/sdhci.c | 63 ++++++++++++++++++++++++++++++++++++++--------= ---- 3 files changed, 82 insertions(+), 16 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index b7751c815f..9acafe7b01 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 @@ -84,6 +86,9 @@ =20 /* R/W Host control Register 0x0 */ #define SDHC_HOSTCTL 0x28 +FIELD(SDHC_HOSTCTL, LED_CTRL, 0, 1); +FIELD(SDHC_HOSTCTL, DATATRANSFERWIDTH, 1, 1); /* SD mode only */ +FIELD(SDHC_HOSTCTL, HIGH_SPEED, 2, 1); #define SDHC_CTRL_DMA_CHECK_MASK 0x18 #define SDHC_CTRL_SDMA 0x00 #define SDHC_CTRL_ADMA1_32 0x08 @@ -94,6 +99,7 @@ /* R/W Power Control Register 0x0 */ #define SDHC_PWRCON 0x29 #define SDHC_POWER_ON (1 << 0) +FIELD(SDHC_PWRCON, BUS_VOLTAGE, 1, 3); =20 /* R/W Block Gap Control Register 0x0 */ #define SDHC_BLKGAP 0x2A @@ -116,6 +122,7 @@ =20 /* R/W Timeout Control Register 0x0 */ #define SDHC_TIMEOUTCON 0x2E +FIELD(SDHC_TIMEOUTCON, COUNTER, 0, 4); =20 /* R/W Software Reset Register 0x0 */ #define SDHC_SWRST 0x2F @@ -172,17 +179,32 @@ =20 /* ROC Auto CMD12 error status register 0x0 */ #define SDHC_ACMD12ERRSTS 0x3C +FIELD(SDHC_ACMD12ERRSTS, TIMEOUT_ERR, 1, 1); +FIELD(SDHC_ACMD12ERRSTS, CRC_ERR, 2, 1); +FIELD(SDHC_ACMD12ERRSTS, INDEX_ERR, 4, 1); =20 /* HWInit Capabilities Register 0x05E80080 */ #define SDHC_CAPAB 0x40 -#define SDHC_CAN_DO_DMA 0x00400000 #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, TOCLKFREQ, 0, 6); +FIELD(SDHC_CAPAB, TOUNIT, 7, 1); +FIELD(SDHC_CAPAB, BASECLKFREQ, 8, 8); +FIELD(SDHC_CAPAB, MAXBLOCKLENGTH, 16, 2); +FIELD(SDHC_CAPAB, HIGHSPEED, 21, 1); +FIELD(SDHC_CAPAB, SDMA, 22, 1); +FIELD(SDHC_CAPAB, SUSPRESUME, 23, 1); +FIELD(SDHC_CAPAB, V33, 24, 1); +FIELD(SDHC_CAPAB, V30, 25, 1); +FIELD(SDHC_CAPAB, V18, 26, 1); =20 /* HWInit Maximum Current Capabilities Register 0x0 */ #define SDHC_MAXCURR 0x48 +FIELD(SDHC_MAXCURR, V33_VDD1, 0, 8); +FIELD(SDHC_MAXCURR, V30_VDD1, 8, 8); +FIELD(SDHC_MAXCURR, V18_VDD1, 16, 8); =20 /* W Force Event Auto CMD12 Error Interrupt Register 0x0000 */ #define SDHC_FEAER 0x50 diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index c174a39ecf..bc80f59d3c 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -92,6 +92,17 @@ typedef struct SDHCIState { /* Configurable properties */ bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ uint8_t spec_version; + struct { + /*********** + * Spec v1 + ***********/ + /* Suspend/resume */ + bool suspend; + bool high_speed; + bool sdma; + /* Voltage */ + bool v33, v30, v18; + } cap; } SDHCIState; =20 #define TYPE_PCI_SDHCI "sdhci-pci" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 7d9ed8606d..18152e61be 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "sysemu/block-backend.h" @@ -45,12 +46,6 @@ * 0 - not supported, 1 - supported, other - prohibited. */ #define SDHC_CAPAB_64BITBUS 0ul /* 64-bit System Bus Support = */ -#define SDHC_CAPAB_18V 1ul /* Voltage support 1.8v */ -#define SDHC_CAPAB_30V 0ul /* Voltage support 3.0v */ -#define SDHC_CAPAB_33V 1ul /* Voltage support 3.3v */ -#define SDHC_CAPAB_SUSPRESUME 0ul /* Suspend/resume support */ -#define SDHC_CAPAB_SDMA 1ul /* SDMA support */ -#define SDHC_CAPAB_HIGHSPEED 1ul /* High speed support */ #define SDHC_CAPAB_ADMA1 1ul /* ADMA1 support */ #define SDHC_CAPAB_ADMA2 1ul /* ADMA2 support */ /* Maximum host controller R/W buffers size @@ -64,9 +59,7 @@ #define SDHC_CAPAB_TOCLKFREQ 52ul =20 /* Now check all parameters and calculate CAPABILITIES REGISTER value */ -#if SDHC_CAPAB_64BITBUS > 1 || SDHC_CAPAB_18V > 1 || SDHC_CAPAB_30V > 1 ||= \ - SDHC_CAPAB_33V > 1 || SDHC_CAPAB_SUSPRESUME > 1 || SDHC_CAPAB_SDMA > 1= || \ - SDHC_CAPAB_HIGHSPEED > 1 || SDHC_CAPAB_ADMA2 > 1 || SDHC_CAPAB_ADMA1 >= 1 ||\ +#if SDHC_CAPAB_64BITBUS > 1 || SDHC_CAPAB_ADMA2 > 1 || SDHC_CAPAB_ADMA1 > = 1 || \ SDHC_CAPAB_TOUNIT > 1 #error Capabilities features can have value 0 or 1 only! #endif @@ -91,16 +84,37 @@ #endif =20 #define SDHC_CAPAB_REG_DEFAULT \ - ((SDHC_CAPAB_64BITBUS << 28) | (SDHC_CAPAB_18V << 26) | \ - (SDHC_CAPAB_30V << 25) | (SDHC_CAPAB_33V << 24) | \ - (SDHC_CAPAB_SUSPRESUME << 23) | (SDHC_CAPAB_SDMA << 22) | \ - (SDHC_CAPAB_HIGHSPEED << 21) | (SDHC_CAPAB_ADMA1 << 20) | \ + ((SDHC_CAPAB_64BITBUS << 28) | (SDHC_CAPAB_ADMA1 << 20) | \ (SDHC_CAPAB_ADMA2 << 19) | (MAX_BLOCK_LENGTH << 16) | \ (SDHC_CAPAB_BASECLKFREQ << 8) | (SDHC_CAPAB_TOUNIT << 7) | \ (SDHC_CAPAB_TOCLKFREQ)) =20 #define MASKED_WRITE(reg, mask, val) (reg =3D (reg & (mask)) | (val)) =20 +static uint64_t sdhci_init_capareg(SDHCIState *s, Error **errp) +{ + uint64_t capareg =3D 0; + + switch (s->spec_version) { + case 2: /* default version */ + + /* fallback */ + case 1: + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, HIGHSPEED, s->cap.high= _speed); + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, SDMA, s->cap.sdma); + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, SUSPRESUME, s->cap.sus= pend); + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, V33, s->cap.v33); + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, V30, s->cap.v30); + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, V18, s->cap.v18); + break; + + default: + error_setg(errp, "Unsupported spec version: %u", s->spec_version); + } + + return capareg; +} + static uint8_t sdhci_slotint(SDHCIState *s) { return (s->norintsts & s->norintsigen) || (s->errintsts & s->errintsig= en) || @@ -1027,7 +1041,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) case SDHC_TRNMOD: /* DMA can be enabled only if it is supported as indicated by * capabilities register */ - if (!(s->capareg & SDHC_CAN_DO_DMA)) { + if (!(s->capareg & R_SDHC_CAPAB_SDMA_MASK)) { value &=3D ~SDHC_TRNS_DMA; } MASKED_WRITE(s->trnmod, mask, value & SDHC_TRNMOD_MASK); @@ -1177,14 +1191,25 @@ static inline unsigned int sdhci_get_fifolen(SDHCIS= tate *s) =20 static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) { + uint64_t capab; + if (s->spec_version !=3D 2) { error_setg(errp, "Only Spec v2 is supported"); return; } s->version =3D (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); =20 + capab =3D sdhci_init_capareg(s, errp); + if (errp && *errp) { + return; + } if (s->capareg =3D=3D UINT64_MAX) { - s->capareg =3D SDHC_CAPAB_REG_DEFAULT; + s->capareg =3D capab; + } else { + capab =3D s->capareg & ~capab; + if (capab) { + warn_report("SDHCI: missing capability mask: 0x%" PRIx64, capa= b); + } } } =20 @@ -1193,6 +1218,14 @@ static void sdhci_init_readonly_registers(SDHCIState= *s, Error **errp) #define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ DEFINE_PROP_UINT8("sd-spec-version", _state, spec_version, 2), \ \ + /* Spec v1 properties */ \ + DEFINE_PROP_BOOL("sdma", _state, cap.sdma, true), \ + DEFINE_PROP_BOOL("suspend", _state, cap.suspend, false), \ + DEFINE_PROP_BOOL("high-speed", _state, cap.high_speed, true), \ + DEFINE_PROP_BOOL("3v3", _state, cap.v33, true), \ + DEFINE_PROP_BOOL("3v0", _state, cap.v30, false), \ + DEFINE_PROP_BOOL("1v8", _state, cap.v18, true), \ + \ /* deprecated: Capabilities registers provide information on supported * features of this specific host controller implementation */ \ DEFINE_PROP_UINT64("capareg", _state, capareg, UINT64_MAX), \ --=20 2.15.1