From nobody Tue Oct 28 04:11:07 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 1515427320881420.0061522635307; Mon, 8 Jan 2018 08:02:00 -0800 (PST) Received: from localhost ([::1]:41427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYZs5-0000U0-56 for importer@patchew.org; Mon, 08 Jan 2018 11:01:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYZbT-0002HK-V4 for qemu-devel@nongnu.org; Mon, 08 Jan 2018 10:44:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYZbQ-0007qB-Pu for qemu-devel@nongnu.org; Mon, 08 Jan 2018 10:44:48 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:37223) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYZbQ-0007pt-K7; Mon, 08 Jan 2018 10:44:44 -0500 Received: by mail-qk0-x244.google.com with SMTP id p13so14636088qke.4; Mon, 08 Jan 2018 07:44:44 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id u36sm7832382qtc.58.2018.01.08.07.44.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 07:44:43 -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=EJwpKumRD9gYiYna505USDzhj2iRy5QkmG4+ZT5aMBE=; b=bbd7YN/hYIsmfjue7SDKf6cObTIJgTnLY2yAEXsWB5u7GJboj3oJyZkt80aRIg+hI6 e1kYTBsiZJRO0eaWer6BK4T1FMC2fdxz2lpUYw9VQk6TNMl5Vs94S7P8yvmvmzyKGMrH 4azUMHz1bigl1wddX0hIbZl9/20oiYuruMXyp7u6nRT2JLRLJtnXQrYB4JPDqysKl2dk gXsLsbhh0MTDAAGZdSIjfxvo6HgoMqiCIkBkEEpu4Xx9cK9cZ3TxM8K7cQLhwnqbnmzb pmFM7V187/umW7+g2c9czdmJKtkZq9+Ou5Hf6CkPolk5DFL+yGjgE02H97CqZuJBD8X8 onBg== 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=EJwpKumRD9gYiYna505USDzhj2iRy5QkmG4+ZT5aMBE=; b=HlsyyVocdk0O76H/8IdzUHTMtNwZ48Fne/h/eX9kQqjBd/eUPIvLXgTh2H3KaietPL AvbPXTVLrR62/utuS/s0A5xKl6hqgVJdPRnlNn6tYJzUAQuQFnpIjbZiwXxQLR3tS/el e/UQmbsgu5OnJb1d9DBW+qGzluti/XHa/rzyZyXVRaZtjEAwJpkRSDDDXYaeyFIz49Dk bJAc3vtF8y4WI/dD3M2+yZRdjHnGdrxpGtNr2J6QG8DdJIL5N+j7YvPzjY6ndSKNSjdl BQxVhkyFdq1LLyLHlo64FEhkBaGW3uIx1kC4VX/KYEglMJ8ARIZqB+S0HEwKP2wtO6xh nn5g== X-Gm-Message-State: AKwxytfQlxOs1YUrSctaNU6YhEQq3e/ZZBm3NRe+wVxQl+qYonkXEPGS V5WlmKs4cUZaSb1mSOaVyPI= X-Google-Smtp-Source: ACJfBouIsumJjjnoCQK5pVcqpIL+UvZqA2Gb3hMGk9GLxTWEq9NGVRMwFqVU/yxCulzyUrDN+KwjCw== X-Received: by 10.55.201.210 with SMTP id m79mr15420854qkl.287.1515426284064; Mon, 08 Jan 2018 07:44:44 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Andrey Smirnov , Igor Mitsyanko Date: Mon, 8 Jan 2018 12:42:48 -0300 Message-Id: <20180108154303.6522-17-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108154303.6522-1-f4bug@amsat.org> References: <20180108154303.6522-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 v5 16/31] 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 , Eduardo Habkost 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 | 21 +++++++++++++++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index affbe4015c..1da91a27b4 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 a80b7c0424..c0098fc920 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -114,6 +114,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 83b027a3b6..3f5e0760f6 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -62,6 +62,17 @@ 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: capareg =3D FIELD_DP64(capareg, SDHC_CAPAB, ADMA1, s->cap.adma1); @@ -1174,8 +1185,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); @@ -1327,6 +1341,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