From nobody Tue Oct 28 12:15:20 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 1515004812886419.9886749465934; Wed, 3 Jan 2018 10:40:12 -0800 (PST) Received: from localhost ([::1]:60794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnxU-0007kZ-1u for importer@patchew.org; Wed, 03 Jan 2018 13:40:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWns2-0002ws-7P for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWns0-0007DG-Rf for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:34 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWns0-0007D0-Lx for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:32 -0500 Received: by mail-qt0-x241.google.com with SMTP id u10so3235534qtg.2 for ; Wed, 03 Jan 2018 10:34:32 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 185sm992854qkd.1.2018.01.03.10.34.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:34:31 -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=5Frtse9vg8bswS5OuoKTX+4VsFqr1/QekEObzWVQlKQ=; b=EQWqd/NhUjV2+DjyoqKbZZa3sMoP7yOTJ6GhqHgjxox96yXi4+f3z+NOeKFXPE3mCg 1naPZj/uYL4vRUUu4rh8oWeq1rPGxbsMANcZeJg7nMK/CO+Z0TnOEovXRQzMbegcT1dk wcddll0DVh4e/9T1wRFHhh/AjJezqZXQqGakWCc6F60p9Es3YvCZUk13V99cLvjd5k3D WjTwyKUvd92sUK/0BTLB6RhPtEmapbuXWX9J3OutU8j6UhdYiMJKO3dPpA1agkugnsef 7/Ksqj43KQhLmRZUXWAc1QJd9Hjq2bS3wzWdehk3l/YjGsEO/06R6uumSZpHU09cqW/x BGuA== 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=5Frtse9vg8bswS5OuoKTX+4VsFqr1/QekEObzWVQlKQ=; b=RV94uVLEnN0/nrTcIfO5c0lGngunWhsiaYBKJJ+7840w4aZbVp0lAfTc0jc2hiXwkR ulK5Xbtuk1xadV7URwfngvPz+4jIqEWtQluRUa5O2MvgIN2d8sBeOulz/0AeOk7nKEn7 36aJCX047olynhAdDXK+uqRkUJGEglyK6dSzHtcXl2dZMMK9tICWcEn3oPiQ00wM5Onv 2fxtmsnj8Ie6aH36/uSC3scR8Q/09ZLsM2hKPaF20ze39+zYA7HR4KQpt4Fzxm9bkl12 b5fz/AkEeSYPaEfvT+pXHJ6KPRgstB205XP+S5RaRaS60iPuExktkK/SnIgOBYRkXlpa uMzQ== X-Gm-Message-State: AKGB3mJwcK8XU9c6Vh6jutzFzxWK9RtNmJ62hI1Ifg3KQGdtt3T7vkuH LJz5PhOcLruv1uadzatc1IW7j2pU X-Google-Smtp-Source: ACJfBoucv/Tb5uKJPTHlQkDjwn50/pxhuVahOjdntaAYh+72zXgiv6jr8xY6GpFv9xQTAxbSmjFsng== X-Received: by 10.237.59.22 with SMTP id p22mr2925969qte.34.1515004472044; Wed, 03 Jan 2018 10:34:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Date: Wed, 3 Jan 2018 15:33:55 -0300 Message-Id: <20180103183418.23730-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103183418.23730-1-f4bug@amsat.org> References: <20180103183418.23730-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 v4 02/25] 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: Peter Crosthwaite , =?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 | 22 ++++++++++++++++++- include/hw/sd/sdhci.h | 6 ++++++ hw/sd/sdhci.c | 58 ++++++++++++++++++++++++++++++++++++----------= ---- 3 files changed, 69 insertions(+), 17 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index cf4a055159..6944fcaf00 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -86,6 +86,9 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); =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 @@ -96,6 +99,7 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); /* 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 @@ -118,6 +122,7 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); =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 @@ -174,17 +179,32 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); =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 ddd5040410..266030dc8d 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -102,6 +102,12 @@ typedef struct SDHCIState { /* Configurable properties */ bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ uint8_t spec_version; + struct { + bool suspend; + bool high_speed; + bool sdma; + 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 ae8ddf4e3b..5e08949b37 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -44,12 +44,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 @@ -63,9 +57,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 @@ -90,16 +82,33 @@ #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 void sdhci_init_capareg(SDHCIState *s, Error **errp) +{ + uint64_t capareg =3D 0; + + switch (s->spec_version) { + 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); + } + s->capareg =3D capareg; +} + static uint8_t sdhci_slotint(SDHCIState *s) { return (s->norintsts & s->norintsigen) || (s->errintsts & s->errintsig= en) || @@ -1032,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); @@ -1186,6 +1195,10 @@ static void sdhci_init_readonly_registers(SDHCIState= *s, Error **errp) return; } s->version =3D (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); + + if (s->capareg =3D=3D UINT64_MAX) { + sdhci_init_capareg(s, errp); + } } =20 static void sdhci_initfn(SDHCIState *s) @@ -1305,8 +1318,21 @@ const VMStateDescription sdhci_vmstate =3D { * specific host controller implementation */ static Property sdhci_properties[] =3D { DEFINE_PROP_UINT8("sd-spec-version", SDHCIState, spec_version, 1), - DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, - SDHC_CAPAB_REG_DEFAULT), + + /* DMA */ + DEFINE_PROP_BOOL("sdma", SDHCIState, cap.sdma, true), + /* Suspend/resume support */ + DEFINE_PROP_BOOL("suspend", SDHCIState, cap.suspend, false), + /* High speed support */ + DEFINE_PROP_BOOL("high-speed", SDHCIState, cap.high_speed, true), + /* Voltage support 3.3/3.0/1.8V */ + DEFINE_PROP_BOOL("3v3", SDHCIState, cap.v33, true), + DEFINE_PROP_BOOL("3v0", SDHCIState, cap.v30, false), + DEFINE_PROP_BOOL("1v8", SDHCIState, cap.v18, false), + + /* capareg: deprecated */ + DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, UINT64_MAX), + DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0), DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, false), --=20 2.15.1