From nobody Sat Feb 7 06:54:24 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151500347391292.94552619478486; Wed, 3 Jan 2018 10:17:53 -0800 (PST) Received: from localhost ([::1]:60070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnbt-0007cQ-3g for importer@patchew.org; Wed, 03 Jan 2018 13:17:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTD-0000hK-A2 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnTC-00077M-7e for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:55 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:41433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnTC-00077E-3J for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:54 -0500 Received: by mail-qk0-x243.google.com with SMTP id a8so2565331qkb.8 for ; Wed, 03 Jan 2018 10:08:54 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:53 -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=HqIoJBIMtk6lRxb6mcZ6ZoxOAMXc8MnMsbyzzm4D0qo=; b=QxsORJsV9Ro0/t3rnOL2OEuZMFCkBKkbIopljYDMuPeER2LlEVVQVaEWBaqnSj6a2+ VIiKByea0w7Hvk2epZL8LjH/d1ADQNDoyVVFT+BLO5kiUkGFe1jixscZwWBJiv1ziC+e hBH3FfJdEhq9bOzuCsn5ytL3O+06G0ReUCATUIqIUgd+rug62pnyhdjX+LzXJsPUil62 H7DQiaFRhn9iYqgRTUjWfSCSISChkEQBkPPpgvMkbzFMCZfwZhjnYoNkvCgwuSMq5CjB yvWlWPFTQemJT06tzKaPHHh1vT4yyrF2TPQ76hBIqh3oZwCUr3d9XkTX56lLS7ST07Um Yuqg== 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=HqIoJBIMtk6lRxb6mcZ6ZoxOAMXc8MnMsbyzzm4D0qo=; b=fIDAptkvMUBKjk6JrP0xABP4GrVtiOjuqAYXapzRHKyWM41bu2UXGFJ3lKPpihM6Yp 6gutn322ec99IQe6Kw0YSN5Eq69vdTo95ZZIPw4Jj30qbue+3oE6dqPRlasKhDMaSZgh QVaUj7KlRF4628CZFtEVsHxhQ+tLXJX3uSHToEkiLB4Xrkx4Ogb77B1ft3CHpTdzFLt+ raSOywLQCYnYWEptvpfU/V0+uahgIJ8hGYsG+b6EYOGCzPytQaASEnfQ0mLWVB3n5F8P VqXUZGftQZdIwLsLFlO/xVvuMu2+QKPHYPZkNUCrXmrNmqJmlwDHl8rxWjrP7ijK85Y1 JkvQ== X-Gm-Message-State: AKGB3mINcJEC9ZUmRSjFUoEmd491Q45YbSllFikhHghJVTYieOSzlqjA vTfZaP3cGN+WsRJ4jO1wsj313DrY X-Google-Smtp-Source: ACJfBovVGg7WfD9bdrLnjs3QR0208a2+/1FrFacTJJS4Sl/91EbnMyW1z+QienxhjF8wMD0xEkrHBA== X-Received: by 10.55.142.129 with SMTP id q123mr2775746qkd.7.1515002933721; Wed, 03 Jan 2018 10:08:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:08:02 -0300 Message-Id: <20180103180805.18140-15-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-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:c09::243 Subject: [Qemu-devel] [PATCH v5 14/17] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only 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 , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?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 running qtests: $ make check-qtest-arm GTESTER check-qtest-arm SDHC rd_4b @0x44 not implemented SDHC wr_4b @0x40 <- 0x89abcdef not implemented SDHC wr_4b @0x44 <- 0x01234567 not implemented Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- include/hw/sd/sdhci.h | 4 ++-- hw/sd/sdhci.c | 23 +++++++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index da943a6562..9436375b1e 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -86,9 +86,9 @@ typedef struct SDHCIState { =20 /* Read-only registers */ /* 0x40 */ - uint32_t capareg; /* Capabilities Register */ + uint64_t capareg; /* Capabilities Register */ /* 0x48 */ - uint32_t maxcurr; /* Maximum Current Capabilities Register */ + uint64_t maxcurr; /* Maximum Current Capabilities Register */ =20 uint8_t *fifo_buffer; /* SD host i/o FIFO buffer */ uint32_t buf_maxsz; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 5d1c6b518d..0aed8512c3 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -904,10 +904,16 @@ static uint64_t sdhci_read(void *opaque, hwaddr offse= t, unsigned size) ret =3D s->acmd12errsts; break; case SDHC_CAPAB: - ret =3D s->capareg; + ret =3D (uint32_t)s->capareg; + break; + case SDHC_CAPAB + 4: + ret =3D (uint32_t)(s->capareg >> 32); break; case SDHC_MAXCURR: - ret =3D s->maxcurr; + ret =3D (uint32_t)s->maxcurr; + break; + case SDHC_MAXCURR + 4: + ret =3D (uint32_t)(s->maxcurr >> 32); break; case SDHC_ADMAERR: ret =3D s->admaerr; @@ -1129,6 +1135,15 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t va= l, unsigned size) } sdhci_update_irq(s); break; + + case SDHC_CAPAB: + case SDHC_CAPAB + 4: + case SDHC_MAXCURR: + case SDHC_MAXCURR + 4: + qemu_log_mask(LOG_GUEST_ERROR, "SDHC wr_%ub @0x%02" HWADDR_PRIx + " <- 0x%08x read-only\n", size, offset, value >> shi= ft); + break; + default: qemu_log_mask(LOG_UNIMP, "SDHC wr_%ub @0x%02" HWADDR_PRIx " <- 0x%= 08x " "not implemented\n", size, offset, value >> shift); @@ -1266,9 +1281,9 @@ 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_UINT32("capareg", SDHCIState, capareg, + DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), + DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0), DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, false), DEFINE_PROP_END_OF_LIST(), --=20 2.15.1