From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565453; cv=none;
d=zohomail.com; s=zohoarc;
b=WyGHx1xM5JnFw13hAnqOlJgaRhKlB7Vl5KZudI+kP/llzyuo9easPK6ML3UssMXldEOX6yJXEx98/nllpTqC72SxR8Kfd9G4tVcOa8uzQ8HqcOGeaKJCwzrIhBZ9YSFtFNMGREkUtfAcW7zRtwXXgBW2Ks0Wu4CeLNvGTKd7dpQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565453;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=WDbWzQ3TRhfqcCdGrWE6Ka+gW+QxOu8dbIYkiLZFWgQ=;
b=I71r821JWQI4zwBEiUMZPVNAwJt3HqcFW5/J690pBEf5lvXS3hSrf08G5m0+bw1L0Ur55XRrzjNORhVOScbRpQzvOpRIp+zj65Q1PvpxBW9PL9BScI5mwshHCWvTCdb+f4jH9cOzyvEdHZDqYOY4dhdPB2WY1TIFt6D6cRQ/UnI=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565453165275.17752976845543;
Sun, 9 Mar 2025 17:10:53 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQfE-0001nM-Oa; Sun, 09 Mar 2025 20:06:36 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfA-0001mP-A0
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:32 -0400
Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQf8-0007HI-K8
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:32 -0400
Received: by mail-wr1-x42a.google.com with SMTP id
ffacd0b85a97d-388cae9eb9fso1695774f8f.3
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:06:30 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-43cfbae50aasm4331045e9.8.2025.03.09.17.06.26
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:06:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565189; x=1742169989; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=WDbWzQ3TRhfqcCdGrWE6Ka+gW+QxOu8dbIYkiLZFWgQ=;
b=rwDxUUNhP9klUCNLQKYifXTQNLSCekAG0Z2mfQd4l5jHrbNQbHlBSN1X1a29+s88hl
fTk/eO7fOwQdGkIxnydrlKS9BABWnB/y/mm4HyX8vbEttazWT1CavjT9wulK9+mGIvLo
jlAZwDWl62IklOAyX+7a5bT5SPbL/OSHTevWi7NzK831sxzwK404DhWDe4gQRv3JvlzN
juzPIrrpJnMQVQeLiA0W8m0ZK0TAM9CGhqPgcyXxwWBcb6EyxBDHuJPdb47cgT26NP2Z
NlmwkZ3sidro1Za+ZGhtKzQ7xuXje3y5p/+ksd+nRGDFh0fqEYqDsJeYlFVlZsGT8jEo
aPjw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565189; x=1742169989;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=WDbWzQ3TRhfqcCdGrWE6Ka+gW+QxOu8dbIYkiLZFWgQ=;
b=VgnAAZKNuoXO+Y+t4bzN8oYnMSdi1nYYE7y3MXMP5vkm5S9CJgvxYcU9Xf6JW21gh2
aS4QD53MRcq/CXi3i3DWv9TTadTSj0XUfs+SQTi+K509Eo/SAGFabacXOdsBSs3IfCV0
/+a3ZmOjbazVEBn4g6YObV1EfpN5b1MfhhU1LaUpin9q9G6AV08zLq2cP6DbK3OIjyWc
CcXHMIHVBz1sMp7YUjo66o+malGN5Sgv5A6wLH9pKHv9R78IytfFbx0Jiiipvxmf/TW0
H638bIwoR4f2BK8/bA94bNTyOt1qXtbTApregM6aFnc/W0HrKZsEYjTj8VUhimDIyG5E
wANg==
X-Forwarded-Encrypted: i=1;
AJvYcCXjpdIJSKoNhVzs8pKMwvJH/LtGOD/2O5pU7ZkSQrYP+R/WNSBCBHj3HHa0GgaQXLgsZcEScO3/RnNo@nongnu.org
X-Gm-Message-State: AOJu0Yy+3aVfNGrSoyCxc4HXNBY2NZHCF1NznrXLyvHpPNDgLis8RvQx
pJsybc3r4t5qB/Ue40n5nsODGnYNDCjTuD0i0gh0/JlsASyuETkP5L64O8/Wrh0=
X-Gm-Gg: ASbGnct9B0LH09aO7ZkQziKjqHAI3SULECkQ5kcEVZrV/OeIb7BhGArcMQUHlRZRxgU
F61kVbLF8vhuS7UKE1W/dyfXFn3ALaJeKr03sd5WrosEc6E0sEJ0OdaoKU1yfi6J4HF9G5dMeuU
wb6zbX0W2QkJY3tE+1AD/HU+QSbwhVfROYYFtzqF8C2JL8XauMXgJOA/TcDyWcYl2oz3lCFfm3J
uaQ3fjykK8dGt+H/S77YNy+rzh4G62D6zV0MtqABiEQXDcI9ODChXVo8NGKZUsjSqZUABWyXXeO
ioWsKt2Fkdc6Q4SWeizXmsrISK6SMONcz1CHXvK4X+QXFfdU5yr3eS7qBOSTjBc9+9FDdtKR0sF
1CfJv4ndK976OBnC/lLI=
X-Google-Smtp-Source:
AGHT+IGVanCNFzRSF3SmLVxHOaiguwuhQTCRH2KkDxTielp4+GYm6Mo+9tz5liVeZoKELFPotM63EQ==
X-Received: by 2002:a05:6000:2c6:b0:391:31f2:b99e with SMTP id
ffacd0b85a97d-39132d1fc45mr7670552f8f.2.1741565188972;
Sun, 09 Mar 2025 17:06:28 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 01/14] hw/qdev-properties-system: Include missing
'qapi/qapi-types-common.h'
Date: Mon, 10 Mar 2025 01:06:07 +0100
Message-ID: <20250310000620.70120-2-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::42a;
envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565455764019100
DEFINE_PROP_ENDIAN_NODEFAULT() macro uses ENDIAN_MODE_UNSPECIFIED
which is defined in "qapi/qapi-types-common.h".
Fixes: 4ec96630f93 ("hw/qdev-properties-system: Introduce EndianMode QAPI e=
num")
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/qdev-properties-system.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/hw/qdev-properties-system.h b/include/hw/qdev-properti=
es-system.h
index b921392c525..49a3825eb46 100644
--- a/include/hw/qdev-properties-system.h
+++ b/include/hw/qdev-properties-system.h
@@ -1,6 +1,7 @@
#ifndef HW_QDEV_PROPERTIES_SYSTEM_H
#define HW_QDEV_PROPERTIES_SYSTEM_H
=20
+#include "qapi/qapi-types-common.h"
#include "hw/qdev-properties.h"
=20
bool qdev_prop_sanitize_s390x_loadparm(uint8_t *loadparm, const char *str,
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565378; cv=none;
d=zohomail.com; s=zohoarc;
b=NFjsEtEd3+aYceLtq4YxkvKkGL9+jBQhL0b2lflalFZeWQuenyOfV94EHW8jlt0AmFScVstFZ3syrx3aexDIMi+LR+f/qjBeEjwqNEdyh5cBXWNC72c/unWXfVfgo8SchBpLbPt1ntKWbw3ywCuM+cdLPi/wK1GHo87p+P8CDIs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565378;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=QSCzkaWIhjHTeY3hvC0iPh38QiDjdtlUv2/bUUP3CZQ=;
b=NveTsHls7stq0tKSrOEGAob1mFrrmrpy9eXOp+o9EIgtBXAObDzRD8MGFVktG23Xt9JhR5vj8eZjstOICqQ7/dIQTrAxIXCgtR1NFGdpKZnoTZGMuX8O7CbWL5bahsc/5lEp9FtBUsrltkyKkuQEv1HftWcCNTSTF77aBkKwCig=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565378062588.9177367288801;
Sun, 9 Mar 2025 17:09:38 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQfQ-0001uk-30; Sun, 09 Mar 2025 20:06:48 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfL-0001pv-47
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:43 -0400
Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfD-0007It-LK
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:42 -0400
Received: by mail-wm1-x32f.google.com with SMTP id
5b1f17b1804b1-43cfa7e7f54so1252325e9.1
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:06:35 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-43cea7f2afasm32401525e9.3.2025.03.09.17.06.32
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:06:33 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565194; x=1742169994; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=QSCzkaWIhjHTeY3hvC0iPh38QiDjdtlUv2/bUUP3CZQ=;
b=xB3cRIu4YwBsEV1XSmZOJ8cIlthIe+qreXMWFecgSQJm46m72J95mycCX9CQWMwDZl
NvK9BD21pm7hA6ZHKElqRIz+1Z/qbn2WBBLkfct5+ax9FJY+wXkC2yvm4kvgLX8HW8py
XfpqhoN+KCPo9mQ/SmyHA4dBiS4xXkPhOXiQA286SjXRvfZqW6NO7ZQEdnxcZWZW5rOZ
HjWj8x4Y2V43poiejokYBhHlNZWbidDz7svgx+YWB5k3B3ggrdOAqCfayOxglFicuZKD
Tiszd20zCJUDnrHkEwWp1Rn8IIC4UWKdAOdnsoVEvC/GbFHzKG+AtkLwprznSH3FIvBl
GaCw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565194; x=1742169994;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=QSCzkaWIhjHTeY3hvC0iPh38QiDjdtlUv2/bUUP3CZQ=;
b=SoNXgaFpx5lMFwRe/akjNM423i6QnWTgtxIAQIkcCRed6SHW4FIbL+P48yF0YmiEa9
YEdyeS8vZM/0V7+SutkTWYDBVocPyUYQPYr/Iw504NCAtLML+aYKxqFJ42YXtyJDIepV
urmpFhPO6QPFQip8MgBeKBZeplnOJWjY4pK8Ar1g+/gWI4zJPlng31Uu+nJXtQKjAi/c
Cham/+x46nFmFSBliGlhVtL561kUohoYDEkd/iuB/TsbuBxEdaqA5hdbPmIQsS0B/Zb+
WVnvblriXUbIDIKYusjr5FF+V/of2wjClr24Tdmmzxp77kVfXHjv7IoBIPQCBV0K+Upt
C8Tg==
X-Forwarded-Encrypted: i=1;
AJvYcCWIhKm97Rajuc+KpHy6DmWr2jKrbPefFqBRGaFb6Bvrhsvm/y2xQ1esuRVdF0tPyp6kWK1ud+hfDbfP@nongnu.org
X-Gm-Message-State: AOJu0YyQMP1xqYMyOcQthUs/SLuCC5Wrb3ziP0vU3rrN+rc9QUqDLrrX
n43XCcpWoHTkzxlYNUhIcpPuMAH3ChTHExSqNyfydwd3JBMRXm0Xb8Im6PfXukg=
X-Gm-Gg: ASbGncv8i7ePiFmTxbHnpu2bnpB4yktjS0SyJFOLVG7XAOfwmbK6pY54Jd07t2tWxfy
RV83vzNUqSeNF0fqYRpEXEpKoxnnq9/ncRpX6j6Ju59r/6W8ImTA7ffrTLTVzyDVP36seB43xAA
9zbshMaxpmjRqv+K6li8X0NB2uU7xE90M5Qw0AziXB0n3WIXRhR3XCHirWoqotrbZQgN9ydKRhF
RLPDqPZXweLSy7MhyzKNtQewtyUOn3/q9G+RIF/fY5XLkrFpNgddWAFUu1I3V4wz+mnSthbfLnh
/ZLk+ERo/G5+nqq3eXNBx45rpuqFJf+zwTcPjNHSXC00pT3wvY+GFPEzErQt+82gnhiqfToBOQe
nUqAA2nG7sZpl4URTng4=
X-Google-Smtp-Source:
AGHT+IFbKwVNHM+WpFEKBfNJvsjk7dqcL6E6e9F2hjbj3R6N2hwQR7KolOqI9zLWIxHHnb9PxpCqKA==
X-Received: by 2002:a05:600c:4ba8:b0:43b:4829:8067 with SMTP id
5b1f17b1804b1-43ce4abb2f5mr41307265e9.6.1741565194123;
Sun, 09 Mar 2025 17:06:34 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 02/14] hw/sd/sdhci: Remove need for SDHCIState::vendor
field
Date: Mon, 10 Mar 2025 01:06:08 +0100
Message-ID: <20250310000620.70120-3-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32f;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565379840019100
All instances of TYPE_IMX_USDHC set vendor=3DSDHCI_VENDOR_IMX.
No need to special-case it.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
---
hw/sd/sdhci-internal.h | 1 -
include/hw/sd/sdhci.h | 4 ----
hw/arm/fsl-imx25.c | 2 --
hw/arm/fsl-imx6.c | 2 --
hw/arm/fsl-imx6ul.c | 2 --
hw/arm/fsl-imx7.c | 2 --
hw/arm/fsl-imx8mp.c | 2 --
hw/sd/sdhci.c | 14 ++++----------
8 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h
index 9f768c418e0..9072b06bdde 100644
--- a/hw/sd/sdhci-internal.h
+++ b/hw/sd/sdhci-internal.h
@@ -311,7 +311,6 @@ extern const VMStateDescription sdhci_vmstate;
DEFINE_PROP_UINT8("endianness", _state, endianness, DEVICE_LITTLE_ENDI=
AN), \
DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \
DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \
- DEFINE_PROP_UINT8("vendor", _state, vendor, SDHCI_VENDOR_NONE), \
\
/* Capabilities registers provide information on supported
* features of this specific host controller implementation */ \
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 38c08e28598..48247e9a20f 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -99,7 +99,6 @@ struct SDHCIState {
uint8_t endianness;
uint8_t sd_spec_version;
uint8_t uhs_mode;
- uint8_t vendor; /* For vendor specific functionality */
/*
* Write Protect pin default active low for detecting SD card
* to be protected. Set wp_inverted to invert the signal.
@@ -108,9 +107,6 @@ struct SDHCIState {
};
typedef struct SDHCIState SDHCIState;
=20
-#define SDHCI_VENDOR_NONE 0
-#define SDHCI_VENDOR_IMX 1
-
/*
* Controller does not provide transfer-complete interrupt when not
* busy.
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 5359a6d8d3b..02214ca1a1c 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -243,8 +243,6 @@ static void fsl_imx25_realize(DeviceState *dev, Error *=
*errp)
&error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg",
IMX25_ESDHC_CAPABILITIES, &error_abort);
- object_property_set_uint(OBJECT(&s->esdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) {
return;
}
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index dc86338b3a5..a114dc0d63d 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -327,8 +327,6 @@ static void fsl_imx6_realize(DeviceState *dev, Error **=
errp)
&error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg",
IMX6_ESDHC_CAPABILITIES, &error_abort);
- object_property_set_uint(OBJECT(&s->esdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) {
return;
}
diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c
index 34c4aa15cd0..ce8d3ef535f 100644
--- a/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@ -531,8 +531,6 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error =
**errp)
FSL_IMX6UL_USDHC2_IRQ,
};
=20
- object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort);
=20
sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0,
diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 3374018cde0..ed1f10bca26 100644
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -471,8 +471,6 @@ static void fsl_imx7_realize(DeviceState *dev, Error **=
errp)
FSL_IMX7_USDHC3_IRQ,
};
=20
- object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), &error_abort);
=20
sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0,
diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c
index 1ea98e14635..c3f6da63220 100644
--- a/hw/arm/fsl-imx8mp.c
+++ b/hw/arm/fsl-imx8mp.c
@@ -524,8 +524,6 @@ static void fsl_imx8mp_realize(DeviceState *dev, Error =
**errp)
{ fsl_imx8mp_memmap[FSL_IMX8MP_USDHC3].addr, FSL_IMX8MP_USDHC3=
_IRQ },
};
=20
- object_property_set_uint(OBJECT(&s->usdhc[i]), "vendor",
- SDHCI_VENDOR_IMX, &error_abort);
if (!sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), errp)) {
return;
}
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 1f45a77566c..149b748cbee 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1731,16 +1731,10 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t v=
al, unsigned size)
=20
case USDHC_VENDOR_SPEC:
s->vendor_spec =3D value;
- switch (s->vendor) {
- case SDHCI_VENDOR_IMX:
- if (value & USDHC_IMX_FRC_SDCLK_ON) {
- s->prnsts &=3D ~SDHC_IMX_CLOCK_GATE_OFF;
- } else {
- s->prnsts |=3D SDHC_IMX_CLOCK_GATE_OFF;
- }
- break;
- default:
- break;
+ if (value & USDHC_IMX_FRC_SDCLK_ON) {
+ s->prnsts &=3D ~SDHC_IMX_CLOCK_GATE_OFF;
+ } else {
+ s->prnsts |=3D SDHC_IMX_CLOCK_GATE_OFF;
}
break;
=20
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565456; cv=none;
d=zohomail.com; s=zohoarc;
b=IhMKzcLpMjWp/RSeqPxwugwfawEk2CqjxLyG5baunhdLELo8HdIajJ92a+5HE1hV72xCTurItnHy9MJzfwPzt9JlwMSXKaYflaf1w9DojEwqshsW2KNKvx7NvFrWI/HUp6dsf+WnRl6XLYOHAvyYU70T8gz1hrwjWKFIzZA8a1k=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565456;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=ZzGu8aPFmIQyqFB0ii3ysyS9QgzkXkJa7t9N53ypfFg=;
b=H1Cv/l2P9p7ZZ6JAnPGIOnCCHyz10j3980lw0j9kRLKP5SX4K37XzeIMzkRRk/QVwq1ykhbNvedAzytiby95KFez9CaaMnJ7nA16aONE+yvc/XZJEZ9rtGyqccJFPQyE8PWEcvXoOTz+poWXcAvhgnprxf7Mure1gE+He9Jpz/o=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565456105823.9442476750434;
Sun, 9 Mar 2025 17:10:56 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQfO-0001sJ-Gz; Sun, 09 Mar 2025 20:06:46 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfK-0001pX-8W
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:42 -0400
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfI-0007Jz-Km
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:42 -0400
Received: by mail-wm1-x32c.google.com with SMTP id
5b1f17b1804b1-438a39e659cso20374485e9.2
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:06:40 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912c0e1476sm13191032f8f.70.2025.03.09.17.06.37
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:06:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565199; x=1742169999; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=ZzGu8aPFmIQyqFB0ii3ysyS9QgzkXkJa7t9N53ypfFg=;
b=i/DX3N6WL8h/9E2kkdz4Q9G/ej00XgHf6ri0TLrMHmyghg969iWPK6Ecz7no6ka2wd
Jvm2Ugj0FYt4lwAFwzcwb7Ab0WTWiKn/fO4BuVnMDqfF/5Rjgy3zq3nIfq1HW0cLeGsQ
mrYRu54ivMY7Js3HjD9OI/zp6JD+J5nMuEC71sjEhlwZBRlIOrOkRzE+tPMJNx/NojjV
C/aCCffhgDqWak3ZRs1TtnWwQTlQcy8dW5n1vBh2ViBIlG1vfbLcxI2s/0CZxWE8avO+
WpDs+JThTNBCmVsAoqfQPTGeVIhPvz5JRc1uPan04/FVzyVSfFvb0uEv+iteh7U/ds21
KWww==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565199; x=1742169999;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=ZzGu8aPFmIQyqFB0ii3ysyS9QgzkXkJa7t9N53ypfFg=;
b=QhWTm4C1PnMklzOfUC7/9sOBt6TNXM1sFsD0+uaIVu9JvuYo5wzIvmoNQ2QoTLeuOb
sUFVI+50lh6U1Y6kzLKZ/09BauZw3q00KGHkvQyKmlJwwQ9ViyYDJvJeWfQkH2upCsUW
rk+MycgtvAAY0hgIh3hOEVdFItv2x/sqeP1TYhksKiC8UxIuT8emualpLK3syzoERKlD
neE6P4aTBugLId3csetVTsifFnSoWEosvgT04Cwdhldex3beN4EPWCD4Qtin0NRaWKV0
+a4XwURdL+/SkzXeKQk9ObSDVYvfogqBKYBeQW0gaDvj/b66yxWO0UI2yczdBeHNprTm
lkHw==
X-Forwarded-Encrypted: i=1;
AJvYcCWiFzegOgC+xfZ5q5Z5iflleaxNzZaHGEdcTszN2xL6ajbmoyt/aL8rceTW6Cc+FgdWM5QTI/tWY+K5@nongnu.org
X-Gm-Message-State: AOJu0YxW348fql+kVcJflhXaKg6GWmRdnWuyI03s8Pq02HNlshdJnPfM
beyxJFkEKJYgepZ3PRE4qgzqPkeVRXKX3/8XcCdzZA6JxqMARRTd9e0e5BunpEI=
X-Gm-Gg: ASbGncttwXp/oZzBuaanvTkn63lBdSkZ3pOd8s19eZMsAnfAd4c4fZSBOpWptZTKUmx
HljliUAdRRvi3lIMkN8Q8/Nk1nc35URLiEHHD+T9dkvBT3kJJfPhDdd30XA2p4qxRxFt3sO4M3U
9KcKBcTKUQHf5Qf1D5zp0fVbnHCYWu9Zcoyb0mH6H/j3Grta2PynYCEf2Sg1KhgOEoaAVnQJRk5
OFwc0U3HkKQ2Jj4zxxmwBHLDVjcJohcrymfnsMHRjvgHhsnsqaxQGoyR7+Nu6X2OJmdzx5ZDYoJ
DdaqsNJNBMSOPTFFyEHk2gn6SNPUUgzglaUmyluoksAYj5P9PPdK9Yf1/EXI6QXHJz/D8AzAZhw
Y+Jh08bXBfeU0Yl+35cA=
X-Google-Smtp-Source:
AGHT+IE1yKaFaTzWwBS5WdOP1A/BxzJYjVRFPe8g9jS5JjKCDnxottFdLlhcBmwEz9qJjL41s0hqqA==
X-Received: by 2002:a5d:64e4:0:b0:391:48f7:bd8a with SMTP id
ffacd0b85a97d-39148f7be31mr1334760f8f.30.1741565199226;
Sun, 09 Mar 2025 17:06:39 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 03/14] hw/sd/sdhci: Redefine SDHCI_QUIRK_NO_BUSY_IRQ
bitmask as bit
Date: Mon, 10 Mar 2025 01:06:09 +0100
Message-ID: <20250310000620.70120-4-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32c;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565458822019100
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/sd/sdhci.h | 8 ++++----
hw/sd/sdhci.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 48247e9a20f..096d607f4b7 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -108,13 +108,13 @@ struct SDHCIState {
typedef struct SDHCIState SDHCIState;
=20
/*
- * Controller does not provide transfer-complete interrupt when not
- * busy.
- *
* NOTE: This definition is taken out of Linux kernel and so the
* original bit number is preserved
*/
-#define SDHCI_QUIRK_NO_BUSY_IRQ BIT(14)
+enum {
+ /* Controller does not provide transfer-complete interrupt when not bu=
sy. */
+ SDHCI_QUIRK_NO_BUSY_IRQ =3D 14,
+};
=20
#define TYPE_PCI_SDHCI "sdhci-pci"
DECLARE_INSTANCE_CHECKER(SDHCIState, PCI_SDHCI,
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 149b748cbee..1dc942a0e06 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -366,7 +366,7 @@ static void sdhci_send_command(SDHCIState *s)
}
}
=20
- if (!(s->quirks & SDHCI_QUIRK_NO_BUSY_IRQ) &&
+ if (!(s->quirks & BIT(SDHCI_QUIRK_NO_BUSY_IRQ)) &&
(s->norintstsen & SDHC_NISEN_TRSCMP) &&
(s->cmdreg & SDHC_CMD_RESPONSE) =3D=3D SDHC_CMD_RSP_WITH_BUSY)=
{
s->norintsts |=3D SDHC_NIS_TRSCMP;
@@ -1886,7 +1886,7 @@ static void imx_usdhc_init(Object *obj)
SDHCIState *s =3D SYSBUS_SDHCI(obj);
=20
s->io_ops =3D &usdhc_mmio_ops;
- s->quirks =3D SDHCI_QUIRK_NO_BUSY_IRQ;
+ s->quirks =3D BIT(SDHCI_QUIRK_NO_BUSY_IRQ);
}
=20
/* --- qdev Samsung s3c --- */
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565518; cv=none;
d=zohomail.com; s=zohoarc;
b=jbNTIUdcTSj2SSXmV0e47+mLsiczdf8vr4HpGFcJAEBj2vUb3+EELjo4bW/kndx1SI2sGpFJ5pacvaMO0DIstBXAZBiPPUFBrxTa8EZbmZ7Q96mgGPG0+wShmIxZgsQywOK14mzca0nwQszFZgHTXCjnEhGvg5ZPpQD/mTrrjak=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565518;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=dQS2FpqOs5TSI58lEsf5ODh6U5Cq4SEzmJ94sUa1jSg=;
b=SvG1s3s1K8YG6M7ylXjgFP21cLyAWQEzsjy1v136Fi04w3+Pfdf7Bu6olUO39xEtSMc3umWxvZeFdtIvE/ipnnWLl6ErrkRsuzFWT9vN/QxxDIXpUrQMuX0gwt0oUOo/cnt3cnr+TpI88ZohySqsQWjN6NHFKPP3rUSldyjCQcE=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565518041762.5374158240551;
Sun, 9 Mar 2025 17:11:58 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQfR-0001vK-3F; Sun, 09 Mar 2025 20:06:49 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfP-0001ud-Uv
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:47 -0400
Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfO-0007L6-0m
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:47 -0400
Received: by mail-wm1-x32e.google.com with SMTP id
5b1f17b1804b1-43bcc85ba13so28999095e9.0
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:06:45 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-43bdd8db6c7sm127555375e9.22.2025.03.09.17.06.43
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:06:43 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565204; x=1742170004; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=dQS2FpqOs5TSI58lEsf5ODh6U5Cq4SEzmJ94sUa1jSg=;
b=hDtuaXB+7emPGfX07HSZgKmQPenHFt1Ikhz69OYJPeMkJobeRLLTq+Ypf6ntonqor/
q86+VPYQG0lAKu12tQN4/i9fNN6XWdrslzIszwIj8Pl4WPKCBwUXHDXaRSjfDIn2qkul
X67GUpq/VLP8Dp0EzkRIZ3AT6BaH8/2xMXw56cNUvEjs4kYGJPZMAtcbgNdUMs6869Lm
z3ZW9MylhPNjOxqTRK+J3/YWJkSZCvuIeKIiTP4ZKAKoNL75Ds0yYdsTG1iUlt7jRwYO
24DK4+xSfuHXr/gCssgbhzYfjjWOUuakbaGkcdzKoUAWwDVnMHfrlQKYZI5MGJLbht0z
hFXQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565204; x=1742170004;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=dQS2FpqOs5TSI58lEsf5ODh6U5Cq4SEzmJ94sUa1jSg=;
b=UZz1SMnG1owA2ck+aELL2/eABq6LoaxA3ra2c3DBGlEhM5XXVcpaCh3mK63f0gmkun
Kong9JAKqgJISuAA9VhlJ0EZTK092gYEq4zDGbChu7/41Gsxdd+q1O92ZJWE3btsndWD
S7S1n7sZ+oU/BWozmdP97/60wy7kdpaKkMmJK+9jLRh7Ca6eVYiC97vmHOwtA4K5oca8
v9MPT/5ga3r4okRnSY3nazN8rdFekzhzIOcknZ3wsATrclm8JQWQD7fcQvJBVkyltAu4
iEIa4ADJLP7nyFsYSQ9we2vcDMCrBGPx4FiMYHZ2DxoZw+Jb3Z3rGmGcLD6ue4ymVFLh
sdSw==
X-Forwarded-Encrypted: i=1;
AJvYcCVwM9WqMp8GhSOUQ5CF0CIsdQ2YYytkt7eiNIVbpton9qwTfIuLC6PhNpG1LpFTvPOaSgG2hyvpXC/6@nongnu.org
X-Gm-Message-State: AOJu0Yy8Xfro3JzL3V6+8XNcyP29O3vt8Uw1VqejP9jw6S1EsnZHuplP
tUjMgUfFufaCWut5Wfhjv9fnvD1+gdOaEWVsRs8+OsFSxdPg7QXImUcJmHug7uA4CwdBbUTOV/5
asqQ=
X-Gm-Gg: ASbGnct7RcJ7Emr90/AC7Ik6L+HXHku7KQlMOn5nnSTpG2cAXBqvqoD7eEYS8QhCaTp
Ilja6mPktgsYXbRjXqeqlxcQNGZz16T/gkKSwje1nEiZb3ckfNg6rYL23zizsTlYG017Dw1+W7b
Q/mZWjp2sLiMQ7uFXrQr4M5r0au6nL22NfWDO4LgsWHDPoX14CAPZrrCmOEwA7x5Mn0vturEAd7
vySGQzRqFpiW57TWLLqGQObf52n4CwSPk4v9EFquZQtKv+0qLLGGstfufebEo9yaFa1I008a16t
AZOi42N7j512YPQeAe+RITctpwb5ZlTP2uxW/oPvZoEtPYAixqt3sj2/ywikUy4v1syoHJGouvp
mUX1wTgwcVr0frxCHzwcIU2pppEFndw==
X-Google-Smtp-Source:
AGHT+IFr14s6HjqqrWZZrFGpCXSJytRcV6kVf92IRNM60n81pYTKgxi5dkVIFwWd6bTQjQFryczrGw==
X-Received: by 2002:a05:600c:5129:b0:43c:f689:88ce with SMTP id
5b1f17b1804b1-43cf6898affmr12074285e9.20.1741565204360;
Sun, 09 Mar 2025 17:06:44 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 04/14] hw/sd/sdhci: Include 'wp-inverted' property in quirk
bitmask
Date: Mon, 10 Mar 2025 01:06:10 +0100
Message-ID: <20250310000620.70120-5-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32e;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565520030019100
Import Linux's SDHCI_QUIRK_INVERTED_WRITE_PROTECT quirk definition.
Replace 'wp_inverted' boolean by a bit in quirk bitmask.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/sd/sdhci.h | 16 ++++++++++------
hw/arm/aspeed.c | 2 +-
hw/sd/sdhci.c | 6 +++---
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 096d607f4b7..d2e4f0f0050 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -30,7 +30,14 @@
#include "hw/sd/sd.h"
#include "qom/object.h"
=20
-/* SD/MMC host controller state */
+/*
+ * SD/MMC host controller state
+ *
+ * QEMU interface:
+ * + QOM property "wp-inverted-quirk" inverts the Write Protect pin
+ * polarity (by default the polarity is active low for detecting SD
+ * card to be protected).
+ */
struct SDHCIState {
/*< private >*/
union {
@@ -99,11 +106,6 @@ struct SDHCIState {
uint8_t endianness;
uint8_t sd_spec_version;
uint8_t uhs_mode;
- /*
- * Write Protect pin default active low for detecting SD card
- * to be protected. Set wp_inverted to invert the signal.
- */
- bool wp_inverted;
};
typedef struct SDHCIState SDHCIState;
=20
@@ -114,6 +116,8 @@ typedef struct SDHCIState SDHCIState;
enum {
/* Controller does not provide transfer-complete interrupt when not bu=
sy. */
SDHCI_QUIRK_NO_BUSY_IRQ =3D 14,
+ /* Controller reports inverted write-protect state */
+ SDHCI_QUIRK_INVERTED_WRITE_PROTECT =3D 16,
};
=20
#define TYPE_PCI_SDHCI "sdhci-pci"
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 98bf071139b..daee2376d50 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -412,7 +412,7 @@ static void aspeed_machine_init(MachineState *machine)
if (amc->sdhci_wp_inverted) {
for (i =3D 0; i < bmc->soc->sdhci.num_slots; i++) {
object_property_set_bool(OBJECT(&bmc->soc->sdhci.slots[i]),
- "wp-inverted", true, &error_abort);
+ "wp-inverted-quirk", true, &error_abo=
rt);
}
}
if (machine->kernel_filename) {
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 1dc942a0e06..19c600d5bfc 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -274,7 +274,7 @@ static void sdhci_set_readonly(DeviceState *dev, bool l=
evel)
{
SDHCIState *s =3D (SDHCIState *)dev;
=20
- if (s->wp_inverted) {
+ if (s->quirks & BIT(SDHCI_QUIRK_INVERTED_WRITE_PROTECT)) {
level =3D !level;
}
=20
@@ -1555,12 +1555,12 @@ void sdhci_common_class_init(ObjectClass *klass, co=
nst void *data)
=20
static const Property sdhci_sysbus_properties[] =3D {
DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState),
+ DEFINE_PROP_BIT("wp-inverted-quirk", SDHCIState, quirks,
+ SDHCI_QUIRK_INVERTED_WRITE_PROTECT, false),
DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu=
irk,
false),
DEFINE_PROP_LINK("dma", SDHCIState,
dma_mr, TYPE_MEMORY_REGION, MemoryRegion *),
- DEFINE_PROP_BOOL("wp-inverted", SDHCIState,
- wp_inverted, false),
};
=20
static void sdhci_sysbus_init(Object *obj)
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565308; cv=none;
d=zohomail.com; s=zohoarc;
b=UMv5OYTBAu7yQvmUxxITfHevEB8kqyyYLQVF9VTLkC4eCKazpjNJPlII43RaB/KwYmwzQXJG6Ukfen+6rcwyZywOjUaSzApMoxKo/Pkl7Q44F0Y4IHEu/F1aXQ+Ik14NVFUhPMVWQwHpaS7H1UFBO+EOELEfsvaozmhMIBYLShY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565308;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=vtO10CroBFmuxTQ9PueWoinPmmKwM9K54hdlvVGKzAE=;
b=a+pDAOHTp9NzpZTnm63ja5aLzqGKTbeeYO/wQ6qSDmhN83c3ECbPGwlisl6BE0YzPJ01WtGLOi8mfjCn0GjUjs2IsD9XulyO87EJEKbmh6xzmjcG7e3NkI0WkuVi9aCWliTgGG5jSD9vaT8oFg6FPU9j53dMhxmGscDWH+xgZjo=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565308224589.8577069838848;
Sun, 9 Mar 2025 17:08:28 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQfb-00022b-LB; Sun, 09 Mar 2025 20:07:00 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfX-00020f-7c
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:55 -0400
Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfT-0007MJ-OM
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:54 -0400
Received: by mail-wm1-x32a.google.com with SMTP id
5b1f17b1804b1-43ce70f9afbso12639525e9.0
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:06:51 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912bfdfad7sm13082199f8f.26.2025.03.09.17.06.48
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:06:48 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565210; x=1742170010; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=vtO10CroBFmuxTQ9PueWoinPmmKwM9K54hdlvVGKzAE=;
b=BCNszlUosgkoC0FflU7TUIVgnJwJEjU70ZlfSChey97FnYKWjbcnJp9hHIL7ob7nCj
i3IIeLieE4oX0uMr/tR6xKqrxucI0mHWiptKlx2P4SoAa6aYa+DW3CJYgAU7fkwRGrwq
TThsrhVIgN69nP4V6ibRomM4QQPJodZptrrHN5oaD+vLuDft+xl3cQGvtltjLPWJD/8D
4FJZbDIFhefL9f9wkJ1IwcGJ2YQUi1CRkh0vxOcEJWfpHxpaeAy/WI/c9wfyKkATciTa
kir5AylEdZqfTzw81u3jKHDTMX7FfbAryDFpHZsuFph6C5zx2frdD/YwGMfN0X0Glnu0
240w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565210; x=1742170010;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=vtO10CroBFmuxTQ9PueWoinPmmKwM9K54hdlvVGKzAE=;
b=Ks9Z7fe326/AvMZOP6yZcLTjb3LxGOxJpIQ82mDESE9ZGlThwqvV1IfFZO1p/vofD9
IhqjwqQlJoViqWiZWMZX8bbApo0jjOdxU2rhDApsft7KGCyKjV4kLFW8BT9FRyYfbjkv
VDS0SKoPY9bPXsbUWXJjZNGOvjIl+x0U7s7u7UYaluFAvFs6WsYaB8dz93PvVWfNXkcO
q+08uHkwDTAAr4lJK++AXTL7dEmilKv2XxkPtfoYjZT11gqJnZrnYr8lW54UovBWACZB
gQCOWkgH4nozmgH125AVW2ZUak++mh/Fkuwem4rOau4CcyuC1hApxwRY/nGn0vRYXFN9
/mYA==
X-Forwarded-Encrypted: i=1;
AJvYcCVbtRvJRNMX2N8rEwqFHlcRrUF2ifXNW80/qlongrwqZN6YZdI9pUBYPZExMjGFdWQNHICmPm9pODsW@nongnu.org
X-Gm-Message-State: AOJu0Yw0LqRsY5kTK6m2HX5GZMOLgrSMloG2bxAvSjwGum6DOKYQ09TQ
3Ck6JVz8fCcIWa43RzZ2XF2tB2+tgZ21rYKIDv1SH0UwTBMaEN8QHf/UZOdt+yjbvpj7o1Id5uq
MsFc=
X-Gm-Gg: ASbGncsJs6lec8ETNJ81Rtppni3DZ456pQZvcIU/xCEtyH99bgSrdBMd5RySZjoFesh
h6esMn1qTTY4rCbVKUT3iKYPjNIcBUpMxhdSV8NPJGtFeYvUCiQUQBcQf2E22UiSK1XX994RJb0
ClqRFaZHtgoZhy7mk9qBtSrRMDERcJtXQIvuBSbbEOpOhDjQZ6ux3RBbS9VnrKa+1iMpWeCp5Kb
fp37DDHbp99dkjCqzmHAYsBepdwwtLCq5YHPm+DMuCn+9mbpIKCU5u8ab68Ezmr9nMUi+JT/HOH
Op9dUkRP6pd8IoVTQa3Kr6/95NA8IisqTDqVPzjzT/OjqAu+ATycyNKZbs0yKuMfQH3CRB9H7Fh
9bnxHbtVCXMtvbcj/FAE=
X-Google-Smtp-Source:
AGHT+IFhNGrH+72dBBuvE39rw4Xrbpi7OKmGDcXtRHzlYrrJp2PqWtacezAZubHFNdsjwdLBS5eItw==
X-Received: by 2002:a05:600c:3ba1:b0:43c:fbbf:7bf1 with SMTP id
5b1f17b1804b1-43cfbbf7eb2mr1844265e9.30.1741565210286;
Sun, 09 Mar 2025 17:06:50 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 05/14] hw/sd/sdhci: Include 'pending-insert-quirk' property
in quirk bitmask
Date: Mon, 10 Mar 2025 01:06:11 +0100
Message-ID: <20250310000620.70120-6-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32a;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565310067019100
Import Linux's SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET quirk definition.
Replace 'pending_insert_quirk' boolean (originally introduce in commit
0a7ac9f9e72 "sdhci: quirk property for card insert interrupt status
on Raspberry Pi") by a bit in quirk bitmask.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/sd/sdhci.h | 5 ++++-
hw/sd/sdhci.c | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index d2e4f0f0050..2e6e719df7b 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -34,6 +34,8 @@
* SD/MMC host controller state
*
* QEMU interface:
+ * + QOM property "pending-insert-quirk" re-enables pending "card inserte=
d"
+ * IRQ after reset (used by the Raspberry Pi controllers).
* + QOM property "wp-inverted-quirk" inverts the Write Protect pin
* polarity (by default the polarity is active low for detecting SD
* card to be protected).
@@ -101,7 +103,6 @@ struct SDHCIState {
/* RO Host Controller Version Register always reads as 0x2401 */
=20
/* Configurable properties */
- bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */
uint32_t quirks;
uint8_t endianness;
uint8_t sd_spec_version;
@@ -118,6 +119,8 @@ enum {
SDHCI_QUIRK_NO_BUSY_IRQ =3D 14,
/* Controller reports inverted write-protect state */
SDHCI_QUIRK_INVERTED_WRITE_PROTECT =3D 16,
+ /* Controller losing signal/interrupt enable states after reset */
+ SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET =3D 19,
};
=20
#define TYPE_PCI_SDHCI "sdhci-pci"
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 19c600d5bfc..d1b1b187874 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -320,7 +320,7 @@ static void sdhci_poweron_reset(DeviceState *dev)
=20
sdhci_reset(s);
=20
- if (s->pending_insert_quirk) {
+ if (s->quirks & BIT(SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET)) {
s->pending_insert_state =3D true;
}
}
@@ -1307,7 +1307,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val=
, unsigned size)
* appears when first enabled after power on
*/
if ((s->norintstsen & SDHC_NISEN_INSERT) && s->pending_insert_stat=
e) {
- assert(s->pending_insert_quirk);
+ assert(s->quirks & BIT(SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET));
s->norintsts |=3D SDHC_NIS_INSERT;
s->pending_insert_state =3D false;
}
@@ -1557,8 +1557,8 @@ static const Property sdhci_sysbus_properties[] =3D {
DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState),
DEFINE_PROP_BIT("wp-inverted-quirk", SDHCIState, quirks,
SDHCI_QUIRK_INVERTED_WRITE_PROTECT, false),
- DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu=
irk,
- false),
+ DEFINE_PROP_BIT("pending-insert-quirk", SDHCIState, quirks,
+ SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET, false),
DEFINE_PROP_LINK("dma", SDHCIState,
dma_mr, TYPE_MEMORY_REGION, MemoryRegion *),
};
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565263; cv=none;
d=zohomail.com; s=zohoarc;
b=R79gFMI3R/16xB5Wu0/+o8hr0WfJWVzBP9abL/j7EJWJkKSxm0kWLpVkHL5hg4KqkAPln/TuQEckEC/8KBAnVCn3DD8CfA62Xfz0QTDBHfuiw1mamCgJkb3O25xIBZq+5hUU3QBkWoG1fItonckm56AElScwFwJGUwbxKEVQhf0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565263;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=ZOP1JCepoOpEGtD0DeikejYc/lpyX9gmrkBY6224GqM=;
b=gdeDoAVCu97ZXTQ+0CsE5+CjD7Dshg+8MQDoGAsezlwBqA1RozfTjWxozkEjkN3ryCJF8U3UVPeNh9qEys53bRXuF6xuKNDJ7TDkbNYHeCcKWrjG9WgeCGLFRvm0LfVi8GlzpfdOk3Y1k0WtDR/GqcCIrpyQ5ZsIY5pdXfjxjmA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565263808340.3934418579486;
Sun, 9 Mar 2025 17:07:43 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQfg-00026L-0h; Sun, 09 Mar 2025 20:07:04 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfa-00022f-TB
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:59 -0400
Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfZ-0007My-1v
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:06:58 -0400
Received: by mail-wr1-x42a.google.com with SMTP id
ffacd0b85a97d-3912fdddf8fso1699506f8f.1
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:06:56 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912bfe0004sm12885561f8f.40.2025.03.09.17.06.54
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:06:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565216; x=1742170016; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=ZOP1JCepoOpEGtD0DeikejYc/lpyX9gmrkBY6224GqM=;
b=M2HY8597TyFM9qb24Gu96A+k+r5X6Te+fHAgXNag0yUv9lcB0+fHlgq5IbV79IsIUi
DUYfGnkP7q6pW43mIsgQStZEFWAbsrFSatyxyjROVaDCTVMWglcPC0bzigSEXLEfamLE
MlsU+FeiohwySuxV5GbhMqzOl1vxzDli38aMn4Kl52Z/sRLUyALkOcSLy3rQ3fxIsAv4
vZCP+1muSoSp2wGhFtEuRsOjOhfYGZ+hupZGGjytNm8h11ra7uIrKw0GM8M5imOgrFlQ
Ws9ATEjwxnhsB776Z8HEOMUdojWTKSed1U7yB4ui5yEA2CH57uV4o9mzRq8gZN0u3Vpe
cQpQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565216; x=1742170016;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=ZOP1JCepoOpEGtD0DeikejYc/lpyX9gmrkBY6224GqM=;
b=J1qtLclOPIintZekomsDNVbFxJX45MxppXvib0oErEWioinaUK3iIR98uX4Y3LKRo9
JyMWial7+YeSTkW+llhOcl73HgxYUeYOCM9k1R/tOBzBbMEFF7AJMgky42nKyOxmMPVL
QmN5Ozmu3MSqLUdh9QTVqlcKOUFwTV2VdRxY/52Hp1FxdX09jxARKu9niCubXITaeK/o
kgBZifq562BdsZOrHCzlsdmm4rdXdaOR0aQZQv+PDSQXsl6NWx7wDkwACdk2l2UswTAe
lK6vx1CFxJ91MFn5cDEIJCbgVuZQTkF4AqoPk45sV9yWGdcwUASi9SFyQQANi6SAUFIa
eIJg==
X-Forwarded-Encrypted: i=1;
AJvYcCVSauE1kwwsWX0Lvt8MNCq9bVaysct8aOs0Dbk1TL40LR5Rjqvo4Ls3fOESToXpvW2o/yDtjk7z2+if@nongnu.org
X-Gm-Message-State: AOJu0YynnivJhtjYX5Tr86pJ2NJI7HgWpf9E8ff3ASWBHXt3qtyqNCyp
XC2shRdr+7i+5ypKwnMIRPi2KTa+QlpEudl1d6V1VVCOcarSrEK4PdjU8bBtDbQ=
X-Gm-Gg: ASbGncs9eQDgQK5rght81A+mFOryt23HmTSCKv4oocP4vqx+MMpeTYPz8b/rhEqNMkp
CJrC4HXjG17ZiLnXCIhuLJNo8is7BPt2/LJ+9Sheg3wAtycw5q/bihKUfoO1v/cWrH7aJDeKoW8
SesPZgPHKT2Bz+YFXr7dLq7n7aGB40BF568i+WX0rTqmNoc0BrBXd0xCYIKWYlxiEZr/ay8rOEJ
XbSczoko6H+v4neaCOtgsK1z0qvPLTkrRzFCxxrjuzr+JfMeqwDz2jx0Dee+0OqWcEMBdDHOllD
QzogMvN1wHrGJUuBbsEx0khkf6ZAHyt9MsoUWjhD5qUsemHQE4vS3GgHqM+05o7Zuc6sC2eGoNq
Fmjapn/sZNqFCN1/x/u4=
X-Google-Smtp-Source:
AGHT+IHZn5VNBCcyaAnuhIVlrKNkJ1fO3I+O/PeMTYOLZEWuAXd6veEaEqResUHxa0p0v8isyn7U9A==
X-Received: by 2002:a5d:47cb:0:b0:391:21e2:ec3b with SMTP id
ffacd0b85a97d-3913aed7e68mr4257819f8f.3.1741565215639;
Sun, 09 Mar 2025 17:06:55 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 06/14] hw/sd/sdhci: Introduce SDHCIClass stub
Date: Mon, 10 Mar 2025 01:06:12 +0100
Message-ID: <20250310000620.70120-7-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::42a;
envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565266936019000
TYPE_SYSBUS_SDHCI is a bit odd because it uses an union
to work with both SysBus / PCI parent.
For this reason, we can not use the OBJECT_DECLARE_TYPE()
macro twice (on SYSBUS_SDHCI & PCI_SDHCI) and we must
keep a pair of lower DECLARE_INSTANCE_CHECKER) and
DECLARE_CLASS_CHECKERS() for PCI, in order to avoid:
include/hw/sd/sdhci.h:165:1: error: redefinition of 'glib_autoptr_clear_S=
DHCIState'
include/hw/sd/sdhci.h:165:1: error: redefinition of 'glib_autoptr_cleanup=
_SDHCIState'
include/hw/sd/sdhci.h:165:1: error: redefinition of 'glib_autoptr_destroy=
_SDHCIState'
include/hw/sd/sdhci.h:165:1: error: redefinition of 'glib_listautoptr_cle=
anup_SDHCIState'
include/hw/sd/sdhci.h:165:1: error: redefinition of 'glib_slistautoptr_cl=
eanup_SDHCIState'
include/hw/sd/sdhci.h:165:1: error: redefinition of 'glib_queueautoptr_cl=
eanup_SDHCIState'
165 | OBJECT_DECLARE_TYPE(SDHCIState, SDHCIClass, SYSBUS_SDHCI)
| ^
include/hw/sd/sdhci.h:158:1: note: previous definition is here
158 | OBJECT_DECLARE_TYPE(SDHCIState, SDHCIClass, PCI_SDHCI)
| ^
Since we can not use SYSBUS_SDHCI_GET_CLASS() on PCI instances,
cache the class reference in the object state as 'sc'.
As this is not a normal use, introduce SDHCIClass in its own
commit.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
I plan to remove the union later.
---
include/hw/sd/sdhci.h | 17 +++++++++++++----
hw/sd/sdhci-pci.c | 1 +
hw/sd/sdhci.c | 3 +++
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 2e6e719df7b..c42aeab6848 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -30,6 +30,8 @@
#include "hw/sd/sd.h"
#include "qom/object.h"
=20
+typedef struct SDHCIClass SDHCIClass;
+
/*
* SD/MMC host controller state
*
@@ -41,13 +43,12 @@
* card to be protected).
*/
struct SDHCIState {
- /*< private >*/
union {
PCIDevice pcidev;
SysBusDevice busdev;
};
=20
- /*< public >*/
+ SDHCIClass *sc;
SDBus sdbus;
MemoryRegion iomem;
AddressSpace sysbus_dma_as;
@@ -110,6 +111,13 @@ struct SDHCIState {
};
typedef struct SDHCIState SDHCIState;
=20
+struct SDHCIClass {
+ union {
+ PCIDeviceClass pci_parent_class;
+ SysBusDeviceClass sbd_parent_class;
+ };
+};
+
/*
* NOTE: This definition is taken out of Linux kernel and so the
* original bit number is preserved
@@ -126,10 +134,11 @@ enum {
#define TYPE_PCI_SDHCI "sdhci-pci"
DECLARE_INSTANCE_CHECKER(SDHCIState, PCI_SDHCI,
TYPE_PCI_SDHCI)
+DECLARE_CLASS_CHECKERS(SDHCIClass, PCI_SDHCI,
+ TYPE_PCI_SDHCI)
=20
#define TYPE_SYSBUS_SDHCI "generic-sdhci"
-DECLARE_INSTANCE_CHECKER(SDHCIState, SYSBUS_SDHCI,
- TYPE_SYSBUS_SDHCI)
+OBJECT_DECLARE_TYPE(SDHCIState, SDHCIClass, SYSBUS_SDHCI)
=20
#define TYPE_IMX_USDHC "imx-usdhc"
=20
diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c
index 5268c0dee50..fe62582de90 100644
--- a/hw/sd/sdhci-pci.c
+++ b/hw/sd/sdhci-pci.c
@@ -73,6 +73,7 @@ static const TypeInfo sdhci_pci_types[] =3D {
.parent =3D TYPE_PCI_DEVICE,
.instance_size =3D sizeof(SDHCIState),
.class_init =3D sdhci_pci_class_init,
+ .class_size =3D sizeof(SDHCIClass),
.interfaces =3D (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
{ },
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index d1b1b187874..176bee6b8f5 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1419,6 +1419,8 @@ static void sdhci_init_readonly_registers(SDHCIState =
*s, Error **errp)
=20
void sdhci_initfn(SDHCIState *s)
{
+ s->sc =3D (SDHCIClass *)object_get_class(OBJECT(s)); /* Cache QOM pare=
nt */
+
qbus_init(&s->sdbus, sizeof(s->sdbus), TYPE_SDHCI_BUS, DEVICE(s), "sd-=
bus");
=20
s->insert_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL,
@@ -1960,6 +1962,7 @@ static const TypeInfo sdhci_types[] =3D {
.instance_size =3D sizeof(SDHCIState),
.instance_init =3D sdhci_sysbus_init,
.instance_finalize =3D sdhci_sysbus_finalize,
+ .class_size =3D sizeof(SDHCIClass),
.class_init =3D sdhci_sysbus_class_init,
},
{
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565411; cv=none;
d=zohomail.com; s=zohoarc;
b=ajINbjgmAV1mT1f7q2ISSAENIYzs41WqOp3KSsPL84nrOx5u33PTBvhXELWJZR8cCVM39sstSQl4D6jeda+eqA4/iu8I3Lbk79ALrrKEhX8ZLaiRimpqXuWzum+MIqHS0XceoVS3eWvyrjwfIJMj8f09kA88tHjr5+GOwQcZPuc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565411;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=nrSyjlqQLxIdz5EnxNr6LHBBkoV7ANv7WOr2ucCNGYM=;
b=bIBSuBhHRmi7asctP+Rxld2p6ba3bu14QTJzCH2aRS3M9hM4hawAUpb2Kdp3UG7CH72WrCb5Z4+8Nsaqm4/3vg4mZwH2EcYPYm+T9KxxwK6KUh/iHkTzbZf92pIKDSINx8Z59JFxsqzZe6ZHqGddgJOcRPmnKoKK9DCtcB1MQcI=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565411543164.33732701707515;
Sun, 9 Mar 2025 17:10:11 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQfn-0002AY-F3; Sun, 09 Mar 2025 20:07:11 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfi-00028W-Nf
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:07 -0400
Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQff-0007OF-VJ
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:06 -0400
Received: by mail-wm1-x335.google.com with SMTP id
5b1f17b1804b1-43bc63876f1so31288705e9.3
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:07:03 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-43cf7b88494sm20159685e9.0.2025.03.09.17.06.59
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:07:00 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565222; x=1742170022; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=nrSyjlqQLxIdz5EnxNr6LHBBkoV7ANv7WOr2ucCNGYM=;
b=io3IZVhJOyKBeVHK9/jJU+7iU6yvP9QrIxS+r43oHKyQ43BIA1aSsDnuJVO9pivJDQ
Vws15/9C8YmtAmGh85qKqZZAX0jqGTxiNB1qxzgcFrwo3KKW3l+P5/XIWZfLifQUqOnb
E+hor9F/l8wcv9z9Lk1r4UU9esRGYjMvA5iQx/6JApI4uAOr3G+cKRrvr5WkPTgZepi8
Ujxe+UvgvEEnkOnE101oJdQBBckvu11hl7LyJ5Je1Vgz7tZDXtGqxYxJ+dksIrjShOBk
5IIdGtJdoMDZKSjVZHvTV00BocVUSu2J2wcO+J42qohaOVaGnxq5Gb9g+mDyB/iUYsnS
d3aw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565222; x=1742170022;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=nrSyjlqQLxIdz5EnxNr6LHBBkoV7ANv7WOr2ucCNGYM=;
b=dJxV0IhIAO03SSSPpC1PoE4lvS+35hJn/xmUQzjOSEJqwGN6rLsrW3xnjiuC0uvNhO
7reII7iMKLkLSQt055pGmjpnZ5+JyWBx8QNCHvZR0rNAY5lkQeSTOWs8GtI5pR9HAszC
A3Wgky8f4xXAtFtZKEWtqIiZZMWDIrgx7NDcZ6A7fDkcrrcmaLWpQlVq4VHWt3ESuW1r
AynkYUIxMraBQQZWDxtx1zR4024dngJiQSVgfJcAZhK+J2p9ArSWCZKjc3c+8H+EJaoO
O0NMWXIidHdzfD53aBtXlbeyGHDYyAuyzYETYt81bfiQ1g1U4bUmOhW45MUgwsrRi1Sm
7C+g==
X-Forwarded-Encrypted: i=1;
AJvYcCUf8bKRKzg6TdQhQYZmE2Lcx5p114/Y4PAoRmulWgTsxtbhHNtDSeR3/1/mOhbxIyPvmgJ9fwmEkWzu@nongnu.org
X-Gm-Message-State: AOJu0Yy+KmnMYKF+TM50XKWGCAe9DDNS0tMKj6KSqRJep1yikX7z9Akg
AhO0+rDE6FqbhIJSlZvhcHCowhN17Zg1/ZSGtr+n1/UoKkaNy7FKKJzmjgonNDs=
X-Gm-Gg: ASbGncsB6kO6pfUglrVzYehOIrimNYiOrI8SSwuodCSk1+TEZUXP+jMDra/968WOjRt
V/Pcud0XQxKShaH9EcgEXhmLoN2EgkTG7C79Z4CakvmcBZ6yMcTYCAudXBiMDWxthBBUVsxQJO9
i3g53yrw16psiLz9b5AtdTL5aZU4tSaPWKucj+fo6YaDQoEdkDrVffvCS8uFMZkNvtQTyjkYtHM
xmo7zkp/Q0lAXjsKvWls81Gibs9/+YQnk2M2RjQryZOf0bgq4PnCW1jZEVuPJI4dOM/c4gcE9rk
I4z41GWFvw8M476eTP/7OjbyHTlL3xrIITgw3j75RC+6sqWSMNKF64+3NuVb3Rq30V3TSGmIdd7
/cHQ4mIOcaZc6pZwSeVE=
X-Google-Smtp-Source:
AGHT+IF858cwE1RzW5WeHVoN0/VwJuGZY/TNoX99uh/LJTh6Ystvp8OJwOp0Q4+zLVVLApqHif71Zw==
X-Received: by 2002:a05:600c:4687:b0:43c:efae:a73 with SMTP id
5b1f17b1804b1-43cefae1393mr24142295e9.10.1741565220740;
Sun, 09 Mar 2025 17:07:00 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 07/14] hw/sd/sdhci: Make quirks a class property
Date: Mon, 10 Mar 2025 01:06:13 +0100
Message-ID: <20250310000620.70120-8-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::335;
envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565412888019000
Allow to enforce implementations quirks by the class.
All TYPE_IMX_USDHC instances use the quirk: move it
to the class layer.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/sd/sdhci.h | 2 ++
hw/sd/sdhci.c | 12 +++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index c42aeab6848..ee1e7ef4b10 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -116,6 +116,8 @@ struct SDHCIClass {
PCIDeviceClass pci_parent_class;
SysBusDeviceClass sbd_parent_class;
};
+
+ uint32_t quirks;
};
=20
/*
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 176bee6b8f5..570d825d130 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1427,6 +1427,7 @@ void sdhci_initfn(SDHCIState *s)
sdhci_raise_insertion_irq, s);
s->transfer_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL,
sdhci_data_transfer, s);
+ s->quirks =3D s->sc->quirks;
=20
s->io_ops =3D &sdhci_mmio_le_ops;
}
@@ -1888,7 +1889,15 @@ static void imx_usdhc_init(Object *obj)
SDHCIState *s =3D SYSBUS_SDHCI(obj);
=20
s->io_ops =3D &usdhc_mmio_ops;
- s->quirks =3D BIT(SDHCI_QUIRK_NO_BUSY_IRQ);
+}
+
+static void imx_usdhc_class_init(ObjectClass *oc, void *data)
+{
+ SDHCIClass *sc =3D SYSBUS_SDHCI_CLASS(oc);
+
+ sc->quirks =3D BIT(SDHCI_QUIRK_NO_BUSY_IRQ);
+
+ sdhci_common_class_init(oc, data);
}
=20
/* --- qdev Samsung s3c --- */
@@ -1969,6 +1978,7 @@ static const TypeInfo sdhci_types[] =3D {
.name =3D TYPE_IMX_USDHC,
.parent =3D TYPE_SYSBUS_SDHCI,
.instance_init =3D imx_usdhc_init,
+ .class_init =3D imx_usdhc_class_init,
},
{
.name =3D TYPE_S3C_SDHCI,
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565449; cv=none;
d=zohomail.com; s=zohoarc;
b=dg/pDfZe/jkaecZENCY7fTfdF6sSWBuz7Z/Guo9G7WqCqqdw/ToJG/A2oYy/nzpRlDjHSTm0cgjLg8k553VeKxR2duylNFL9mxlxalwer8Bd831Xwh6/K99TEqUCPop2lw6pWJyNn7M5ebQHCrJlafqqzCkl8VH26VAWcFCTeAI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565449;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=erRrSHMQeC5BJ4//qt9VD1yvOjST1dyAioJ5r7a/Pw4=;
b=STiZfhj69dh5HAj/9gU45imbjed8A3VBCnTzmBsjp8m/Fuu2lnB1LBEJbU3CigN8BaSzLUsdYLY7hnZOImMM42IDVGSkiWj2tEaKOaCj56FrI4SlTuNBJvvPmjXlaDDIW6rIH10efh2s0Vg/cb4hhiZjL9rWFST+tQ66+/XvN2A=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565449756129.88713062051102;
Sun, 9 Mar 2025 17:10:49 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQfn-0002Ax-PI; Sun, 09 Mar 2025 20:07:11 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfl-00029a-SJ
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:09 -0400
Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfj-0007P0-JU
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:09 -0400
Received: by mail-wm1-x335.google.com with SMTP id
5b1f17b1804b1-43cef035a3bso4986095e9.1
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:07:07 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-43ceaac390bsm60613665e9.35.2025.03.09.17.07.04
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:07:05 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565226; x=1742170026; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=erRrSHMQeC5BJ4//qt9VD1yvOjST1dyAioJ5r7a/Pw4=;
b=s4lh0pR2Iet4mZM8ga22CVeDPbu3VEUtsJU84T6ZkwVKlT2MA8aK8P1dRistp2W7sp
8AAU948Nt8rs0uA5Ovksyw6uzJotRSVAXKD2QIoSLfe6UV59t7BqHGrCoiDjiYgSheSa
Wnymz9m8W4Pt3EMGA+dh+vqTwV+5KqI0pZNGsr54taPQ9+swlpP4+ozBvGgujQ7TDxJ7
d5AbUubSs8pVWaKhqXvVpJgmOKRsyAp38DTN2KqeQH/tDGjwknZpUtxw7/+sRcu2utji
wdpesBrG53tXOrFmnm/3rptQGQfby/Dq+buE4bpVbAY1CdSi4K1wW2Wl20C17N9iYT5a
4ApQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565226; x=1742170026;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=erRrSHMQeC5BJ4//qt9VD1yvOjST1dyAioJ5r7a/Pw4=;
b=nDea/5mN5ilwP3xz+UT5mCzLfWdMYx70jrnPsByjjlzJd9sFC7n7FWQ68MvsTygLaW
B60OE0ds55/L8zJASlaqYNhbgfK2PBSEJRKc+AYPJEd/dhtamnYEyCrkmdfgpwz2k5ca
qfNefa59tQjR0lVSb/XVA8quLSvrM7KP92ub4dXHY7ZwM1+cbklCPyv4bWYUjzi4mmAl
JUkkJ1AjTHfBvTRqG2/nMjjw5aajjHH8zKHBkVMt5n+oNVYwp4pD/4dgKUv0aTTYVjsl
DOhXnhzpfAy3MCYMKR0JoJnav2kemQbhpU8d72pnkt+jjSzxqwu95ELiIZzTq+SwIp9l
OhaQ==
X-Forwarded-Encrypted: i=1;
AJvYcCVu445G+A7h6UN30j0rzOnB50/MNKBh5TOWaLK46Rp+9wbE93djZe7yiO6K1KjGpArEHhjLI0djrKOE@nongnu.org
X-Gm-Message-State: AOJu0YxCSmRI1yuIu0Z8R9AcbNkidHz4BHbrwMkRYVrCic9unmMUq+B7
1ShARk1oZ35zotbpjAg1ktf9P5LQ0AF7q7HHVybYiJ+hJJot0vdLLVajb9uAxzg=
X-Gm-Gg: ASbGncvngxrp36Zttn0vAFxGA7KnCPG1S+JV/3GZCs3Innf0z7U778btpkc2OlUvXq7
Zf01bUTfSsYCuZFrm5N8ZtkcOnYTPvLZxwbVgx84SEwG3iUfO9G/wQG88dHoJYOLHcbW9sxtwGO
o7qv/713koiVaZKLRDljgKBoqKw8F2EA27RMBwDwg1lhmaUJBqlgDkuwIrNPsj8Be8wU1uj8rn+
lYRr8PW4vkMYvcGti7tBdkmgacyEPK//YnN54qeOXOlLs4FgIlzdtplXxa+fXauRN1HZT7ssdYS
Z+cbHvZrSHsMeT2VCW2IilzuW+01NWCfpN9aiigDKK9/N7Oax2Df8JmiZKTDIzPtx04C+0yAwOj
3qeQZ0xf8UsbuDb1sbpRISvV2anN9yw==
X-Google-Smtp-Source:
AGHT+IFoUKQN3o8/uk5fDCkuNHeQN81/vS5tNxy9v1yzDrZ1OFvhclzk6VdjfEEq91eND2ZCZqjdcA==
X-Received: by 2002:a05:600c:3544:b0:43b:c878:1466 with SMTP id
5b1f17b1804b1-43c601d94f1mr66442495e9.8.1741565225940;
Sun, 09 Mar 2025 17:07:05 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 08/14] hw/sd/sdhci: Make I/O region size a class property
Date: Mon, 10 Mar 2025 01:06:14 +0100
Message-ID: <20250310000620.70120-9-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::335;
envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565450207019000
Be ready to have SDHC implementations to cover
a wider I/O address range.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
---
include/hw/sd/sdhci.h | 1 +
hw/sd/sdhci.c | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index ee1e7ef4b10..dfa0c214036 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -118,6 +118,7 @@ struct SDHCIClass {
};
=20
uint32_t quirks;
+ uint64_t iomem_size;
};
=20
/*
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 570d825d130..3467385490d 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1444,6 +1444,8 @@ void sdhci_uninitfn(SDHCIState *s)
void sdhci_common_realize(SDHCIState *s, Error **errp)
{
ERRP_GUARD();
+ SDHCIClass *sc =3D s->sc;
+ const char *class_name =3D object_get_typename(OBJECT(s));
=20
switch (s->endianness) {
case DEVICE_LITTLE_ENDIAN:
@@ -1469,8 +1471,9 @@ void sdhci_common_realize(SDHCIState *s, Error **errp)
s->buf_maxsz =3D sdhci_get_fifolen(s);
s->fifo_buffer =3D g_malloc0(s->buf_maxsz);
=20
- memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, "sdhci",
- SDHC_REGISTERS_MAP_SIZE);
+ assert(sc->iomem_size >=3D SDHC_REGISTERS_MAP_SIZE);
+ memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, class_name,
+ sc->iomem_size);
}
=20
void sdhci_common_unrealize(SDHCIState *s)
@@ -1548,10 +1551,13 @@ const VMStateDescription sdhci_vmstate =3D {
void sdhci_common_class_init(ObjectClass *klass, const void *data)
{
DeviceClass *dc =3D DEVICE_CLASS(klass);
+ SDHCIClass *sc =3D (SDHCIClass *)klass; /* No QOM cast check due to un=
ion */
=20
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
dc->vmsd =3D &sdhci_vmstate;
device_class_set_legacy_reset(dc, sdhci_poweron_reset);
+
+ sc->iomem_size =3D SDHC_REGISTERS_MAP_SIZE;
}
=20
/* --- qdev SysBus --- */
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565351; cv=none;
d=zohomail.com; s=zohoarc;
b=Tl3upTkzAkyapmiAR6layZPnlE32t+GWRifNcOFBrIy/1HhIgmnMx2FgIL6UOxfRNrKcfab1EvUr/OeVlxIa1xNXorjxK8xG6kN0PC4Qnxdifr2uOR1QdmxMEaDausGFysdjsPsqSttQhuCSltPsnP+gJiT0nPTc8Bn0Q6uqDI4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565351;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=gbDUibVkXNR8REIQVVOEU7ZYDHi6ABLRhy2a8AYGnao=;
b=MdDgeGEhf4k6MDficmfFyNtsfF/g/xnUJQV8BIHRNviqAWXq4fPJrMC04WRNJup9HTCK9uUwte1y+nI+Ls45KKscC/Xz4aBPnpAWmnFE49yZRmanqAtEy00QPJjanoEkx5RjnjpR/vqYMhTY0dqA5tOxkqsTPbYRAbSYqzCitLQ=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565351601782.9621138971065;
Sun, 9 Mar 2025 17:09:11 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQgM-0002NG-UD; Sun, 09 Mar 2025 20:07:48 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfr-0002CV-O5
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:16 -0400
Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfo-0007Q9-Fi
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:15 -0400
Received: by mail-wr1-x432.google.com with SMTP id
ffacd0b85a97d-39130ee05b0so2130668f8f.3
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:07:12 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912bfb799fsm13080658f8f.2.2025.03.09.17.07.09
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:07:10 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565231; x=1742170031; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=gbDUibVkXNR8REIQVVOEU7ZYDHi6ABLRhy2a8AYGnao=;
b=OtPWoLzvBNGuPVeoSR1K39DckV9OM/kmSmSPWOUkGvyvXLI0+y+6fueluA42oNkSDA
3mqLlUap8YeLzynHhu/VN6BmJCI5dCUvOC1bS8ab/CHIRg0O0h37jXuhEDG/UKA+mdZ9
jmZeyoDP8ke+wRtzkFU9efPgNVS+PuYKFJKsO/Vn3IhBjgvjgefWITs7hkkQypy8Qn1r
p2db93FD9mmhwuwtkjVK/HtGoV+QFuGlAXlYI7/IQSLvnl8lJu5aFbEFVOo8GOHHJV2X
8DehayfynZU0mG8otkpyvdFpxJr2vcJ/Ckd8kn5fqMjoqnoXV1+PNk5Hzn1ngpvleyLE
qh+w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565231; x=1742170031;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=gbDUibVkXNR8REIQVVOEU7ZYDHi6ABLRhy2a8AYGnao=;
b=vHPiROQolNS6lY6UC51afD/Z7UVkoVwR0/7cBcQjILqgsHm/bkifgHMwT76PtIp0C5
IY+vhih5/u5D9U1Xt5ADObnPagOjmFbWeTuntW5omsWtDf3QT6N8d34afvVla+g9Mbzy
zojE9mLp1fenXpsLHB92pwQA7gyaJSRAMnNDpX2yGRV0vMwRGqNb09unTZdCg2YPNFcW
LrKc9NrLsJp63nlGxLYbdwS1KyA7knjnp021lvecQoUdeAlvapILNKfvyLRh+AvL+amK
tRCTzRkY8lx82U/qbKByqUkeN1ID7x10mlOqLkn7+ZM/xp2itXQ/Xxt4AMoimVoGIgQ7
Msng==
X-Forwarded-Encrypted: i=1;
AJvYcCUOGLj6V9wJRqaUDlrBRboEzwpePukW7+QKzti1am9atbgg0/mdgaRgG3L9nTBianvhjmmYvCZ4Q1wT@nongnu.org
X-Gm-Message-State: AOJu0YyznysQhSeH+oZHsX4lGhy08soLQ8xDEmI1DRa7X7u9mi+pYLhE
NSD8H1DQ32DPqJgRfAalifknikpERM4LSzk1v5rpaE8+jNB84sLX9JZaHx7Jf/Y=
X-Gm-Gg: ASbGncswNPupglmfkFHKPcFi4fiH+eGRx7kotUZTNUFl/RdxshyYGV6Cb+OYRZGr8z3
fnL+BmbCmz8MF7CvrfxCu1tZGkHUXWc0C3XcVYV285NyJtp/AWRLPYytQyvRZttNufIjgwvuqot
tq9irnmc+FJUiYEz2Re/rdJZPbnBLYmDyrYql9jmjfgSfq4hXbxobXV+u8eg+5+9ZFZjviB05ql
nCv91lkL1xBRNQHMMUAt2npUn6LYAzRQmKvc/hxkCGhsjp99ZEf73nCKKLj08qvtkIHDZ2BETSw
3rSeqBqgexbipJsDsUSKTVjHpn2ou/sUywqdCwbEbQzavOF4g/ElLfVK7/FurLyVj3LZ53UzBuj
vzBy2se35N88g2F1z+EQ=
X-Google-Smtp-Source:
AGHT+IF5QewoVsjT0unohWqDO9VhZs6iTnHGiomQ1HBvRBt7UeRTDl3O4/PgLX/bqsZG4FCZJdNBVw==
X-Received: by 2002:a5d:5886:0:b0:391:4684:dbdb with SMTP id
ffacd0b85a97d-3914684ddbemr1391364f8f.17.1741565231072;
Sun, 09 Mar 2025 17:07:11 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 09/14] hw/sd/sdhci: Allow SDHCI classes to register their
own MemoryRegionOps
Date: Mon, 10 Mar 2025 01:06:15 +0100
Message-ID: <20250310000620.70120-10-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::432;
envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565355553019100
Add MemoryRegionOps as a class property. For now it is only
used by TYPE_IMX_USDHC.
Otherwise the default remains in little endian.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
---
include/hw/sd/sdhci.h | 1 +
hw/sd/sdhci.c | 22 ++++++++--------------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index dfa0c214036..108bc1993c6 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -117,6 +117,7 @@ struct SDHCIClass {
SysBusDeviceClass sbd_parent_class;
};
=20
+ const MemoryRegionOps *io_ops;
uint32_t quirks;
uint64_t iomem_size;
};
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 3467385490d..6868bf68285 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1428,8 +1428,6 @@ void sdhci_initfn(SDHCIState *s)
s->transfer_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL,
sdhci_data_transfer, s);
s->quirks =3D s->sc->quirks;
-
- s->io_ops =3D &sdhci_mmio_le_ops;
}
=20
void sdhci_uninitfn(SDHCIState *s)
@@ -1447,6 +1445,7 @@ void sdhci_common_realize(SDHCIState *s, Error **errp)
SDHCIClass *sc =3D s->sc;
const char *class_name =3D object_get_typename(OBJECT(s));
=20
+ s->io_ops =3D sc->io_ops ?: &sdhci_mmio_le_ops;
switch (s->endianness) {
case DEVICE_LITTLE_ENDIAN:
/* s->io_ops is little endian by default */
@@ -1890,17 +1889,11 @@ static const MemoryRegionOps usdhc_mmio_ops =3D {
.endianness =3D DEVICE_LITTLE_ENDIAN,
};
=20
-static void imx_usdhc_init(Object *obj)
-{
- SDHCIState *s =3D SYSBUS_SDHCI(obj);
-
- s->io_ops =3D &usdhc_mmio_ops;
-}
-
static void imx_usdhc_class_init(ObjectClass *oc, void *data)
{
SDHCIClass *sc =3D SYSBUS_SDHCI_CLASS(oc);
=20
+ sc->io_ops =3D &usdhc_mmio_ops;
sc->quirks =3D BIT(SDHCI_QUIRK_NO_BUSY_IRQ);
=20
sdhci_common_class_init(oc, data);
@@ -1957,11 +1950,13 @@ static const MemoryRegionOps sdhci_s3c_mmio_ops =3D=
{
.endianness =3D DEVICE_LITTLE_ENDIAN,
};
=20
-static void sdhci_s3c_init(Object *obj)
+static void sdhci_s3c_class_init(ObjectClass *oc, void *data)
{
- SDHCIState *s =3D SYSBUS_SDHCI(obj);
+ SDHCIClass *sc =3D SYSBUS_SDHCI_CLASS(oc);
=20
- s->io_ops =3D &sdhci_s3c_mmio_ops;
+ sc->io_ops =3D &sdhci_s3c_mmio_ops;
+
+ sdhci_common_class_init(oc, data);
}
=20
static const TypeInfo sdhci_types[] =3D {
@@ -1983,13 +1978,12 @@ static const TypeInfo sdhci_types[] =3D {
{
.name =3D TYPE_IMX_USDHC,
.parent =3D TYPE_SYSBUS_SDHCI,
- .instance_init =3D imx_usdhc_init,
.class_init =3D imx_usdhc_class_init,
},
{
.name =3D TYPE_S3C_SDHCI,
.parent =3D TYPE_SYSBUS_SDHCI,
- .instance_init =3D sdhci_s3c_init,
+ .class_init =3D sdhci_s3c_class_init,
},
};
=20
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565461; cv=none;
d=zohomail.com; s=zohoarc;
b=I4zVvQwTLFq+J8eKkM4cYA94qelYYoNe3g0P1oPyUltsSW4Hp4FFKJ8XGq5uN/eDSNKNVKLsrNZounSGIjwKAhLIAz6TjCruDQkTS3bBObXwNqCPUHZLPH1hMeFH46iIt/WOWxW2tHZ+eTvPI84rjRxiTXorm7pg5rqGz/PvYcA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565461;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=5pnCT+L+XCXZVRzhjHTFwBDsZqVtfDpTg3ZhsoQOpQ8=;
b=XtHBI8E1Eth3p/tPZj+VZ8h/qWq2eCsqzfNACKUTpWqzIccy4qpSXaZaiupZOxpxaUohWxiMIyZt4yV6o4S3xECIW/gkxoW9jHv+6qviu3Kfqi7DfbcHdFqTOvUpgRkU/8S71axIyH8QbaefPyvyGwj/UhdXCtt3MtMr3viKphA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565461283561.1534708653917;
Sun, 9 Mar 2025 17:11:01 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQhR-0003RP-FB; Sun, 09 Mar 2025 20:08:55 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfx-0002Fp-F2
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:22 -0400
Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfu-0007RT-47
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:21 -0400
Received: by mail-wr1-x42f.google.com with SMTP id
ffacd0b85a97d-38a25d4b9d4so1897144f8f.0
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:07:17 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912bfb7aefsm13011423f8f.20.2025.03.09.17.07.14
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:07:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565236; x=1742170036; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=5pnCT+L+XCXZVRzhjHTFwBDsZqVtfDpTg3ZhsoQOpQ8=;
b=I/PjIAtKIXTUQLVuwyXA3WaaVPgWf4onGC8j+w9YXYSt1LEsv4k09DSgZue2YZTmf0
cPyTT1/zjWvlLvqPMYV7dId+tM2e/XIbtN2FjKHkaNtMoOVKk4Jy07epll/q8Hf1qSTX
KyGOz69YShGTtAUv/G5wEjaHL6FOrSTY6v9eGYcPxSrPNwejVK9W/Pewxa57zCl37H2J
OmHHJHek0TSz1IUMKP/vzq0QnmmgMyBRlZFZGS7xR+d5h3/eOj+xHjgLGzhhpaY4LsRb
NJA9Ci8Nk9N+7vQxC6CbT146JTbOmodMMC3nYIUKAR9cp2coy676MUmS6ccFvqo8LeXj
IfXQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565236; x=1742170036;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=5pnCT+L+XCXZVRzhjHTFwBDsZqVtfDpTg3ZhsoQOpQ8=;
b=rJoDPPGLJUo/58F9gE2VjhzvstWLD+ROJ2yrDVFcC0lMXnX0H9yCA2Qdpgqzz9i4Qu
wDm1X60ox7FjWm8kfD2fqvwc3ouP+7plXna41tFlzXwKVemiyhSOF5ZEDRYzYkHpUuI0
rL0Xeh2WYMpBtWMx1aTl9fi7TB2gMDAtTsYbhpXUg8aBOH/zkRiE2mQAZ4Q0Iiexvzmt
PI2RN9Z3caaIFyDNO5EI5I0alD9bUVlPrCB2+3Cd++9DgH0/Dnm78ATnQEN7B6NyWHx/
of4yYG1g9liclBGaTi03WDZpz2cgX+20ezFBFa1f4t+UA4Q2ESZ5qEGCes+lQqm6/WLc
RvCw==
X-Forwarded-Encrypted: i=1;
AJvYcCWv2VbtvoyGC00MxopTNRVRoPxJKvyQLav8JRzY9+dK68KubF8e4oLSTJhFCtPHkGXZ8yzEJb4i/fdC@nongnu.org
X-Gm-Message-State: AOJu0YzsmXPMxxDH31LEY2NL/2sJMVkhh9GpJ5NlP1h5RhrqvRLBZVi8
8OqNevZd8j9egba3OkE6aQKocl2k2N8FFWmoA+roWf7fm4FsKiCmWauJ1klMSeE=
X-Gm-Gg: ASbGncvzMg+JBvOc9KXwg4r0vilnRXbpZu95EuPX9cUnZxUB6iA1dYhyVwsozIAPqj9
E5w1Cui5P9G2om12Mdv+SxtZBopD+Ecg/mJzfBMCkUUbkCjtQSz0J+NUuEHUkh98xYD/7Q5pBzr
m/hlJJfde8eoAE7/wVlGpCATbFWdYb09yp7mLFdxFr9ZxYNS1q1UXTFmxPkK0CVCnmNn4pbFvvy
TgxLAr5uN/934YBPzeazMsw8KIG/dD8iuWcpA7ocJneMMXY0ixVG1MHogCLA7qn18XLoSAUgX7P
bwdQ+UOR03RC3EGbSTsFsBytbwvCwMxZI/FC49fUt4PcSmdS4nYEnJO7dak5mhygUjIBmchoPDl
oWDawufYZ7QMbeMdTt9sfpyD+Sod5DQ==
X-Google-Smtp-Source:
AGHT+IExOYuUC9c0jjou6VwjYlH1/dVaaW96Dm5KLLx1HJjqlOxdUjGQDNrH5Vb77V7Nv/5RRsA41A==
X-Received: by 2002:a05:6000:410a:b0:391:4559:8761 with SMTP id
ffacd0b85a97d-39145598929mr1282305f8f.36.1741565236138;
Sun, 09 Mar 2025 17:07:16 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 10/14] hw/sd/sdhci: Allow SDHCI classes to register their
own read-only regs
Date: Mon, 10 Mar 2025 01:06:16 +0100
Message-ID: <20250310000620.70120-11-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::42f;
envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565462080019000
Some registers are read-only.
Since we allow instances to clear/set extra bits of capareg,
log when read-only bits normally set by hardware are cleared
at board level.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/sd/sdhci.h | 7 +++++++
hw/sd/sdhci.c | 10 +++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 108bc1993c6..eb21b64f932 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -120,6 +120,13 @@ struct SDHCIClass {
const MemoryRegionOps *io_ops;
uint32_t quirks;
uint64_t iomem_size;
+
+ /* Read-only registers */
+ struct {
+ uint64_t capareg;
+ uint64_t maxcurr;
+ uint16_t version;
+ } ro;
};
=20
/*
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 6868bf68285..eb6a0e0f939 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -73,6 +73,7 @@ static bool sdhci_check_capab_freq_range(SDHCIState *s, c=
onst char *desc,
=20
static void sdhci_check_capareg(SDHCIState *s, Error **errp)
{
+ SDHCIClass *sc =3D s->sc;
uint64_t msk =3D s->capareg;
uint32_t val;
bool y;
@@ -208,6 +209,11 @@ static void sdhci_check_capareg(SDHCIState *s, Error *=
*errp)
qemu_log_mask(LOG_UNIMP,
"SDHCI: unknown CAPAB mask: 0x%016" PRIx64 "\n", msk=
);
}
+ msk =3D sc->ro.capareg & ~s->capareg;
+ if (msk) {
+ qemu_log_mask(LOG_UNIMP,
+ "SDHCI: ignored CAPAB mask: 0x%016" PRIx64 "\n", msk=
);
+ }
}
=20
static uint8_t sdhci_slotint(SDHCIState *s)
@@ -1407,7 +1413,9 @@ static void sdhci_init_readonly_registers(SDHCIState =
*s, Error **errp)
error_setg(errp, "Only Spec v2/v3 are supported");
return;
}
- s->version =3D (SDHC_HCVER_VENDOR << 8) | (s->sd_spec_version - 1);
+ s->version =3D s->sc->ro.version
+ ?: (SDHC_HCVER_VENDOR << 8) | (s->sd_spec_version - 1);
+ s->maxcurr =3D s->sc->ro.maxcurr;
=20
sdhci_check_capareg(s, errp);
if (*errp) {
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565484; cv=none;
d=zohomail.com; s=zohoarc;
b=jfh+RgF3+Fi1uq9lLI2vlG/4KJPULIx7xHDuc37Izs5mqcIusFH2Hn8vFcNjdKrQDWcc09yPhHohuO+14M49o6CY+jkpxgnd4njgE5cTlbs+0PSU+A4IKAeBzoLj/9NrLbK2vH7zqXdtVAeeLTqDY5D7Ns+9etrfHOoNdjt6ExE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565484;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=0rIe2D5ODG2ZchYabV2XjHTxGs36wogLivL/gojI4Tg=;
b=biDCjHKK0BfKf5zvRQT+G25zKqfywdYmppMWPTtMGNpb/tYAv7WknSmauk7L7kDBYdVn3GIrheuwzZSMMXvOkYQLg/OpTePxhYzzwlkdNHu6kEoG+Kmhh6QFdGB11Vhl4yBctxSb0kiEFEc6K8Przs62t3klSi8jJ2FBfVM/2is=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 174156548446568.4764428235419;
Sun, 9 Mar 2025 17:11:24 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQhb-0004Ec-UT; Sun, 09 Mar 2025 20:09:04 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQg3-0002MG-DW
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:38 -0400
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQfz-0007Sg-TF
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:27 -0400
Received: by mail-wm1-x32c.google.com with SMTP id
5b1f17b1804b1-43cf3192f3bso5651835e9.1
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:07:22 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912c0e222dsm13208215f8f.72.2025.03.09.17.07.19
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:07:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565241; x=1742170041; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=0rIe2D5ODG2ZchYabV2XjHTxGs36wogLivL/gojI4Tg=;
b=Lwr/4OJw892QnAwi/HlaWqVPxwts5Wj4/2Usfiuc2x+Wc9iY6djwv8faetE/+gUEGc
MAbj48+L3PWRz2gyN/4AxBZR2w/hPz/PsoRDmjyaZGjmZ66OvzWeEBp8xT4L76BkMKqo
aspyLB54CsmOBr/+dem0YYVjywEQndevs8NAhmM9z+MDzmTDKvzbZvBku0EOl1zsJ+HQ
0CQSEuEJnddgApebES+Gckqsik8fuc8BZSoMfQDFkBultaX8sHyQak4kf7mivjISMXT7
qNc7o0H6g3whj9WdBG/2H2d32Vp1EvXyaQN7xDmAquBfuYV0K1V+DkmYlBwcjTqb+tgY
dq/w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565241; x=1742170041;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=0rIe2D5ODG2ZchYabV2XjHTxGs36wogLivL/gojI4Tg=;
b=T2759uLueADOzlT4BtnNZ9McvPcg02s6lEFfynHE5nC5bVD7SKsUtRyPiAmjChQPND
QY9gLa3kF07m40g5S4ZwNcng3jHhWjPe/xiUMU2vzo2KfkSxjt9iOwW7syKsIwT5kfpP
MLhluJFlm2lKMonjdvs2YlkvFs8A/R3FEzqAbTOHHLEOW+MeTGKSeFStF8Y8h62uUOVb
xlQnpXsU9iQaR8ynIkcqJPqp990tGuhVm2tySyCBskZCm5hKMOVTqwrRstPbo3p09Ufj
mQ5aoWdgd5sP88LVEzt/YQdrZTaVbqOXYNi2hlnGRYqYD1TdAcWWCadPsKdDEZIogMiQ
0YBQ==
X-Forwarded-Encrypted: i=1;
AJvYcCXd6LLtC71vv8+eTMraJ1s8dHfrxqF6M2ws0bi8nUf/NyNR7GZ8p8ss0Pwcp7ZyWYYpxLM3IjU4H6z9@nongnu.org
X-Gm-Message-State: AOJu0Yw5mjjz86YHVJmHaczRmrKaoFkZPkrQbT3giFD1JShO8e/EIk4+
VR6skfU0DF1xFuINbnOwZUvuzuGLbIYUK6CfrPavl+UbOG/NnpxDmErxrBGPMRw=
X-Gm-Gg: ASbGnctH5OX+bp4XEk1ULwHrRQ8Th7HzPtBgfEoch46hoQm4gNUwKKc4sIfVlAGRq6E
Hz/nzx86YxaJKPMZlOpBLIgi7WsImcApFmGzkl4ytbfOPHIOLHJHXKZZewoFNYonLD/hd+ChBHg
WcFKzOyvz/I1GDSOsq9e12zy9Su2jH7kptiRpBbBQ7oKdb5naYR7ajiH8a0LyMfatO3MmtlxS3u
Im7Sj/W8J5+MPE8cmbgclL5PqSgmlqr2m3USdR8KqVNr/TtR6Z5XlN/IEyD+GUNr8QoG8m4Kh4C
I2XKehDsUslvRDRhiLGnEMIgWQCahNf9OkbTJUIqc/HPwjcU/owM7IhI5PDSYkYVpmByG8bJgRT
+iP8hxuFBBzBbiLqIpf8=
X-Google-Smtp-Source:
AGHT+IGC5u6Ljd9F0hNaorGjVQUhjns3oVHxCIznbwiP0izSIQ9ue1/xt+mQnwR5l448hFqEFVMPIg==
X-Received: by 2002:a05:600c:4f90:b0:43c:fad6:fa5a with SMTP id
5b1f17b1804b1-43cfad6fe22mr2781985e9.24.1741565241334;
Sun, 09 Mar 2025 17:07:21 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 11/14] hw/sd/sdhci: Allow SDHCI classes to have different
register reset values
Date: Mon, 10 Mar 2025 01:06:17 +0100
Message-ID: <20250310000620.70120-12-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32c;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565485926019100
For the registers which are not zeroed at reset, allow the
different implementations to set particular reset values.
Remove the misleading values commented in sdhci-internal.h.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/sd/sdhci-internal.h | 24 ++++++++++++------------
include/hw/sd/sdhci.h | 20 ++++++++++++++++++++
hw/sd/sdhci.c | 14 ++++++++++++++
3 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h
index 9072b06bdde..d99a8493db2 100644
--- a/hw/sd/sdhci-internal.h
+++ b/hw/sd/sdhci-internal.h
@@ -70,7 +70,7 @@
/* R/W Buffer Data Register 0x0 */
#define SDHC_BDATA 0x20
=20
-/* R/ROC Present State Register 0x000A0000 */
+/* R/ROC Present State Register */
#define SDHC_PRNSTS 0x24
#define SDHC_CMD_INHIBIT 0x00000001
#define SDHC_DATA_INHIBIT 0x00000002
@@ -88,7 +88,7 @@ FIELD(SDHC_PRNSTS, CMD_LVL, 24, 1);
#define TRANSFERRING_DATA(x) \
((x) & (SDHC_DOING_READ | SDHC_DOING_WRITE))
=20
-/* R/W Host control Register 0x0 */
+/* R/W Host control Register */
#define SDHC_HOSTCTL 0x28
#define SDHC_CTRL_LED 0x01
#define SDHC_CTRL_DATATRANSFERWIDTH 0x02 /* SD mode only */
@@ -104,17 +104,17 @@ FIELD(SDHC_PRNSTS, CMD_LVL, 24, 1);
#define SDHC_CTRL_CDTEST_INS 0x40
#define SDHC_CTRL_CDTEST_EN 0x80
=20
-/* R/W Power Control Register 0x0 */
+/* R/W Power Control Register */
#define SDHC_PWRCON 0x29
#define SDHC_POWER_ON (1 << 0)
FIELD(SDHC_PWRCON, BUS_VOLTAGE, 1, 3);
=20
-/* R/W Block Gap Control Register 0x0 */
+/* R/W Block Gap Control Register */
#define SDHC_BLKGAP 0x2A
#define SDHC_STOP_AT_GAP_REQ 0x01
#define SDHC_CONTINUE_REQ 0x02
=20
-/* R/W WakeUp Control Register 0x0 */
+/* R/W WakeUp Control Register */
#define SDHC_WAKCON 0x2B
#define SDHC_WKUP_ON_INS (1 << 1)
#define SDHC_WKUP_ON_RMV (1 << 2)
@@ -128,17 +128,17 @@ FIELD(SDHC_PWRCON, BUS_VOLTAGE, 1, 3);
#define SDHC_CLOCK_IS_ON(x) \
(((x) & SDHC_CLOCK_CHK_MASK) =3D=3D SDHC_CLOCK_CHK_MASK)
=20
-/* R/W Timeout Control Register 0x0 */
+/* R/W Timeout Control Register */
#define SDHC_TIMEOUTCON 0x2E
FIELD(SDHC_TIMEOUTCON, COUNTER, 0, 4);
=20
-/* R/W Software Reset Register 0x0 */
+/* R/W Software Reset Register */
#define SDHC_SWRST 0x2F
#define SDHC_RESET_ALL 0x01
#define SDHC_RESET_CMD 0x02
#define SDHC_RESET_DATA 0x04
=20
-/* ROC/RW1C Normal Interrupt Status Register 0x0 */
+/* ROC/RW1C Normal Interrupt Status Register */
#define SDHC_NORINTSTS 0x30
#define SDHC_NIS_ERR 0x8000
#define SDHC_NIS_CMDCMP 0x0001
@@ -151,7 +151,7 @@ FIELD(SDHC_TIMEOUTCON, COUNTER, 0, 4);
#define SDHC_NIS_REMOVE 0x0080
#define SDHC_NIS_CARDINT 0x0100
=20
-/* ROC/RW1C Error Interrupt Status Register 0x0 */
+/* ROC/RW1C Error Interrupt Status Register */
#define SDHC_ERRINTSTS 0x32
#define SDHC_EIS_CMDTIMEOUT 0x0001
#define SDHC_EIS_BLKGAP 0x0004
@@ -159,7 +159,7 @@ FIELD(SDHC_TIMEOUTCON, COUNTER, 0, 4);
#define SDHC_EIS_CMD12ERR 0x0100
#define SDHC_EIS_ADMAERR 0x0200
=20
-/* R/W Normal Interrupt Status Enable Register 0x0 */
+/* R/W Normal Interrupt Status Enable Register */
#define SDHC_NORINTSTSEN 0x34
#define SDHC_NISEN_CMDCMP 0x0001
#define SDHC_NISEN_TRSCMP 0x0002
@@ -170,7 +170,7 @@ FIELD(SDHC_TIMEOUTCON, COUNTER, 0, 4);
#define SDHC_NISEN_REMOVE 0x0080
#define SDHC_NISEN_CARDINT 0x0100
=20
-/* R/W Error Interrupt Status Enable Register 0x0 */
+/* R/W Error Interrupt Status Enable Register */
#define SDHC_ERRINTSTSEN 0x36
#define SDHC_EISEN_CMDTIMEOUT 0x0001
#define SDHC_EISEN_BLKGAP 0x0004
@@ -205,7 +205,7 @@ FIELD(SDHC_HOSTCTL2, VERSION4, 12, 1); /* since =
v4 */
FIELD(SDHC_HOSTCTL2, ASYNC_INT, 14, 1);
FIELD(SDHC_HOSTCTL2, PRESET_ENA, 15, 1);
=20
-/* HWInit Capabilities Register 0x05E80080 */
+/* HWInit Capabilities Register */
#define SDHC_CAPAB 0x40
FIELD(SDHC_CAPAB, TOCLKFREQ, 0, 6);
FIELD(SDHC_CAPAB, TOUNIT, 7, 1);
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index eb21b64f932..b21adcab670 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -121,6 +121,26 @@ struct SDHCIClass {
uint32_t quirks;
uint64_t iomem_size;
=20
+ /* Default reset values */
+ struct {
+ uint32_t sdmasysad;
+
+ uint16_t blksize;
+ uint16_t blkcnt;
+
+ uint32_t prnsts;
+
+ uint8_t hostctl1;
+ uint8_t pwrcon;
+ uint8_t blkgap;
+ uint8_t wakcon;
+
+ uint16_t clkcon;
+ uint8_t timeoutcon;
+
+ uint16_t norintstsen;
+ uint16_t errintstsen;
+ } reset;
/* Read-only registers */
struct {
uint64_t capareg;
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index eb6a0e0f939..f731b1a141a 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -295,6 +295,7 @@ static void sdhci_set_readonly(DeviceState *dev, bool l=
evel)
static void sdhci_reset(SDHCIState *s)
{
DeviceState *dev =3D DEVICE(s);
+ SDHCIClass *sc =3D s->sc;
=20
timer_del(s->insert_timer);
timer_del(s->transfer_timer);
@@ -306,6 +307,19 @@ static void sdhci_reset(SDHCIState *s)
*/
memset(&s->sdmasysad, 0, (uintptr_t)&s->capareg - (uintptr_t)&s->sdmas=
ysad);
=20
+ s->sdmasysad =3D sc->reset.sdmasysad;
+ s->blksize =3D sc->reset.blksize;
+ s->blkcnt =3D sc->reset.blkcnt;
+ s->prnsts =3D sc->reset.prnsts;
+ s->hostctl1 =3D sc->reset.hostctl1;
+ s->pwrcon =3D sc->reset.pwrcon;
+ s->blkgap =3D sc->reset.blkgap;
+ s->wakcon =3D sc->reset.wakcon;
+ s->clkcon =3D sc->reset.clkcon;
+ s->timeoutcon =3D sc->reset.timeoutcon;
+ s->norintstsen =3D sc->reset.norintstsen;
+ s->errintstsen =3D sc->reset.errintstsen;
+
/* Reset other state based on current card insertion/readonly status */
sdhci_set_inserted(dev, sdbus_get_inserted(&s->sdbus));
sdhci_set_readonly(dev, sdbus_get_readonly(&s->sdbus));
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565536; cv=none;
d=zohomail.com; s=zohoarc;
b=LqUzVa3EQZG4IXnBJO5L8myFTAnQFiIhYQYixI5lk/ZVsuTQyRpJjKFyJSNziejPt0aHrM8ZIvz4P/xUJ5T8JynamdsaMQKNEIYKxlWbQtPEWpP+l5ZpXvRiPN+X9InDUtzrNdyK2/D0o7d8LywSCSyn8X9MeuVC15nlh2qPELA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565536;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=/CV9763Q2OclYQny8AL1J9alx4TgqLIH5/4iLk98ggU=;
b=kOPzgtglmj/9ysa8cY61A24KCJyGkgAt6wflTmdm2wsyCIVAM584/3l6Q53gAVoB9L9HQShcWl/joAEbQb5rTHOWC751fUi4Z2XOZUKxzGc/2HXPJ5rQ1j0kXjiVOqt/eQicWi9V2xIEANvEGzsnuek4meDl3fzZSZS75pUQg8M=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 17415655361621021.6351038516221;
Sun, 9 Mar 2025 17:12:16 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQi7-0004qw-01; Sun, 09 Mar 2025 20:09:35 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQg7-0002MZ-5H
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:42 -0400
Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQg3-0007Tv-Vh
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:29 -0400
Received: by mail-wr1-x429.google.com with SMTP id
ffacd0b85a97d-3913fdd003bso397810f8f.1
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:07:27 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912c103f57sm13217968f8f.91.2025.03.09.17.07.25
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:07:25 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565246; x=1742170046; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=/CV9763Q2OclYQny8AL1J9alx4TgqLIH5/4iLk98ggU=;
b=CHZcEKiftzUvXVBTyVosVoBdYFfo/XtsPlWZX0tYfrRMAKFRWG8ZqCsEdQ6yg5sZnS
M4Jk2hDD8jN2OXYVIhD6kKHSV37jvSkk5Dk6hv7ZXyaFU6YnWJiJBkLesSgrJeFG4ne5
xpo/q22yy+UU/Vg+M5iYiSFPu+bL9mrPbtEr76xq0E2HfknJtescw53A37RZVjVZjDZQ
dKtYo12zOvvbf9bUm71zSremsthgxLpnulvsccwc3luuWdWJF+00loUhxiWDihDHAaDx
EYluIFuIAn2IL/GrJOauf4VPvyrtIpURgt+oeDB/NOPl6GfNn8krVjtYnepoLAp+XZVn
pvPw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565246; x=1742170046;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=/CV9763Q2OclYQny8AL1J9alx4TgqLIH5/4iLk98ggU=;
b=aPSSp4VdqBST+1aChlYZF+ViUjg4XrzPdR7NlAMpyw4ny7OJRGT5gJ8QPxYTZGbM4G
ol3dmOpTNQEccM31Scw/ZdtBifeb1xEfbnrboNKBRTjeJXu5Yyu2249R0vzLFFOQOjQ9
iApW29ZL2W8QMze/3O5OdxTmNMn1TtIjvxcXq40Lim/wn021L+rpxswhS7KM8TT/Ivmo
gPNsioy6+H/XYqw9KG1c7JMNklEd6t745093wZGol0t55RiNiNb5YB8+XtuTuoyBZTMk
TNrSSszaAWD6PXY4aqwZowJu11uqY/kXRcB/cOsy3FDLPjOxHWYkvGgKk29Ady5BNZzd
GBkg==
X-Forwarded-Encrypted: i=1;
AJvYcCUsPtT9g0ZWzRZvfTHMsgdrAAcNZSOhBiNLhAHEOPzOwNg8Y8pq7PSPlFaEwUDbyOGmjtKefSdkX9pI@nongnu.org
X-Gm-Message-State: AOJu0YxmL5s3OVK6Mtc00ZcWpWdAFi87WvguoCizMapv6LXtmCyTpl1C
BohWwokwMXZrq52Qwgl5vQEB8xpBCUCeC+YWJY9J/dmHporMnY52k8d378O36jI=
X-Gm-Gg: ASbGncsEsi5RMaruXd7tMgMTFVzPIo3dxsLfKaTAdkR8vloGtL4wutpBIvKgcBYLr38
Bb5quFZnSU0dZtkCJA4+j6Q8U9fKSTimVk2JMTwClSw3uhDr7IoKGDiPt9lU6xtoEzbVzLqZEBX
ZAsrtZVVZrjnt66CzvAoRT++zlVbyveKsUwHDkoQzLKp3Au3YQf768V9gpdyHdwy3d7F3+pAkPS
5+Wqh1NoIKQFYbHTwiShI+PPP76JNqn9yiEUdLWv5cQWtEFCNZ3rB7byhY0cjOXAfF4hfJ0AVwm
otpv7cF7nL0CIxFaB+rV8AAM8POcT3uh4+VmqP3CanSIbDTRVKPPDCC8DuWf+D/3nioCUnXOVnA
DjMilIpUXhBg5Jd5UcJ8=
X-Google-Smtp-Source:
AGHT+IFoClJlyOuPr/WDQ5vRdtBR9j8N75yyvLBubt7FhRw7WVZWafOinlTST1Q/gVsTUdybjUNFUA==
X-Received: by 2002:a5d:6c6a:0:b0:38d:dc03:a3d6 with SMTP id
ffacd0b85a97d-3913aed81aamr4029381f8f.4.1741565246349;
Sun, 09 Mar 2025 17:07:26 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 12/14] hw/sd/sdhci: Implement Freescale eSDHC as
TYPE_FSL_ESDHC
Date: Mon, 10 Mar 2025 01:06:18 +0100
Message-ID: <20250310000620.70120-13-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::429;
envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565538047019100
Per the MPC8569E reference manual, its SDHC I/O range is 4KiB
wide, mapped in big endian order, and it only accepts 32-bit
aligned access. Set the default register reset values.
Reported-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/sd/sdhci.h | 2 ++
hw/sd/sdhci.c | 44 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index b21adcab670..e8fced5eedc 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -171,6 +171,8 @@ DECLARE_CLASS_CHECKERS(SDHCIClass, PCI_SDHCI,
#define TYPE_SYSBUS_SDHCI "generic-sdhci"
OBJECT_DECLARE_TYPE(SDHCIState, SDHCIClass, SYSBUS_SDHCI)
=20
+#define TYPE_FSL_ESDHC "fsl-esdhc"
+
#define TYPE_IMX_USDHC "imx-usdhc"
=20
#define TYPE_S3C_SDHCI "s3c-sdhci"
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index f731b1a141a..47e4bd1a610 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1667,7 +1667,44 @@ static void sdhci_bus_class_init(ObjectClass *klass,=
void *data)
sbc->set_readonly =3D sdhci_set_readonly;
}
=20
-/* --- qdev i.MX eSDHC --- */
+/* --- Freescale eSDHC (MPC8569ERM Rev.2 from 06/2011) --- */
+
+static const MemoryRegionOps fsl_esdhc_mmio_ops =3D {
+ .read =3D sdhci_read,
+ .write =3D sdhci_write,
+ .valid =3D {
+ /*
+ * Per the reference manual (chapter 16):
+ *
+ * All eSDHC registers must be accessed as aligned 4-byte quantiti=
es.
+ * Accesses to the eSDHC registers that are less than 4-bytes are =
not
+ * supported.
+ */
+ .min_access_size =3D 4,
+ .unaligned =3D false
+ },
+ .endianness =3D DEVICE_BIG_ENDIAN,
+};
+
+static void fsl_esdhc_class_init(ObjectClass *oc, void *data)
+{
+ SDHCIClass *sc =3D SYSBUS_SDHCI_CLASS(oc);
+
+ sc->iomem_size =3D 0x1000;
+ sc->io_ops =3D &fsl_esdhc_mmio_ops;
+ sc->ro.capareg =3D 0x01e30000;
+ sc->reset.sdmasysad =3D 8;
+ sc->reset.blkcnt =3D 8;
+ sc->reset.prnsts =3D 0xff800000;
+ sc->reset.hostctl1 =3D 0x20; /* Endian mode (address-invariant) */
+ sc->reset.clkcon =3D 0x8000;
+ sc->reset.norintstsen =3D 0x013f;
+ sc->reset.errintstsen =3D 0x117f;
+
+ sdhci_common_class_init(oc, data);
+}
+
+/* --- qdev i.MX uSDHC --- */
=20
#define USDHC_MIX_CTRL 0x48
=20
@@ -1997,6 +2034,11 @@ static const TypeInfo sdhci_types[] =3D {
.class_size =3D sizeof(SDHCIClass),
.class_init =3D sdhci_sysbus_class_init,
},
+ {
+ .name =3D TYPE_FSL_ESDHC,
+ .parent =3D TYPE_SYSBUS_SDHCI,
+ .class_init =3D fsl_esdhc_class_init,
+ },
{
.name =3D TYPE_IMX_USDHC,
.parent =3D TYPE_SYSBUS_SDHCI,
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565526; cv=none;
d=zohomail.com; s=zohoarc;
b=G4hUAFQfbD2ot6kEGNXigdC8TfxxfRFItVlvj+MzrsOFr+kd3OCsCRIjUt6llOCo0ndAzN4G2C3KTH69P9rLrdal8zBrfNKa9PfAc3xpxiolkXqeM1LjngKp6gNDiTZBh3n8pxQ7tbOmiIyLg1gcuBkDb0fACnUE4n4eF9duYQ0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565526;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=G5cfsxYC6Xjld/r/JqOEermJubm5JBpQoqIXWekO6mg=;
b=Dn7bK9N2Ep6XdJcYwdoFRyDCOkTjFSA5BM82yLLncYEJPZyfwpewBV6gkZqzVd8DFxrwTrmyjR/RKtwwP9hBhiqhp5N2RO7B7JFRCpmJrC0tT+eCf//1RgVURnqbQsNW9gjUqIIGfEknZCChfRF/fcK5Q3J1VAwfTcuDU64oLOg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 17415655261595.197237556460436;
Sun, 9 Mar 2025 17:12:06 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQhU-0003a7-Dq; Sun, 09 Mar 2025 20:08:56 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQgB-0002NE-8k
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:42 -0400
Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQg9-0007Vf-La
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:35 -0400
Received: by mail-wm1-x32d.google.com with SMTP id
5b1f17b1804b1-43cfa7e7f54so1254185e9.1
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:07:32 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912c0e222dsm13208524f8f.72.2025.03.09.17.07.30
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:07:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565251; x=1742170051; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=G5cfsxYC6Xjld/r/JqOEermJubm5JBpQoqIXWekO6mg=;
b=nneatwbfbwVp29rYFzmzKnhJyWbGVwcoEEkNxxnkcVkkC5N8N4QY6UHC3vNBZsaeG8
ON23bCJpsWrbF65stmMmQSqRmkADUX35HoCKHgWcanB0DIpk2qhcFaxTNZM9SJKoHKf6
8GxBwGA5qxX3PHTMVzSuyRsoY26Xxm9la5TveVz0TvZcQS8Qt4Ip+QYqvARc6staAjCt
naofQY0BqQNEFlTcV9rv46gp05SmPOPFFhVrcIUXKl8+bVRRRGexXol+iP8zkgwUiOTS
llXoCIMnD58QPY+I+6+wxwfmtsFgK4TworV2A23XK7FEuJRLzyG4hV9TJLN6Bt7qOPdw
2F1g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565251; x=1742170051;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=G5cfsxYC6Xjld/r/JqOEermJubm5JBpQoqIXWekO6mg=;
b=NVQM80XAioX2HhFyPXhY5UCNQKzhky4pfDADla9SPLSzLfiWq7bbKmBEInuzCyQ3pN
bhv4jMH7T/JrFJE0pkUUYDc9SvsWOOBWT9TxtBkpJgvuKDcnftlSnKx2mGeS4CwSBozK
EpCCyY814sLLr2Yuf8XyEqbXPpBJwErkqsoLPac3Yi/YMFRSdhVjdNcah9lKbvGsyydS
anrLneLZkqMIG11m0TKB9xjZcdW4r+BW6gatB6QMq/UJ8ymxDLe5Tb2kwVuqA4Ne5aI8
LRJGpwArdFD0PixOJKBvDf7pwWyO8gYi5k0/i6TUEzzXp25FALGQYT1Sup4yYNSaRLpK
kk2g==
X-Forwarded-Encrypted: i=1;
AJvYcCWJrOMYmGPDjdGP+gKUf9hNFQg4lNsDeKVsVsKewrSw59mw2ZNO3iZdQ6CotuuWLr1uMKc+iL/XENyC@nongnu.org
X-Gm-Message-State: AOJu0YwxEyhS6rBNqeUqkJSH2abq0DmA/YuJJZ+X8CGC9JWmllZc9N7T
fPwr1efhtu84jhqVCxTrWUQUcMsO1Cv7+PPZ/WXTXaQYUATt4ckHaMPf+qsZMhE=
X-Gm-Gg: ASbGncv3BlDgYr/JbTNcWcRQ8hgV/U0GPTjBCXGKL61Vxwx8OUXwDWK4323p29fZMSc
9s1ys+/mfZ5D/GqDikgl0CllLwPCXWHesZLg+4W0Y+A+3HgKzcUprqycOTplXedEgDN79zoNJB2
mlSW6gk2tTnEvlSOPOGQDatHkC7pOtoBd+BRLF1Qzw1tzZSIcy6XLv6aGkv0fV+Jwpi2Aq9O1Y8
2cKbG2nHJ6cbj7rGvi4RdQJoYH0m6yzIPeWR1WbPhfY+8SK7zNBFCXBXM6d7LSOBctKYXB1CR3E
Sll9Gnkrcihzf+JsYuUOrdJdeKQQHBNAJn6sOkqqMjOqgi3Plv62cxcysLG0G+X6UYBqWpsSYxv
pJTJvMilBVShFT4IdF3g=
X-Google-Smtp-Source:
AGHT+IEhh9NwzECdI4Tc9MSV2/EcCXRTLQg8iKhWY8DRcCUsXG/E2Q6uVro6pRDyFUpCZzEIGYjSNA==
X-Received: by 2002:a05:600c:1d01:b0:439:8e95:796a with SMTP id
5b1f17b1804b1-43ce4dd80fdmr46685805e9.13.1741565251461;
Sun, 09 Mar 2025 17:07:31 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 13/14] hw/ppc/e500: Replace generic SDHCI by Freescale
eSDHC
Date: Mon, 10 Mar 2025 01:06:19 +0100
Message-ID: <20250310000620.70120-14-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32d;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565527992019100
Zoltan reported some U-Boot versions seem to want registers
to be initialized correctly before expecting interrupts.
Now than we have a proper Freescale eSDHC implementation,
use it.
Reported-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
---
hw/ppc/e500.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index fe8b9f79621..2de7d94df9c 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -49,7 +49,6 @@
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
#include "hw/sd/sdhci.h"
-#include "hw/misc/unimp.h"
=20
#define EPAPR_MAGIC (0x45504150)
#define DTC_LOAD_PAD 0x1800000
@@ -1027,22 +1026,13 @@ void ppce500_init(MachineState *machine)
=20
/* eSDHC */
if (pmc->has_esdhc) {
- dev =3D qdev_new(TYPE_UNIMPLEMENTED_DEVICE);
- qdev_prop_set_string(dev, "name", "esdhc");
- qdev_prop_set_uint64(dev, "size", MPC85XX_ESDHC_REGS_SIZE);
- s =3D SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(s, &error_fatal);
- memory_region_add_subregion(ccsr_addr_space, MPC85XX_ESDHC_REGS_OF=
FSET,
- sysbus_mmio_get_region(s, 0));
-
/*
* Compatible with:
* - SD Host Controller Specification Version 2.0 Part A2
* (See MPC8569E Reference Manual)
*/
- dev =3D qdev_new(TYPE_SYSBUS_SDHCI);
+ dev =3D qdev_new(TYPE_FSL_ESDHC);
qdev_prop_set_uint8(dev, "sd-spec-version", 2);
- qdev_prop_set_uint8(dev, "endianness", DEVICE_BIG_ENDIAN);
s =3D SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
sysbus_connect_irq(s, 0, qdev_get_gpio_in(mpicdev, MPC85XX_ESDHC_I=
RQ));
--=20
2.47.1
From nobody Fri Apr 4 03:49:14 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1741565537; cv=none;
d=zohomail.com; s=zohoarc;
b=gPGRUQ3VBJ2M8cgqi4tkeeMmQ5BsWZGNx0cgBl253ke8ltArjVWH1HtoyloJ1XBJ9YXabudK9AGJt/onyUAv4/OxgvHzulsN0PgWrFNMMjwC9UG0JJuKTgmq6q8q8CKn9zIocoHrPp5aJoGPlSS8vZWMZ8pvz7iX+j0ZJHEc7Ps=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1741565537;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=Py9KY+fnraissHmshv8b8vP/Jh1xZMVT/AazakuO3Zc=;
b=A1co2YWXoBkODqoW8az7MTbddLax+ip6UtADv/7yKy5C67jroRay3eBkiT/XKgsPtbpUcUlele3KPJwMUwjz5UDa9uH4qD+2DnB6FBc29ZLDPJxaCAobqUezB4Wogqp3+Vun68mZ8Zwn4yo+X7PbwBqbRWrrQJ4uUgPHnXYz5BM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1741565537966438.9832690547927;
Sun, 9 Mar 2025 17:12:17 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1trQi7-0004sV-7z; Sun, 09 Mar 2025 20:09:36 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQgJ-0002Oa-4l
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:46 -0400
Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1trQgF-0007X5-Mj
for qemu-devel@nongnu.org; Sun, 09 Mar 2025 20:07:42 -0400
Received: by mail-wm1-x330.google.com with SMTP id
5b1f17b1804b1-43cf257158fso3630415e9.2
for <qemu-devel@nongnu.org>; Sun, 09 Mar 2025 17:07:38 -0700 (PDT)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3912bfdfcfbsm12872089f8f.28.2025.03.09.17.07.35
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 09 Mar 2025 17:07:36 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1741565257; x=1742170057; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=Py9KY+fnraissHmshv8b8vP/Jh1xZMVT/AazakuO3Zc=;
b=nRfKj3jJK0n+ktgfvCysL+fqGjlXEFaUR6XIbHhc47agQACnwWCwSOt7MYQv3CNQQQ
gvk0xf5EPdhlda7pOAAA6RUM6GhfVFyBB+46CaO7B0z6McMCfaomBhYiF2XDMMPSlJgy
pvmpG9DInqygAfxO/EUmGe/TNmg47+H21v+yDe2Vzx/g6J6UmZOMvIbgfSBQFuq7LDli
eN++sM2HE16GptmpojUeNl70IPyHeVODf9DXybn69BhlE8veC3x08HMK8R9tHLa0/i8P
MLHzzIlVI1cH7c3uwrmCXxrh4iy09AN0Gr3o5awa8RILJy7iOsLu4ifv//ebU8HJ/ZHZ
/RDA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741565257; x=1742170057;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=Py9KY+fnraissHmshv8b8vP/Jh1xZMVT/AazakuO3Zc=;
b=A8K93kTXtQ93EpN1kf0YJYYi3eizmde4WsdM8BNUhAHv/u/Bj0Ln3BLxfWusxA2o3/
hRbw/5D4msGK1x/O1D4SO3/99+0JlaRPWItLT5TAOE8D//4QNBt49wDEQ3il4gpir7Pi
/iwJtqoggNaOcghpz5pfDZkXUVCZzkJKygHQRpwHmgJWI+70yihqt2PRrLHV3QqsLhvS
kmXnb/SxNuQMf2ywWewjekIz6h/wCj3aQapylyse8EngfTddftgCNtjs1GkfEL2+g6he
m162vgHExP/XFfKI49qk3es8YJMyYep5NP4DHg8dKzX0qKiY4bjLyDR1dx+tfqbO1rTs
OQxw==
X-Forwarded-Encrypted: i=1;
AJvYcCXzcwq6jQABexm2jseVqlW1tqDxDQ4V1QHqeGim4NA/KYcUg85rrVG/j3KbBIKYyEEwwapmbuJoV8pz@nongnu.org
X-Gm-Message-State: AOJu0YzuBYmL1ebIX8I39VviCli7lQrbdLlVSKyKg1zHqaDFw6L+81/D
rqHW4b7jfrQH2y364uk+PYvO4vu0R6rvVkxsb0qOklQYeqnFhbdnREqxISl3Jg0=
X-Gm-Gg: ASbGnctO0Ypo1y4rjrcocO9wesukCQMUJ5uL9r0TqmivzXLjY9H9/KnSWNc46WlvGLE
rLjoQeYALjkxzwo6MDt+BOZ3tbV9qhc1QqR1mBrQVwMyOXoz/qZf0T7oeSN8JPFG3VGOmgvXyiy
Z8K50Zu1fKG6Vt6oxa070yA96BTfHtKXXv0t1bhHp/HjlrruReGgrxXfVRnSJsudLzrvsCNCud8
+rLM+a9WnquZLu0xSghJh1nd5ETqzb/sDGIYsypAqVAIqi9YkjiYtfg+elJz7evRK3Zxd8ax5yH
IE3ItWI+Vtfv5NhrUn33/QVfdUVFLt7V7edzSg/dRLDIpROikQJ07E+Jucu62zazecJExHE2P93
Fr/pblnQFzzaiQxXumi9YCEH5KZT1YQ==
X-Google-Smtp-Source:
AGHT+IEItIfxzl3m4SKynVlq9NpNJdY49F2pe6LmX0OxCG097zihsyT8lcfeqIEt+LuyIUuyLajvSw==
X-Received: by 2002:a05:600c:1c04:b0:43c:f629:66f4 with SMTP id
5b1f17b1804b1-43cf62969f2mr14732705e9.0.1741565257265;
Sun, 09 Mar 2025 17:07:37 -0700 (PDT)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: BALATON Zoltan <balaton@eik.bme.hu>,
qemu-devel@nongnu.org
Cc: Steven Lee <steven_lee@aspeedtech.com>, Joel Stanley <joel@jms.id.au>,
Bernhard Beschow <shentey@gmail.com>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>, Bin Meng <bmeng.cn@gmail.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@kaod.org>,
Eduardo Habkost <eduardo@habkost.net>, qemu-ppc@nongnu.org,
=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>,
Guenter Roeck <linux@roeck-us.net>,
Andrew Jeffery <andrew@codeconstruct.com.au>, Troy Lee <leetroy@gmail.com>,
Jean-Christophe Dubois <jcd@tribudubois.net>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
qemu-block@nongnu.org, Jamin Lin <jamin_lin@aspeedtech.com>
Subject: [PATCH v5 14/14] hw/sd/sdhci: Remove unnecessary 'endianness'
property
Date: Mon, 10 Mar 2025 01:06:20 +0100
Message-ID: <20250310000620.70120-15-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250310000620.70120-1-philmd@linaro.org>
References: <20250310000620.70120-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::330;
envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1741565538352019000
The previous commit removed the single use of instance
setting the "endianness" property.
Since classes can register their io_ops with correct
endianness, no need to support different ones.
Remove the code related to SDHCIState::endianess field.
Remove the now unused SDHCIState::io_ops field, since we
directly use the class one.
Suggested-by: Bernhard Beschow <shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
hw/sd/sdhci-internal.h | 1 -
include/hw/sd/sdhci.h | 2 --
hw/sd/sdhci.c | 33 +++------------------------------
3 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h
index d99a8493db2..e4da6c831d1 100644
--- a/hw/sd/sdhci-internal.h
+++ b/hw/sd/sdhci-internal.h
@@ -308,7 +308,6 @@ extern const VMStateDescription sdhci_vmstate;
#define SDHC_CAPAB_REG_DEFAULT 0x057834b4
=20
#define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \
- DEFINE_PROP_UINT8("endianness", _state, endianness, DEVICE_LITTLE_ENDI=
AN), \
DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \
DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \
\
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index e8fced5eedc..1016a5b5b77 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -54,7 +54,6 @@ struct SDHCIState {
AddressSpace sysbus_dma_as;
AddressSpace *dma_as;
MemoryRegion *dma_mr;
- const MemoryRegionOps *io_ops;
=20
QEMUTimer *insert_timer; /* timer for 'changing' sd card. */
QEMUTimer *transfer_timer;
@@ -105,7 +104,6 @@ struct SDHCIState {
=20
/* Configurable properties */
uint32_t quirks;
- uint8_t endianness;
uint8_t sd_spec_version;
uint8_t uhs_mode;
};
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 47e4bd1a610..cbb9f4ae8c0 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1391,17 +1391,6 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t va=
l, unsigned size)
}
=20
static const MemoryRegionOps sdhci_mmio_le_ops =3D {
- .read =3D sdhci_read,
- .write =3D sdhci_write,
- .valid =3D {
- .min_access_size =3D 1,
- .max_access_size =3D 4,
- .unaligned =3D false
- },
- .endianness =3D DEVICE_LITTLE_ENDIAN,
-};
-
-static const MemoryRegionOps sdhci_mmio_be_ops =3D {
.read =3D sdhci_read,
.write =3D sdhci_write,
.impl =3D {
@@ -1413,7 +1402,7 @@ static const MemoryRegionOps sdhci_mmio_be_ops =3D {
.max_access_size =3D 4,
.unaligned =3D false
},
- .endianness =3D DEVICE_BIG_ENDIAN,
+ .endianness =3D DEVICE_LITTLE_ENDIAN,
};
=20
static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp)
@@ -1467,23 +1456,6 @@ void sdhci_common_realize(SDHCIState *s, Error **err=
p)
SDHCIClass *sc =3D s->sc;
const char *class_name =3D object_get_typename(OBJECT(s));
=20
- s->io_ops =3D sc->io_ops ?: &sdhci_mmio_le_ops;
- switch (s->endianness) {
- case DEVICE_LITTLE_ENDIAN:
- /* s->io_ops is little endian by default */
- break;
- case DEVICE_BIG_ENDIAN:
- if (s->io_ops !=3D &sdhci_mmio_le_ops) {
- error_setg(errp, "SD controller doesn't support big endianness=
");
- return;
- }
- s->io_ops =3D &sdhci_mmio_be_ops;
- break;
- default:
- error_setg(errp, "Incorrect endianness");
- return;
- }
-
sdhci_init_readonly_registers(s, errp);
if (*errp) {
return;
@@ -1493,7 +1465,7 @@ void sdhci_common_realize(SDHCIState *s, Error **errp)
s->fifo_buffer =3D g_malloc0(s->buf_maxsz);
=20
assert(sc->iomem_size >=3D SDHC_REGISTERS_MAP_SIZE);
- memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, class_name,
+ memory_region_init_io(&s->iomem, OBJECT(s), sc->io_ops, s, class_name,
sc->iomem_size);
}
=20
@@ -1578,6 +1550,7 @@ void sdhci_common_class_init(ObjectClass *klass, cons=
t void *data)
dc->vmsd =3D &sdhci_vmstate;
device_class_set_legacy_reset(dc, sdhci_poweron_reset);
=20
+ sc->io_ops =3D &sdhci_mmio_le_ops;
sc->iomem_size =3D SDHC_REGISTERS_MAP_SIZE;
}
=20
--=20
2.47.1