From nobody Mon Feb 9 18:45:48 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 151457126107290.44167000758182; Fri, 29 Dec 2017 10:14:21 -0800 (PST) Received: from localhost ([::1]:49312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUzAg-0005tL-3S for importer@patchew.org; Fri, 29 Dec 2017 13:14:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUyng-0003Jt-Ef for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUynf-0006TW-4p for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:32 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:39263) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUynf-0006Ss-0O for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:31 -0500 Received: by mail-qt0-x244.google.com with SMTP id k19so54933612qtj.6 for ; Fri, 29 Dec 2017 09:50:30 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t41sm24223893qtt.84.2017.12.29.09.50.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Dec 2017 09:50:29 -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=lYYoMUA1vjWXsYsNASdJXKaaLcnDoktb+zb9hwT1vqc=; b=JynresloVQuFB9fxGtYdp/+RvuLo9Q6rma4nq7YTTjPKCwjcv6rJZX0r/RQdP10BL3 VC5i90W/2B1kxCEaN+rz4dJleJqSd7SwoYVIY6rwgUWf4invlr+LaiKDUySB4fyUZMzY mjlFjvUAI58PhulpTYi+L4ZxOiUx5q8sLAiOUl5TAC6uQF+acKMi7ru0e181+gak4maz ybA3xTiIfFk6BTY8xxNJFnZXKhv4JL3t5kqHbjsIo9hqjWHJohmh4UMHa+xPT0lqMhLd fjphATzWOtlLzfg2rVZN3CiBvnjDR+q1VMdYb6e3tmM2S5N7g3jTI5H2/BWyaSR0DVhT la4Q== 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=lYYoMUA1vjWXsYsNASdJXKaaLcnDoktb+zb9hwT1vqc=; b=Kkk0+CwuxvQ1AL1wc0ICLtckrONFjoOA4bo1uGR/JKQJpM5SLzFpxVCWX/1URg9ZOT d4uda/45AfM1JW6WoIxSujG70JX57HWJiuEjLJi5IMCcIhqTvTsWMixdfvEHrrOLiENb l44ngo/rYbIzxgHX7TVS7uYENZJj4bzpdgp3Wn11RTJxZIicHsfykhMDy+10sYNhsZ6X XOAwBFvsJcxNR0sASVLLDd8Wzak512Y6tMBd/2+VRNB8WPkKIsGExZCiNi37OBu0ZdaB GYMSTjYvEayWmrei4eOgJQ6cUOtRrLS1jYXFkkO5JGfseiSrPwkBgfd98EE82Gg1ozZI cp3A== X-Gm-Message-State: AKGB3mJO9/GiD31SF1xjuxuXVC3AMAWt9hpuXuWaGOpg7t8+mADkKBrl jX/novde1eAoQWF2+VNUL4I= X-Google-Smtp-Source: ACJfBosa8h0MWQ7ox/uiMpP7Ohr4A318LUYFSPZVpVelXl6AUfyhW4C6P4r6TtYVmtKnreSvH2a/Nw== X-Received: by 10.200.26.234 with SMTP id h39mr48195551qtk.135.1514569830507; Fri, 29 Dec 2017 09:50:30 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Igor Mitsyanko , Andrey Smirnov , Prasad J Pandit Date: Fri, 29 Dec 2017 14:49:05 -0300 Message-Id: <20171229174933.1781-15-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171229174933.1781-1-f4bug@amsat.org> References: <20171229174933.1781-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::244 Subject: [Qemu-devel] [PATCH v3 14/42] 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: 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 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 604ad525f6..ae84af46da 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); @@ -1260,9 +1275,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