From nobody Tue Feb 10 15:29:23 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518189550770845.8321534811547; Fri, 9 Feb 2018 07:19:10 -0800 (PST) Received: from localhost ([::1]:60601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekAS8-0004j3-RZ for importer@patchew.org; Fri, 09 Feb 2018 10:19:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekA5t-0002tW-9I for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:56:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekA5s-0005uo-67 for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:56:05 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:43473) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ekA5s-0005ud-1E for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:56:04 -0500 Received: by mail-qt0-x241.google.com with SMTP id d26so381645qtk.10 for ; Fri, 09 Feb 2018 06:56:03 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id b29sm747841qkb.28.2018.02.09.06.56.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 06:56:02 -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=Q0BNPdP5ghGEGWQaV3NtsLbNa8nxSkL1ry+NjVps0YY=; b=ErFjRuPG4Y4hdmzXx3zqLWNc9s8qWI/BwkFEg/cDEpPCfW6vtMVC+Hrqoeke2/1Ldt a3oHBdDbttX4E5+MB8e7V/T53i8Q1KaiKrl8ndVpJGXuvn8QPjtn9LfsPcsaH/k9fNFU qCUNDUHPiR7hm8CApMjAa2h5qC3gGS2NK3lUW+JrlnpEDXfQq7x87342eL4qfTg0qk5z i6jSrlCyg0iqO4ai2lwPS5+LtfppNcfgaj3RiNCVxNetwBzGS7loLdY2yoWa+0vbINg7 yKTu2tSAgG9RGV912bK4NMxJZ7s9n5FY1aPm3aA+d8uZC7u8gk08aMNIow9FInAgkpVN NkRQ== 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=Q0BNPdP5ghGEGWQaV3NtsLbNa8nxSkL1ry+NjVps0YY=; b=Qy6OXwuRDKI5N5B7+H04eBZYy30iKD7oZZUupEwTDmwfl4zMjDnoxGOUEl6Bx6+mfW dna5ZR5Mw2tKsF+Dw35LQiX5nuVNpfW25u7zJhcGBmaFUAuDRuC0nmuYUFXDhrbu9YpA Gfv+B0DbJVuc+D/dIWWzAGXPsZEFLGHTcLgW9IcHYZQejPOwgbbekxnoYO4qEOQZy3of At3zaZe8GsdKzhqHi4wr9ApMLDxxDX/COcYSKu42HuxTYa5EdZFW0ZJzjXToxLFFXsh4 uLCvAAXoqwDAqtfWakMM4o/zIeC4scIzpDO68Jp/OJ1kW9KypIM3CbLrhpS9R/WB6BRo c28g== X-Gm-Message-State: APf1xPAM6/OZYkhRfxtk1KaT++kKoCiQo8lyoiLTmMB3anjymK38utD3 8R7XI6fRtlv5cqwa4lbYssc= X-Google-Smtp-Source: AH8x224bkNaSmRmcBxBTLFfg3hGA8WHchPKjM3GJCCySS4I3Z46KazoApSAg/dEkEo5QhCq2cbvnMw== X-Received: by 10.200.46.73 with SMTP id s9mr4938257qta.317.1518188163488; Fri, 09 Feb 2018 06:56:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini Date: Fri, 9 Feb 2018 11:54:30 -0300 Message-Id: <20180209145430.26007-31-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209145430.26007-1-f4bug@amsat.org> References: <20180209145430.26007-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 v12 30/30] sdhci: add Spec v4.2 register definitions 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" , Peter Maydell , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 | 9 +++++++++ hw/sd/sdhci.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 0092627076..e1bb733aed 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -198,6 +198,10 @@ 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, UHS_II_ENA, 8, 1); /* since v4 */ +FIELD(SDHC_HOSTCTL2, ADMA2_LENGTH, 10, 1); /* since v4 */ +FIELD(SDHC_HOSTCTL2, CMD23_ENA, 11, 1); /* since v4 */ +FIELD(SDHC_HOSTCTL2, VERSION4, 12, 1); /* since v4 */ FIELD(SDHC_HOSTCTL2, ASYNC_INT, 14, 1); FIELD(SDHC_HOSTCTL2, PRESET_ENA, 15, 1); =20 @@ -216,10 +220,12 @@ FIELD(SDHC_CAPAB, SUSPRESUME, 23, 1); FIELD(SDHC_CAPAB, V33, 24, 1); FIELD(SDHC_CAPAB, V30, 25, 1); FIELD(SDHC_CAPAB, V18, 26, 1); +FIELD(SDHC_CAPAB, BUS64BIT_V4, 27, 1); /* since v4.10 */ 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, UHS_II, 35, 8); /* since v4.20 */ 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 */ @@ -228,12 +234,15 @@ FIELD(SDHC_CAPAB, TIMER_RETUNING, 40, 4); /* sinc= e v3 */ FIELD(SDHC_CAPAB, SDR50_TUNING, 45, 1); /* since v3 */ FIELD(SDHC_CAPAB, RETUNING_MODE, 46, 2); /* since v3 */ FIELD(SDHC_CAPAB, CLOCK_MULT, 48, 8); /* since v3 */ +FIELD(SDHC_CAPAB, ADMA3, 59, 1); /* since v4.20 */ +FIELD(SDHC_CAPAB, V18_VDD2, 60, 1); /* since v4.20 */ =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); +FIELD(SDHC_MAXCURR, V18_VDD2, 32, 8); /* since v4.20 */ =20 /* W Force Event Auto CMD12 Error Interrupt Register 0x0000 */ #define SDHC_FEAER 0x50 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 6e5bea804c..c2e4b7003d 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -92,6 +92,20 @@ static void sdhci_check_capareg(SDHCIState *s, Error **e= rrp) bool unit_mhz; =20 switch (s->sd_spec_version) { + case 4: + val =3D FIELD_EX64(s->capareg, SDHC_CAPAB, BUS64BIT_V4); + msk =3D FIELD_DP64(msk, SDHC_CAPAB, BUS64BIT_V4, 0); + trace_sdhci_capareg("64-bit system bus (v4)", val); + + val =3D FIELD_EX64(s->capareg, SDHC_CAPAB, UHS_II); + msk =3D FIELD_DP64(msk, SDHC_CAPAB, UHS_II, 0); + trace_sdhci_capareg("UHS-II", val); + + val =3D FIELD_EX64(s->capareg, SDHC_CAPAB, ADMA3); + msk =3D FIELD_DP64(msk, SDHC_CAPAB, ADMA3, 0); + trace_sdhci_capareg("ADMA3", val); + + /* fallback */ case 3: val =3D FIELD_EX64(s->capareg, SDHC_CAPAB, ASYNC_INT); trace_sdhci_capareg("async interrupt", val); --=20 2.16.1