From nobody Sun Oct 26 00:02:40 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 1516279280240573.29097098866; Thu, 18 Jan 2018 04:41:20 -0800 (PST) Received: from localhost ([::1]:56269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ec9VK-0006hN-Si for importer@patchew.org; Thu, 18 Jan 2018 07:41:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ec9NF-0008RP-6u for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ec9NE-0007Av-0o for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:53 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:34114) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ec9ND-0007Am-Sd for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:51 -0500 Received: by mail-qt0-x242.google.com with SMTP id 33so29718723qtv.1 for ; Thu, 18 Jan 2018 04:32:51 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id s12sm4489623qke.4.2018.01.18.04.32.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 04:32:50 -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=wTca/zL8s5eDm7F4JOd56qR3q5csbUCkCRC+9yAFCdY=; b=Kr0e6/AU35wUYHF7jyriQT64NRBskAv6RaiTgGdw8Xre/bhAOcNEoqMHqP+bdA+d2U tXcaq1EcdcBt1sMrSQi+CCqYO02xhcra6Dhb4lRz90fxDHViJpUcJy64e7Tq4ioYOXWA /jcAylzfgkWfi1EhbC4OOUaVNjaxRul6Crnq+KHCBeAi4F1tOXFwL6jeDNzmuHUL+n5T vvbujI1ZP7pPkihHB+VO/Y5ioU3L4fVPPZ951qRWPoV46iX1nKXe1WVJvl4HcUqqOdpu 5zjvt05JucHMVIeHC9YIxmfMtWpuxDMbdHJVdnpMIdzhlvvB6pNhemzrhyrZzJA0GP2Z QDqg== 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=wTca/zL8s5eDm7F4JOd56qR3q5csbUCkCRC+9yAFCdY=; b=VwtECB+p5bARgCB5gfDBhA8yLmLzxrFjUBqPQ8yYIir/hFnKN5qmKUU7/d/ej5gGtv LvE08gTI1dfEoVg8G12fQcHsuiMW7JBO14PihHK+O9IfuXEAuvVO4NPGRLrd5W2YU7yx KhGvk6f/SrgkQceP0jOhxH4utssHlDmaX0swtIMpgDdxrvnpM0GBuynXxewupaRPidhy seYbEpPCC32g6spDEaxob8xLlwzETaQ5BzWihg8Of6m1xa/9OAqNoC3gPoMgoIVFsB7V sOxzAThh8CaNJxfGDjysgk2CZt7aYudkXdY0UfOghP+tuyW2FGmRIYU5GWwTf3sLWfNf /rDQ== X-Gm-Message-State: AKwxytfW4baM0c9B+bf1AfiDRlYbb6zgUY8Pic5s+vmA53qPYN1Yeu4U pdcWQLa9hR9ZTP/LY61ADtQEacsU X-Google-Smtp-Source: ACJfBout8E+GUG7gfP1/YmTz0bjPlRktwnJNLJmYAXAvmPFkJt7ppprttG8vvp90bVdrd1HAyQ+dsQ== X-Received: by 10.200.12.78 with SMTP id l14mr26236368qti.291.1516278771442; Thu, 18 Jan 2018 04:32:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell , Stefan Hajnoczi Date: Thu, 18 Jan 2018 09:32:09 -0300 Message-Id: <20180118123219.19410-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180118123219.19410-1-f4bug@amsat.org> References: <20180118123219.19410-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::242 Subject: [Qemu-devel] [PATCH v7 07/16] sdhci: add a 'spec_version property' (default to v2) 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Marcel Apfelbaum 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 Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 4 ++-- include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 13 +++++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index fc807f08f3..b7751c815f 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -210,9 +210,9 @@ /* 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 cb37182536..c174a39ecf 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -76,6 +76,7 @@ typedef struct SDHCIState { /* Read-only registers */ uint64_t capareg; /* Capabilities Register */ uint64_t maxcurr; /* Maximum Current Capabilities Register */ + uint16_t version; /* Host Controller Version Register */ =20 uint8_t *fifo_buffer; /* SD host i/o FIFO buffer */ uint32_t buf_maxsz; @@ -90,6 +91,7 @@ typedef struct SDHCIState { =20 /* 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 08b85558f1..7d9ed8606d 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -174,7 +174,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); @@ -918,7 +919,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 " " @@ -1176,6 +1177,12 @@ 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); + if (s->capareg =3D=3D UINT64_MAX) { s->capareg =3D SDHC_CAPAB_REG_DEFAULT; } @@ -1184,6 +1191,8 @@ static void sdhci_init_readonly_registers(SDHCIState = *s, Error **errp) /* --- qdev common --- */ =20 #define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ + DEFINE_PROP_UINT8("sd-spec-version", _state, spec_version, 2), \ + \ /* deprecated: Capabilities registers provide information on supported * features of this specific host controller implementation */ \ DEFINE_PROP_UINT64("capareg", _state, capareg, UINT64_MAX), \ --=20 2.15.1