From nobody Tue Feb 10 15:45:14 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 1514978028939317.01778625457814; Wed, 3 Jan 2018 03:13:48 -0800 (PST) Received: from localhost ([::1]:48757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgzS-0004i4-VY for importer@patchew.org; Wed, 03 Jan 2018 06:13:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgoK-0003Lr-27 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWgoJ-00064o-6c for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:16 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:33773) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWgoJ-00064f-1B for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:15 -0500 Received: by mail-qk0-x241.google.com with SMTP id x7so1056571qkb.0 for ; Wed, 03 Jan 2018 03:02:14 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id r55sm417735qta.57.2018.01.03.03.02.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 03:02:13 -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=lieOb/bjYleNW4ON9Pk1o5txO55bmr6fo45pdAOCPZw=; b=mxuMNSEcTmU02MyBun8zYMET8mwceUTUIrdHldmyaIvxUOdI9wekcsgoyfQW2DXQm2 Orr0Xj0sxcMCeWEoB5G1uFpRS53wRul6DpIYpNRqaaXxrmRnBpC166kADPHvifEv5tdG /q8BXY8WkaSneP5Xow+nhzSJf6Se5uQb3Rq4sIFBqdZqVAdN05S/ZNhzpKx09HJ0TvnP CmFP5t/wdUYI2IN6QmQB0bcgbCs0Hv2Zw7palDkLAV5B9uFu+VV/KzJnwX+zEcOXpzve sM9nFXu+XiglsRJD9hlI/CYuhhTBL3QyAOVFdjmEzn3XBEogkQFoC/vfPfqdyDw0yAYl WDqQ== 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=lieOb/bjYleNW4ON9Pk1o5txO55bmr6fo45pdAOCPZw=; b=B+XgNgTO81gF6YpYBiT/3DopwzV9kqvUYl0tlePvH7GI1QR33YQ4GtlFsB1uCwCXJq +NauCr6wb64uNvIdto1M94SvSiLqMdYCGcQka/vQYf9I/0i+15HGF10O7+gx5tSnm7F9 lw1ALsgeGRkTtMW+XO4BhGgHjYW4fjXPhwvbEFqhDB6r3jgQDZzjkdHseWWtTy60FoSQ AnbXRwSkXUDcxUisv6J9LR0x2FhDrL3RUpTkDfBgD34dfPD6F2V91OsXvLel7Tr+IQeQ tGaCu/XVW/0p5Q2ZZ1JGAXF2y21AJIdv7X/Dhpnur8b/q9RzvCRsZNoDThU9xRd8Ts91 NVUw== X-Gm-Message-State: AKGB3mLPRiMs1OggSrgqj6uIyDqNEpT8r0s35koYn5OIhGh0HCze0dhp zoesHF38VzIllW3qPh8oiJg= X-Google-Smtp-Source: ACJfBovVkiRa7TmBK1WBAcX/pGY7ewi3faCNQ2ejK5DWjn8GNYCtHCbCNiWe5rmg2LJjWuNAgPhZpg== X-Received: by 10.55.91.5 with SMTP id p5mr1213266qkb.293.1514977334505; Wed, 03 Jan 2018 03:02:14 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 08:01:23 -0300 Message-Id: <20180103110126.29209-15-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103110126.29209-1-f4bug@amsat.org> References: <20180103110126.29209-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::241 Subject: [Qemu-devel] [PATCH v4 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 6989bb09a6..ea7d27087e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -905,10 +905,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; @@ -1130,6 +1136,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); @@ -1267,9 +1282,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