From nobody Tue Oct 28 04:10:04 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515426334471503.79589256538804; Mon, 8 Jan 2018 07:45:34 -0800 (PST) Received: from localhost ([::1]:41227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYZc6-0002Il-B7 for importer@patchew.org; Mon, 08 Jan 2018 10:45:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYZaC-00013i-7O for qemu-devel@nongnu.org; Mon, 08 Jan 2018 10:43:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYZaB-0006sp-8Y for qemu-devel@nongnu.org; Mon, 08 Jan 2018 10:43:28 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:37082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYZaB-0006rv-31; Mon, 08 Jan 2018 10:43:27 -0500 Received: by mail-qt0-x243.google.com with SMTP id f2so14075056qtj.4; Mon, 08 Jan 2018 07:43:26 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id u36sm7832382qtc.58.2018.01.08.07.43.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 07:43: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=MdVBqsl3IJRQFM11VnTEGb3gyIxLYjLO7UeKKsLPpE0=; b=Q1J/79kKMsqtsNWI+9b9NUB61DbjRCcFYcV4QtHhaLXACK3UiQFQpWnV0reVCwkR8r VhSK576JumPFsO1C53ks+v8Q9sxkLhP216iTSdlDbqCAPp9lF7wygYaUTVkV0n6eELJk lCfZA48rzrsnbOAG25LBWzImsTPu4mk7QO5IyBSbdorZCF3mdBxQvF1iAHsgYMI/Ji8H sXjY645VcgoYBX9Y+X1ao/sGFoFP/zSBeF4t50wDNeIS+dzexJq9VUbHF/4R0cRdIctV VVNqaO12Bh77H1H83gvHhkA7+NVWZrKjmhOcfOaHrBPcFUZAPHAJxO49K8aWGb8nTA8S ajsw== 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=MdVBqsl3IJRQFM11VnTEGb3gyIxLYjLO7UeKKsLPpE0=; b=O4Ja2M5ey/ULBuo56FVPEw6JO55tN2IqHasWxRUfnwEQtF0u5Rm/vMJg4xjLHx5R+R PicCvnDQftLuwmNCjfglsxgsDt5TfkX9xwsH1bExovZHMiohIUdHF5UYsgO9K914VHCB Kg+Gv3jcTjHJtluBMUfDWacN4FD3x/wT9n8S/xRLBYJfjWGT1+INEiXSW86t5y2AE0vc bC+fkdeYWyYh088gGmJI5vkIf/EoGrKZtQcKfmOz/u6Gy7gf9iQdZit5LFD4hxMuYi4R p//ygfrhklUVrBr30n5SmXlrX4VJLYigAJpnKdzjyQkLrSl102p9GrNND8YYjdWiACjO 5ldw== X-Gm-Message-State: AKwxytc/Tp5kPIbKSHRTsT+gNDV+gQHCnX9ce/C1BsFAdiUgaMyz+k29 8FrLx0DK10PNgo6Bo/dRkaE= X-Google-Smtp-Source: ACJfBouy52+L4DMfYfZytOHWli3Jew/I3+eFt8u9JiFqgwMjJ/w9lOrCc2MCU1xZaieFEf+RGITjfQ== X-Received: by 10.237.51.162 with SMTP id v31mr15699163qtd.116.1515426206473; Mon, 08 Jan 2018 07:43:26 -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:33 -0300 Message-Id: <20180108154303.6522-2-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:c0d::243 Subject: [Qemu-devel] [PATCH v5 01/31] sdhci: add a spec_version property 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 default to Spec v2.00 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 4 ++-- include/hw/sd/sdhci.h | 3 +++ hw/sd/sdhci.c | 19 +++++++++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index b7475a1b7b..cf4a055159 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -212,9 +212,9 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); /* Slot interrupt status */ #define SDHC_SLOT_INT_STATUS 0xFC =20 -/* HWInit Host Controller Version Register 0x0401 */ +/* HWInit Host Controller Version Register */ #define SDHC_HCVER 0xFE -#define SD_HOST_SPECv2_VERS 0x2401 +#define SDHC_HCVER_VENDOR 0x24 =20 #define SDHC_REGISTERS_MAP_SIZE 0x100 #define SDHC_INSERTION_DELAY (NANOSECONDS_PER_SECOND) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 2aea20f1d8..ddd5040410 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -91,6 +91,8 @@ typedef struct SDHCIState { uint64_t capareg; /* Capabilities Register */ /* 0x48 */ uint64_t maxcurr; /* Maximum Current Capabilities Register */ + /* 0xfe */ + uint16_t version; /* Host Controller Version Register */ =20 uint8_t *fifo_buffer; /* SD host i/o FIFO buffer */ uint32_t buf_maxsz; @@ -99,6 +101,7 @@ typedef struct SDHCIState { bool pending_insert_state; /* Configurable properties */ bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ + uint8_t spec_version; } SDHCIState; =20 #define TYPE_PCI_SDHCI "sdhci-pci" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b080950f80..cd4a8efdd7 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -169,7 +169,8 @@ static void sdhci_reset(SDHCIState *s) =20 timer_del(s->insert_timer); timer_del(s->transfer_timer); - /* Set all registers to 0. Capabilities registers are not cleared + + /* Set all registers to 0. Capabilities/Version registers are not clea= red * and assumed to always preserve their value, given to them during * initialization */ memset(&s->sdmasysad, 0, (uintptr_t)&s->capareg - (uintptr_t)&s->sdmas= ysad); @@ -923,7 +924,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset,= unsigned size) ret =3D (uint32_t)(s->admasysaddr >> 32); break; case SDHC_SLOT_INT_STATUS: - ret =3D (SD_HOST_SPECv2_VERS << 16) | sdhci_slotint(s); + ret =3D (s->version << 16) | sdhci_slotint(s); break; default: qemu_log_mask(LOG_UNIMP, "SDHC rd_%ub @0x%02" HWADDR_PRIx " " @@ -1178,6 +1179,15 @@ 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"); + return; + } + s->version =3D (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); +} + static void sdhci_initfn(SDHCIState *s) { qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), @@ -1190,6 +1200,10 @@ static void sdhci_initfn(SDHCIState *s) =20 static void sdhci_common_realize(SDHCIState *s, Error **errp) { + sdhci_init_readonly_registers(s, errp); + if (errp && *errp) { + return; + } s->buf_maxsz =3D sdhci_get_fifolen(s); s->fifo_buffer =3D g_malloc0(s->buf_maxsz); =20 @@ -1290,6 +1304,7 @@ const VMStateDescription sdhci_vmstate =3D { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ static Property sdhci_properties[] =3D { + DEFINE_PROP_UINT8("sd-spec-version", SDHCIState, spec_version, 2), DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0), --=20 2.15.1