From nobody Tue Oct 28 01:56:36 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 1515704724767853.6415012195985; Thu, 11 Jan 2018 13:05:24 -0800 (PST) Received: from localhost ([::1]:42377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZk2N-000485-V4 for importer@patchew.org; Thu, 11 Jan 2018 16:05:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZjui-0005mC-Ey for qemu-devel@nongnu.org; Thu, 11 Jan 2018 15:57:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZjuh-0002cY-8L for qemu-devel@nongnu.org; Thu, 11 Jan 2018 15:57:28 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:33643) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eZjuh-0002cB-3c; Thu, 11 Jan 2018 15:57:27 -0500 Received: by mail-qk0-x244.google.com with SMTP id i141so6125003qke.0; Thu, 11 Jan 2018 12:57:26 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id c1sm12818399qta.52.2018.01.11.12.57.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jan 2018 12:57:25 -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=xTN+gugdMHRG/LMynGYzPTUVjwp5F0AljzUHFu/5WlY=; b=cKiAAVPbC6t4dAPnosh4Wi1oDbZC/yFFmbWax1tuxfYTw5+2LHQScD6DC8XpyTN4O4 ghDgMb0pH+rMY3OXCD3Joj87NGAinCCCJY1Yb91vB8edB0kRLZA/JxkwpIi1j53ot/KZ EaRYoCfATppj+IJmIAmXMHrckI2nR+MAyLCnDLMsxGENf0HPMTZ+/WlKkBA+bawL1eem z1Cq94AG9Lvpm+KdqL1u9F79vLCPKP4u8eCl7AMkT8/8tS/uazwEuyu/UrxQIhBMVfmy e+WnEGQp/Y/FTgn6wEQ/seJBRGpo7TBaqHcSgoz7/UxSOTg+2c5uW2uK+N+YDeGmtDKm Ed+w== 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=xTN+gugdMHRG/LMynGYzPTUVjwp5F0AljzUHFu/5WlY=; b=r5j1w5+YzR027nO9CJHTQYRTWtZLyw5Mv9lruhgvyensG5CdOFQpf01tqBGcibMovm 6+X/7H2LyH4BMxv1RIKsdWjD2wg9THRKVcii0sVgliIXLN46/Zyh8v1Rgjh4+x8soniW L78TEZ8sVxc8KleRb6wM12gCQnPAAvXDjcAF+ijtrMUv/SJrPQVC/lfnt7NpBuUnD8zX 6f+1Q3JXszf2C9TCIqKZhVfs3Yw6K4Us/PtMHdIDPWQh98m3AEzKsNj3DnpoCw4UDUgN 04kZjrFi0chcqD+J37mEyoRIASDjmgBSSbN1BMtrviWV3tXjIya7j2BZoqPc+qSh7bXg TJgQ== X-Gm-Message-State: AKwxytdAJUfcS1otA9IA5rwMn9wfaJfJFjHI88vuSUJ7kAmkQVVx8CgW Ql6umr6o4R53bvOw+RiW0Bb3WZKT X-Google-Smtp-Source: ACJfBosn+ZvC3olnOo2LsuVp4T5dl8ES99xWa8U8ZGwBYSeKxQcUc2zmxvZ4N5ISi32uG7TQRaQ63Q== X-Received: by 10.55.65.75 with SMTP id o72mr20087856qka.202.1515704246473; Thu, 11 Jan 2018 12:57:26 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Andrey Smirnov , Igor Mitsyanko Date: Thu, 11 Jan 2018 17:56:13 -0300 Message-Id: <20180111205626.23291-9-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111205626.23291-1-f4bug@amsat.org> References: <20180111205626.23291-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:c09::244 Subject: [Qemu-devel] [PATCH v6 08/21] sdhci: add v3 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" , Prasad J Pandit , =?UTF-8?q?Gr=C3=A9gory=20Estrade?= , qemu-devel@nongnu.org, Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Krzysztof Kozlowski , Jean-Christophe Dubois , Sai Pavan Boddu , qemu-arm@nongnu.org, Clement Deschamps , Andrew Baumann 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 --- hw/sd/sdhci-internal.h | 21 +++++++++++++++++++++ include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 22 ++++++++++++++++++++-- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 4ed9727ec3..ac4704eb61 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -43,6 +43,7 @@ #define SDHC_TRNS_DMA 0x0001 #define SDHC_TRNS_BLK_CNT_EN 0x0002 #define SDHC_TRNS_ACMD12 0x0004 +#define SDHC_TRNS_ACMD23 0x0008 /* since v3 */ #define SDHC_TRNS_READ 0x0010 #define SDHC_TRNS_MULTI 0x0020 #define SDHC_TRNMOD_MASK 0x0037 @@ -183,12 +184,23 @@ FIELD(SDHC_ACMD12ERRSTS, TIMEOUT_ERR, 1, 1); FIELD(SDHC_ACMD12ERRSTS, CRC_ERR, 2, 1); FIELD(SDHC_ACMD12ERRSTS, INDEX_ERR, 4, 1); =20 +/* Host Control Register 2 (since v3) */ +#define SDHC_HOSTCTL2 0x3E +FIELD(SDHC_HOSTCTL2, UHS_MODE_SEL, 0, 3); +FIELD(SDHC_HOSTCTL2, V18_ENA, 3, 1); /* UHS-I only */ +FIELD(SDHC_HOSTCTL2, DRIVER_STRENGTH, 4, 2); /* UHS-I only */ +FIELD(SDHC_HOSTCTL2, EXECUTE_TUNING, 6, 1); /* UHS-I only */ +FIELD(SDHC_HOSTCTL2, SAMPLING_CLKSEL, 7, 1); /* UHS-I only */ +FIELD(SDHC_HOSTCTL2, ASYNC_INT, 14, 1); +FIELD(SDHC_HOSTCTL2, PRESET_ENA, 15, 1); + /* HWInit Capabilities Register 0x05E80080 */ #define SDHC_CAPAB 0x40 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, EMBEDDED_8BIT, 18, 1); /* since v3 */ FIELD(SDHC_CAPAB, ADMA2, 19, 1); /* since v2 */ FIELD(SDHC_CAPAB, ADMA1, 20, 1); /* v1 only? */ FIELD(SDHC_CAPAB, HIGHSPEED, 21, 1); @@ -198,6 +210,15 @@ FIELD(SDHC_CAPAB, V33, 24, 1); FIELD(SDHC_CAPAB, V30, 25, 1); FIELD(SDHC_CAPAB, V18, 26, 1); FIELD(SDHC_CAPAB, BUS64BIT, 28, 1); /* since v2 */ +FIELD(SDHC_CAPAB, ASYNC_INT, 29, 1); /* since v3 */ +FIELD(SDHC_CAPAB, SLOT_TYPE, 30, 2); /* since v3 */ +FIELD(SDHC_CAPAB, BUS_SPEED, 32, 3); /* since v3 */ +FIELD(SDHC_CAPAB, DRIVER_STRENGTH, 36, 3); /* since v3 */ +FIELD(SDHC_CAPAB, DRIVER_TYPE_A, 36, 1); /* since v3 */ +FIELD(SDHC_CAPAB, DRIVER_TYPE_C, 37, 1); /* since v3 */ +FIELD(SDHC_CAPAB, DRIVER_TYPE_D, 38, 1); /* since v3 */ +FIELD(SDHC_CAPAB, TIMER_RETUNNING, 40, 4); /* since v3 */ +FIELD(SDHC_CAPAB, SDR50_TUNNING, 45, 1); /* since v3 */ =20 /* HWInit Maximum Current Capabilities Register 0x0 */ #define SDHC_MAXCURR 0x48 diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 26b50583af..f45e911065 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -104,6 +104,8 @@ typedef struct SDHCIState { /* v2 */ bool adma1, adma2; bool bus64; + /* v3 */ + uint8_t slot_type, sdr, strength; } cap; } SDHCIState; =20 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ab4ffeca1d..773eb68fd6 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -63,6 +63,18 @@ static void sdhci_init_capareg(SDHCIState *s, Error **er= rp) uint32_t val; =20 switch (s->spec_version) { + case 3: + val =3D FIELD_EX64(capareg, SDHC_CAPAB, SLOT_TYPE); + if (val) { + error_setg(errp, "slot-type not supported"); + return; + } + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, SLOT_TYPE, val); + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, BUS_SPEED, s->cap.sdr); + capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, DRIVER_STRENGTH, + s->cap.strength); + + /* fallback */ case 2: /* default version */ capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, ADMA1, s->cap.adma1); capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, ADMA2, s->cap.adma2); @@ -1169,8 +1181,11 @@ static inline unsigned int sdhci_get_fifolen(SDHCISt= ate *s) =20 static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) { - if (s->spec_version !=3D 2) { - error_setg(errp, "Only Spec v2 is supported"); + switch (s->spec_version) { + case 2 ... 3: + break; + default: + error_setg(errp, "Only Spec v2/v3 are supported"); return; } s->version =3D (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); @@ -1319,6 +1334,9 @@ static Property sdhci_properties[] =3D { DEFINE_PROP_BOOL("1v8", SDHCIState, cap.v18, false), =20 DEFINE_PROP_BOOL("64bit", SDHCIState, cap.bus64, false), + DEFINE_PROP_UINT8("slot-type", SDHCIState, cap.slot_type, 0), + DEFINE_PROP_UINT8("bus-speed", SDHCIState, cap.sdr, 0), + DEFINE_PROP_UINT8("driver-strength", SDHCIState, cap.strength, 0), =20 /* capareg: deprecated */ DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, UINT64_MAX), --=20 2.15.1