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 1515004650593544.515285438739; Wed, 3 Jan 2018 10:37:30 -0800 (PST) Received: from localhost ([::1]:60776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnuq-00057e-Jg for importer@patchew.org; Wed, 03 Jan 2018 13:37:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnrz-0002ua-H3 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnrx-0007BT-WD for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:31 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:47072) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnrx-0007BJ-RC for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:29 -0500 Received: by mail-qt0-x242.google.com with SMTP id r39so3191060qtr.13 for ; Wed, 03 Jan 2018 10:34:29 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 185sm992854qkd.1.2018.01.03.10.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:34:28 -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=Fm39Pzrn8Q7zQaadWX3MLf+gFiUKzxWZxuHQpGq3oQk=; b=LhOYyuS6a7ao9bfg7kb0LCZrl6RwXu/5m17YJWYWZC0h7Sflgx7qtbFKuSi8bpyPgn u48K23R/hKf5PYKnjyeSGJGO98aHvqjuFfLToKTA/jNTg8Fj0h/yfX/1CVO3ngXVn/Rk xHoXRk7UnEps0js2jwHK7G37S0rhFJ1hG+nCVud3WFVZygWrAsrHBj5PYepyWTQGF8V1 VZlcdSXv6hAPfRegoy/gPMO3QGFGnkpEH3bq8YtoSxnkbHcnKNSZYIQtIWeDUql9LU/U 8dnEXK/T/qeRwYE0RMddmrLFw8/Xj6/PKEFtskubw7Zoo0DYMPQsnZV7sDiHv9a928RH yEHQ== 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=Fm39Pzrn8Q7zQaadWX3MLf+gFiUKzxWZxuHQpGq3oQk=; b=Oa7WFnw6HIIs5fx+GRWgMFzMGhPdk0keTk/4/5Be0E3AhzXAGXCo4f2DWBiVe/SEuk pjfcbmYagLWLVzWyEXaoIghG75JIE/VE1V7r4mHYKnN2oHdWfZvfjgyDUBgODLZmtRln xtTkJjlC5jXmUMKrC6uQGYdxJ02tBkVrq1B1v/KJyrEXymBbDwda2uOyIS73kHQzxr4o 89O13r3+8zN636rbooQo2Pa2GCxO3zLAP2bP7IJIYvYm6RKB85akHDFNnRM3/7xq2nQl +P8cINehaPDlNOmycfah2EEm3R5oPbfr4ZG0r255iy81v8K5oLO70Ywr9bthcKFQcprN 0Bcw== X-Gm-Message-State: AKGB3mJWaPZIOwsqpxDT+fX1B6aLJB7NGhhKvUUDjzCedFCGzT4iPK1n wFCETrw/mapyqFlEEKvdd5c= X-Google-Smtp-Source: ACJfBoslmZy4LdzZdgRhByorPvtUbHE1xYt/X2UVR0PfcRCP5IrsMFskvI/MnAjr+CXsGToJGLLIhQ== X-Received: by 10.200.36.9 with SMTP id c9mr3206720qtc.182.1515004469373; Wed, 03 Jan 2018 10:34:29 -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:54 -0300 Message-Id: <20180103183418.23730-2-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::242 Subject: [Qemu-devel] [PATCH v4 01/25] 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: 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 default to Spec v2.00 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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..ae8ddf4e3b 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 < 1) { + error_setg(errp, "spec version invalid"); + 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, 1), DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0), --=20 2.15.1