From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230256; cv=none; d=zohomail.com; s=zohoarc; b=DwF2gcCyJmlXCdnzNBuNfDv9suuZGlTbuYX1kGmUgUGm9XZaXYYn0Er5WzHazR14kd0DVgqMBSSXKlBVJ9LjV2oKWjCtME6J//xFj4EORuyqqZQSaBk2F8zfE2R1y7/MLk3gQ8+AzxPxozvnuDEZWCiQVqQb5GpD0y4ask2OqWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230256; h=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=c9E9nBJERza2cHSSGZ/56X3Psf+p38WCxtaLvvfm5Kk=; b=HAkdjGPOGWe1Az40ZL83jJXkMobp34n8IEFjgGeFxo9TVzT69g6dzZYOpioS/Oiq5QUHbxI9f1OGgES49rZmYXr2VdQplgnjz0dmEOFTmkHDl9QDKAV/B6q9sFr0fGdOquZ2CC+541fEMjkuk+r1EY5EoNaHZOpjKwQ04LbK83c= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768230256849208.8408706267719; Mon, 12 Jan 2026 07:04:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJJh-0007gV-8o; Mon, 12 Jan 2026 09:54:49 -0500 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 ) id 1vfJJc-0007bq-3B for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:44 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJZ-0001VO-4U for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:43 -0500 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-b86f69bbe60so205795666b.1 for ; Mon, 12 Jan 2026 06:54:40 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229679; x=1768834479; 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=c9E9nBJERza2cHSSGZ/56X3Psf+p38WCxtaLvvfm5Kk=; b=V7mmSi9/YQwuPVDAk/iqa2utT0MnvOdfjSZaHaQROVTHj5EdXMRbX/gNc+uyTeo38h 4s43ZdNhlFMwZ5eupcXs14fg1/oR8+HCpBrLtgp7vpCk0oQAw9hyvIS9nyv9Or1r2+Ka zZ+XC32RW1sB3iFGD+1RPqQ1z27JGLHfVXQ12y5qkLJGx0m0Oq/wEHVg9i60GMQ7m9lf FKIjM9/Czsx8NZYb6yTLbbWLyqkKLdN38Ky6qMphl3wZl5AEG7ZwdEitQJIR2Ttts9E0 WWeYldUT7eAmw5xsJcUJorrSmkNIF70a5jzcbOzNFlM/oVTLIbAqWQ8RH+tjEYP1tWGo QDfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229679; x=1768834479; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=c9E9nBJERza2cHSSGZ/56X3Psf+p38WCxtaLvvfm5Kk=; b=tHxK6aTU7+QG94jKmXf7ZPG1qS/ekKMiTlY2Zc24/V2r9NsgSiLBYMUivLOPemBxKq fbIJDssURhSnrZEGVO3AjvZosWOY2v0UH4tjCC3ShzawALAemLp/5eos5VSnSQQsVatz 8ozRpWGpl8nwTf7wnupNnyTOoab/41VbonDtj7BVhm92Z2pomYJCFJQNF1vnnjAkm/Ue 2EVu9PvaFVsQ998UF+bgrHBZxK3ZtxtFQeGxbnjydyRDmzlhXjK33mPRiaDmUzphUI8y WTb4wZCFZ5SIm5JdMtEkyX43ug1BC/HKPsmHV9FBBDhM8TcKd2QSR0y2S5UAhbykKCIl TEXw== X-Gm-Message-State: AOJu0YwTmCB4uv/+M8EozOIqqUZy9K++OEVK/n2lb202snS7b6k541vJ Osm+ex9WXVXbTPVrAFIabfCXZuPd3U6Ro6BEWfQwHyoZsVPeuxBMMcTJaHV0Yg== X-Gm-Gg: AY/fxX40qsGiX5m7P3bx0j/BlGDRp9GDu+2OayJmdPPKXQS65UhIDaNqA0buy1kBToB 4+/b6mZOONN5QwZ76lKq4WTu/I4ZRi+adJVUC6VN2ob5+eOC5ody6xPEJJeX6XHdub6yR3OnlsH KJ1MYPAKbOzWy5Hw8EcOYMczVMFrK0PXhqwT2eGU23UnzgLYtbyvsBahJ5CqxoqYVkwLzPWhOuu R+70u/FPnM/UErbVkJ/xAyGxgnhy3pLqBKkCX8BSEdk3+Oi5N7AlRGe8xIEmVLCsCRqT2HmiIIo l+mT5hn/WPURkandY/0VDImYUU/afViMk8b7snvf6o5+NdZ1dAXtIecC/7jZoA2OYMlVqCrHH5I RfGSsp30ijXcev3LfICmXnZ8JxNXUwndrAhGtLPDVbdm38SzlzvNPgU+SIJZya3aKr9D0H4todi T7Rm1FK8vvKKyDuHrmMaG/Bp6ON2SI2FDAMBNWRHdK/y5D4Q+d8qbFXXjjdEIdZdWzdGqn+5y4F 2sRX13a+/s= X-Google-Smtp-Source: AGHT+IHL54xx7rm0k/txbFmkMEyEBwLCj51POjQlV2qOk5/n32Y3UKQc6bEwkvv2RfBzzoqLE230MA== X-Received: by 2002:a17:907:7282:b0:b87:892:f440 with SMTP id a640c23a62f3a-b8708930758mr491424666b.38.1768229678584; Mon, 12 Jan 2026 06:54:38 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 01/14] hw/sd/sdhci: Fix TYPE_IMX_USDHC to implement sd-spec-version 3 by default Date: Mon, 12 Jan 2026 15:54:05 +0100 Message-ID: <20260112145418.220506-2-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::636; envelope-from=shentey@gmail.com; helo=mail-ej1-x636.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230258108158500 Content-Type: text/plain; charset="utf-8" Fixes TYPE_FSL_IMX6UL, TYPE_FSL_IMX7, and TYPE_FSL_IMX8MP to implement version 3 of the SD specification. Note that TYPE_FSL_IMX6 already had "sd-spec-version" set accordingly and that TYPE_FSL_IMX25 correctly sets the same property to version 2 since the real hardware is an eSDHC which is the uSDHC's predecessor. Fixes: fd1e5c817964 ("sdhci: Add i.MX specific subtype of SDHCI") cc: qemu-stable Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/sd/sdhci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 9146e0cde0..23d8f7cbc8 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1884,9 +1884,11 @@ static const MemoryRegionOps usdhc_mmio_ops =3D { static void imx_usdhc_init(Object *obj) { SDHCIState *s =3D SYSBUS_SDHCI(obj); + DeviceState *dev =3D DEVICE(obj); =20 s->io_ops =3D &usdhc_mmio_ops; s->quirks =3D SDHCI_QUIRK_NO_BUSY_IRQ; + qdev_prop_set_uint8(dev, "sd-spec-version", 3); } =20 /* --- qdev Samsung s3c --- */ --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230142; cv=none; d=zohomail.com; s=zohoarc; b=JBgH7Oo2uwh7ogJpVuhfnUUSJzkx7gYgDEiy8S8QX7XAGkcrJgRmtPAg1TXSSxAtp0u9DOSwPRdFYDD3ESXoKQH7PNavOE0wkP6aFLtLRLCAimsM9EaE+7l1r6BSDL9hE6X/seLUVRf8eXuucg/G1AewXxUMvy+NV5ZH6hVErIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230142; h=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=K/Bc8ruLWvUKFLbKbwJTV3mI2vIezZtb/awn2u9R0Sc=; b=KjoY1QPffd6mdb7u9KaKtjAjIWaimyir4f8t9p9PrHcjAHcSufXbMv388wIiad+XRMOYqZQkJ576cGv+oKnJ8ZLqKQkGGnuHenHsq/kBaJnHUR3O1ZLQJwtbS9MBa1hgb8WbUsBJAkMmcgOTPReNeGQqVZXMGI/rqTx+ktKcxJs= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768230142313596.0319697084392; Mon, 12 Jan 2026 07:02:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJJj-0007ko-Hy; Mon, 12 Jan 2026 09:54:51 -0500 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 ) id 1vfJJe-0007dD-9c for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:46 -0500 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJb-0001Vf-Ne for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:45 -0500 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-64fabaf9133so11764144a12.3 for ; Mon, 12 Jan 2026 06:54:41 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229680; x=1768834480; 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=K/Bc8ruLWvUKFLbKbwJTV3mI2vIezZtb/awn2u9R0Sc=; b=Japl+Vg0wDdi7c/DAp76R/u2Z02OBRMDSSBoAMon+P55D1xxTlv97LfDDaKrVeszI7 8pZTx6n9V29xq/2GP650ZyCT6/sDd2DNccMGsLVwgTviOSlE7K5YcQO0Os9eWIpdPU4x xfDo4Zh9OGwQC6EtrV5Odq2IZQ2/Ye19IJcdlcTTRpI8UZyBEsinsqWA4tML+T8Aq0QT kMRuiZmJJR1EfT9b917wh6Vne02IA/s0jhmEbDF74c4X92SRAeN++/iF74aq86fQkDoD 1BdiG2HBKeFr8jthfSixexDWRjzHN3MiE7d5m7WFJqVNIVssR+VC7MQz57ZsVEzDVNdl MTkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229680; x=1768834480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=K/Bc8ruLWvUKFLbKbwJTV3mI2vIezZtb/awn2u9R0Sc=; b=W7Ly2rwPlQagx7Cp1v9scyQ6sOf+zK2cKBU3gOAuls+03wB617W2PkD9fEnFT4FW+k Ooe+duvdxBlR4nhVELWemKAGkhjxtnLLqagFKTz+CBF//WW4PPv5aO3druntGs9t5zAH DexrIilK+nPZKbVBzBCJrzp2t0moMKqHfRWN4IelprtgwyFQRElGvRtteI6vIxOK9q6M JKt7KKk6t+uihNPEuhUOrAMMAlfRpx/rtHgidM2fu8sJvtBy+8xz6+OfadV2RxACadFw tZ1AWwpx1p3DtocOFsWe1mU9GaudPy0ZsKpSuNm3M4ibQwfK0g37RLq/MP3gRrDdpJ77 J2aA== X-Gm-Message-State: AOJu0YzN1v/L9o3KLjrYBDBAPBaWnx7YiwsJAzt+etByd59E0bNxno1q McLErB+J4IpD41/IpXXOTIebbffCnL5MUtUUfR5cvaiK35Y6793r2kFJvJdiQw== X-Gm-Gg: AY/fxX5FVfRp8u9lq08p1ndGv0MhCOOWHB2WWv5Wh+e7uXGgihihM+DzgBENHRLjde8 6w03yuv1/LUTRBZIK60nGAANdG9M6Ke0MSIGcYruxBNYH4finrMvaWEof+mdqUYkJ8UIn+sXGX4 +dqY0NAm4dKsNTP1IfIcoisJXSKvZT87Ec1b1k4AEUWrHDZOxTCUTf9pb25N4VNNFggzrTbF+nM U1lcNH/CkGatAt9QTyu+aBKKiolenJxF3kmD0mYr4s9FuI4lrO6PG5mvmpQGja3eWupMyBu2hqn NJCGlXqI4/1QwaufXOtFNJEkRI5iBft5O8Um0Tr7AQQHoC1wfcu27bbOBsMOZnW2NR/+s7u/Sva 8aSSSzZjY0vhzC3pRy69vwpVY5zSZY5+tprd15PLi+5RUqSf2lqe5EDHEi7KDtb7fsHkNjUYqjR TG2lrxPrumVhhFk1Qcgu62NUTb+5sgufX/Rh5OoTD+hrxVtYCXBquEGuzvcZOpSwRoWUu6jABG X-Google-Smtp-Source: AGHT+IFiSdFwTXIhd5gYIuSg1GPgu2PpSZsMBZMIssC6s2idbJNbLr9CJghzMhIYm1T/jXyRlH/1IQ== X-Received: by 2002:a17:907:689e:b0:b86:ef31:c2c7 with SMTP id a640c23a62f3a-b86ef31ccf3mr507569666b.42.1768229679538; Mon, 12 Jan 2026 06:54:39 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 02/14] hw/arm/fsl-imx6: Remove now redundant setting of "sd-spec-version" property Date: Mon, 12 Jan 2026 15:54:06 +0100 Message-ID: <20260112145418.220506-3-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::529; envelope-from=shentey@gmail.com; helo=mail-ed1-x529.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230143242158500 Content-Type: text/plain; charset="utf-8" Now that TYPE_IMX_USDHC sets this property internally it is not needed on the SoC level any longer. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/arm/fsl-imx6.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index f3aa1d8150..46967b7488 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -323,8 +323,6 @@ static void fsl_imx6_realize(DeviceState *dev, Error **= errp) }; =20 /* UHS-I SDIO3.0 SDR104 1.8V ADMA */ - object_property_set_uint(OBJECT(&s->esdhc[i]), "sd-spec-version", = 3, - &error_abort); object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg", IMX6_ESDHC_CAPABILITIES, &error_abort); if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) { --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768229791; cv=none; d=zohomail.com; s=zohoarc; b=nVjABuFMEHW+pV61STHur5P2C0s1Thb9QHIElLXkilzQBd0QG+gzljvGWAk8mU1iSIYNAK8GUpCJf4Xbu2iwKrKfGarhaPh7PSpsU/8v6fl1TXa13N6gwP7cHSpwKmS4+3TB7QshGeRF5rdoeKCzEogDz4s6wxOaYosQqN6p+KM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768229791; h=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=Ajg8LOL78oqsr/dK0/gBGuSs986fyLyreKG66qhOt5s=; b=fwc6sCirruwyKWhaqCCXVSRVNtpKiQXpy0NUcZatxsPkPBFVpoauenSivnJBU8e5imVRBzQbBbL/iuPY+esfHahaDxaIpgCHcQN4AhhfX/QXxwIeScuG171ircDRMpDMMf0QCaCfahZiEpsg7uwMcwjyztpOIV3pbP6ox2qy1dk= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768229791607536.283390372862; Mon, 12 Jan 2026 06:56:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJJi-0007i1-0q; Mon, 12 Jan 2026 09:54:50 -0500 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 ) id 1vfJJe-0007dC-8y for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:46 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJb-0001W6-P6 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:45 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-b8718187eb6so167283866b.2 for ; Mon, 12 Jan 2026 06:54:41 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229680; x=1768834480; 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=Ajg8LOL78oqsr/dK0/gBGuSs986fyLyreKG66qhOt5s=; b=SeOxX0ghPi0d7cmaa3vGutUuwNZXm7b8W8YtEY3rAniUG59tYTsQrA37xdV23vYAsf Cv3Yolst86zfulwbF6wkRx2bS6xywYcP9LclrTRq+/WT4sZHhwhmlGaBK7E0nAjQfjEI RzUp7iRQLQHceRrnqzSHaOTJDd9ESS/jQOhE/tkmm07dy9NAroiSzIczc5xYPTJDyQmd eelc3CfXcxyEOfbDgLIcvplAib/vxxkus7T4Oh6fxNs2r3hp0jUi5TwwWOvtFQFIfP2F WlZFIV5Up1zyRxcZ+qCR+5EgBnXMTmfI+yqr07qAzFEydC1cToZ6rUrwY+J/V9LTmi2Q BWyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229680; x=1768834480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ajg8LOL78oqsr/dK0/gBGuSs986fyLyreKG66qhOt5s=; b=csaKFIQyYFJeCbgaOLG97DlGAhXtv8Ab7MFIkjpjESac5uFkQAee0otWzB1dOTRYDo snoP5GqXWqty1K9xuEtbs0xXrOCXNM3XpdeOEOIvGQQCvEHwwijc+SjOITVtTu0y6Qq9 S2bjTOyR2ix9p1E5P7gH/+DphBYUbhD8GKgUd+00vjF9h/hOWxN8UvDa9FbPqXZsICxf qCfj3FWnwmnEeR337hp78Sik0+WCRzeKyqyFoKpicPXEebiAWQWBSha74eR072Ylo2KY iX/XCPxCjnQC4+IPlzGGF1WGHFF7JtAOZZ3xHJifIJFgA5VpC5PUSjCDZQxxfkduARAW ndQA== X-Gm-Message-State: AOJu0YxAmyZbJ0qP7X5qb/OSpbQ2n6O6+hN0nJlIPk4KppDqzq+hAIN8 VgcWGvnKvccbKzLq6EuS7bniBJdedTj0ta/3BinElRb4WaCuSCLvwpmh7u23Y6KA X-Gm-Gg: AY/fxX4XCDBbEKeOOF8kd4UxmRwgHlBEarbi7G348PlIcEBoCiDwCKLZn3aRJ4MNwSB abzdMGV4acmt27K4M3nC7wKXlQjXayBf2FTb/xpKtwluZmqDGqGEjn2TahUD0bIMDFUPJifHhns HpwYRJIF5TNvAtXlYjQqBnVGvj/y+5sldTOdYHIgozW/rM2ASl27nLy617XC0VPk6Ah9S69IwYq MVnPkBToUqjNdVmlo0NOdLvinWkjcgkvu6ol4a2PbU6yO/W/Q5isiweIh9vcUQHZPM9wzahVEmN eWnQJMAMfZ9G02Ks80Y1zu3rqp3xk6y+kmvAxfSliM1Qvs2iDYJukRijKClHd/Z246BMi5H6AC+ 4uCtnx7eE3pOciBjG4XFWwAL/mZJnGz2kceFglgNGrMW8O3llR629NWgFQ/8g0IeCqNoMVOSsxY 3UwkzhQz7LtwZTVBcQEvt41n97vaxHaf65dC6B2TQQXQCpEdUeZ+6+nnrEx26q+QZEU8/iFOIG X-Google-Smtp-Source: AGHT+IHt6hvwrkl2S51/GHXcSlJ2ZrVxeImVfSHIsHfBTTwgtjxtM7ExNgN+idBCW+UV8wr5hQaq0g== X-Received: by 2002:a17:907:6ea6:b0:b87:2780:1b1e with SMTP id a640c23a62f3a-b8727804cfemr177722366b.41.1768229680425; Mon, 12 Jan 2026 06:54:40 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 03/14] hw/arm/fsl-imx6: Fix naming of SDHCI related constants and attributes Date: Mon, 12 Jan 2026 15:54:07 +0100 Message-ID: <20260112145418.220506-4-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::62d; envelope-from=shentey@gmail.com; helo=mail-ej1-x62d.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768229793536158500 Content-Type: text/plain; charset="utf-8" The i.MX 6 SoC features uSDHC controllers which are the successors of eSDHC. Fix the naming to make this clear. Fixes: ec46eaa83a3c ("i.MX: Add i.MX6 SOC implementation.") Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- include/hw/arm/fsl-imx6.h | 4 ++-- hw/arm/fsl-imx6.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h index 5520473ba0..bb866994df 100644 --- a/include/hw/arm/fsl-imx6.h +++ b/include/hw/arm/fsl-imx6.h @@ -46,7 +46,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(FslIMX6State, FSL_IMX6) #define FSL_IMX6_NUM_EPITS 2 #define FSL_IMX6_NUM_I2CS 3 #define FSL_IMX6_NUM_GPIOS 7 -#define FSL_IMX6_NUM_ESDHCS 4 +#define FSL_IMX6_NUM_USDHCS 4 #define FSL_IMX6_NUM_ECSPIS 5 #define FSL_IMX6_NUM_WDTS 2 #define FSL_IMX6_NUM_USB_PHYS 2 @@ -67,7 +67,7 @@ struct FslIMX6State { IMXEPITState epit[FSL_IMX6_NUM_EPITS]; IMXI2CState i2c[FSL_IMX6_NUM_I2CS]; IMXGPIOState gpio[FSL_IMX6_NUM_GPIOS]; - SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS]; + SDHCIState usdhc[FSL_IMX6_NUM_USDHCS]; IMXSPIState spi[FSL_IMX6_NUM_ECSPIS]; IMX2WdtState wdt[FSL_IMX6_NUM_WDTS]; IMXUSBPHYState usbphy[FSL_IMX6_NUM_USB_PHYS]; diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 46967b7488..39667c4a49 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -79,9 +79,9 @@ static void fsl_imx6_init(Object *obj) object_initialize_child(obj, name, &s->gpio[i], TYPE_IMX_GPIO); } =20 - for (i =3D 0; i < FSL_IMX6_NUM_ESDHCS; i++) { + for (i =3D 0; i < FSL_IMX6_NUM_USDHCS; i++) { snprintf(name, NAME_SIZE, "sdhc%d", i + 1); - object_initialize_child(obj, name, &s->esdhc[i], TYPE_IMX_USDHC); + object_initialize_child(obj, name, &s->usdhc[i], TYPE_IMX_USDHC); } =20 for (i =3D 0; i < FSL_IMX6_NUM_USB_PHYS; i++) { @@ -311,11 +311,11 @@ static void fsl_imx6_realize(DeviceState *dev, Error = **errp) } =20 /* Initialize all SDHC */ - for (i =3D 0; i < FSL_IMX6_NUM_ESDHCS; i++) { + for (i =3D 0; i < FSL_IMX6_NUM_USDHCS; i++) { static const struct { hwaddr addr; unsigned int irq; - } esdhc_table[FSL_IMX6_NUM_ESDHCS] =3D { + } esdhc_table[FSL_IMX6_NUM_USDHCS] =3D { { FSL_IMX6_uSDHC1_ADDR, FSL_IMX6_uSDHC1_IRQ }, { FSL_IMX6_uSDHC2_ADDR, FSL_IMX6_uSDHC2_IRQ }, { FSL_IMX6_uSDHC3_ADDR, FSL_IMX6_uSDHC3_IRQ }, @@ -323,13 +323,13 @@ static void fsl_imx6_realize(DeviceState *dev, Error = **errp) }; =20 /* UHS-I SDIO3.0 SDR104 1.8V ADMA */ - object_property_set_uint(OBJECT(&s->esdhc[i]), "capareg", + object_property_set_uint(OBJECT(&s->usdhc[i]), "capareg", IMX6_ESDHC_CAPABILITIES, &error_abort); - if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) { + if (!sysbus_realize(SYS_BUS_DEVICE(&s->usdhc[i]), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->esdhc[i]), 0, esdhc_table[i].ad= dr); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->esdhc[i]), 0, + sysbus_mmio_map(SYS_BUS_DEVICE(&s->usdhc[i]), 0, esdhc_table[i].ad= dr); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->usdhc[i]), 0, qdev_get_gpio_in(gic, esdhc_table[i].irq)); } =20 --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768229899; cv=none; d=zohomail.com; s=zohoarc; b=dFNJM37Vr02NchUpsrzBgaBmH0FnetFRSDfuRRBkszmLotQQQcSVhdENAt9bFfXRjp5Z+KMCDMRiw69yioWwNm63HYCMuZh81Md4PKliBktV+fzusOGrioPVbLZfrwLK2R0JM62yZWebyUhgXz/vPdI9GEcz+3k0PxNEhZFEd7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768229899; h=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=wscBRTm7STUtvNgIyID3EdUtTJO2sL4HdK1iLXIRQS0=; b=RWu/oNd6eUGXNb/NDuwCrgZqjkKFZBSQ8E2i7kA7B9cXTRTG/wkMWDUqhGoZ29Z5F1loMCt/xSBVHodqQgwLoJFnIBiGSZyHq0X1gRX0OS9UVsA5JLLWf3YcgcrPus9py4L6WBqbA1OrHQJOP8EjMC9VpcoPq9Fs1JVF++q7wx4= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768229899590937.4321671312767; Mon, 12 Jan 2026 06:58:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJJl-0007me-IE; Mon, 12 Jan 2026 09:54:53 -0500 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 ) id 1vfJJh-0007g0-2A for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:49 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJd-0001Xa-Rm for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:48 -0500 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-b87281dbdbcso104322666b.0 for ; Mon, 12 Jan 2026 06:54:44 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229682; x=1768834482; 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=wscBRTm7STUtvNgIyID3EdUtTJO2sL4HdK1iLXIRQS0=; b=bHV8lMkWX/RmKvbRUBv5KAvQQp9XTqy6wDaFa2hHlbbNLFzM4bjuzSnk+SWQGWStKi 2rkiDpXA4GtnVteK9EwOujzNbsx15L4iQAemrIc7hqwL8llVUWGySQb/NwSSQ4Eor4B+ jIRXKP0wAxgYCHrhpJOhkOL2GZ2Yw8ryeuBiQPdkWHvHb6gSfkQMmX04l3bPWPUgBvSG 1ILkoxLjr9agvKyZ8j9M1g2yw/WBfXT23rAOYvS0rGQNQFszQM2epThXK7m2Hv8Z7Lb3 4GiJ6Itb3/dfIw5yxGRpXbtwPEBaKf6cNMRUDzkf/BTpf4wqzER52uCJ6zFn5Zza61dB 3GZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229682; x=1768834482; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wscBRTm7STUtvNgIyID3EdUtTJO2sL4HdK1iLXIRQS0=; b=kHVuS4GmGwYmMp0l1X7dv5kgGNA10ZyHOYLasDvNkWqanTy32MTI6kjnO6WQjRPGXG I38luICf8EAcz5z7QSrJbDKV7+vynJrPrnKQfAToBZdxSnFpSI77lLgO5hSGxk5QKMdI ISRB/eJZWtLk1M/whQZpMaYMDe0jkuWKX5FIdIQdrj/YZtNWQi/oONMRhFr2IEoW+HAG b0KvOuSFLUliGKMpWSACWsGn5jNsrPj62LOtul61QiNXbu9QvbvlvnaUG60uThYvRGZ7 rVgm48b15YPC1G2INx4gJ1adZcLDbUkd+/cjyYhOLPMG1iQgIespz+mvqn2Uhw6/Jh3v 76vQ== X-Gm-Message-State: AOJu0YxGW4sBudW0ktjc+0p1IUIggNbH+ZvWcMzfceSVA9nYiGjaqWV0 CQLpcIUFvY0rNPz9O7LwlSAgP3SL9Fjit9ACXH7rxRGanXkcIXpWHirI2WmMZxBm X-Gm-Gg: AY/fxX4fcksS2ug46iZgvONuHY2jhh4sXvGIPNzz9I9Xzv4nwFOQFibz2wHr5K+mm3l Ks7Bj9n157dIkiOrDB+zIwGQE5ApWVbUcT41Ova79hwSN58TkVbyrof/2e1A8lmZql7z+quzYVO Hk7cXpigUMRF8bq0kv3DlT+WA8EZI3WEb2jvPH85XwQEbXNJT1OCfuVOfpz01dV4NpmcvxeNTYB NZaWrcTpKsHVyid5VO40hXBa/mmLoGpzRYFYopx2xwyYXlzWmyho4A2fP+4tNouDr5CFCirzMZT mfX0hqc3DDGF0TvIHVwPJOT9ekkJ2iZ9hlZt51erpNseslXsckaEWoT17l26QopuSv1bnLvciO0 mvsC1kU2R/lXEODt8hm2df7Jl7Fl6GZqXJGYuyaEdzAIXq2rFXNxd5qBLrvPUsaaDk2FxeeGK8H hRij1K+yDr65okEYRAIYVUXcWGcb5V1Xz0ZGgAwIbojtm8TDNH+Hah6pe5JxziCb0/1a3mebRk X-Google-Smtp-Source: AGHT+IEwu7WuTSHRhbEc9ACkxzfgXWJE7fekxK9tOyd5vaLjmsb2OmmWD9RV/pRI8f0kHh56EQdteQ== X-Received: by 2002:a17:906:4fd1:b0:b4f:e12e:aa24 with SMTP id a640c23a62f3a-b8444cce26fmr1917157366b.22.1768229681474; Mon, 12 Jan 2026 06:54:41 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 04/14] hw/arm/fsl-imx25: Apply missing reset quirk Date: Mon, 12 Jan 2026 15:54:08 +0100 Message-ID: <20260112145418.220506-5-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::62c; envelope-from=shentey@gmail.com; helo=mail-ej1-x62c.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768229901519158500 Content-Type: text/plain; charset="utf-8" Just like the Freescale MPC8569E SoC the i.MX25 features an eSDHC but as little-endian variant. According to the datasheet TYPE_FSL_IMX25 requires the same reset quirk as the e500 machines. The quirk was introduced in d060b2789f71 ("hw/sd/sdhci: Set reset value of interrupt registers") for the e500 machines, so reuse it now in TYPE_FSL_IMX25. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/arm/fsl-imx25.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index dd670827ff..9e02063533 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -243,6 +243,8 @@ 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_FSL, &error_abort); if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) { return; } --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230144; cv=none; d=zohomail.com; s=zohoarc; b=K4eWOzgRgK83nnzWKHfR7t0tbSFRMmUAMN7iBwNWin+mySVNuBnb5VnpSCvwZ1+6nlwdCI8gbVE72xekTvoKu1HYXr4DRjUTooX0OTViV+66CIeDAkN/w0rKwTh797T0XrIyeN5KNk3aMIMM/YI4D4OC9ZbXJuSG39iimb1fcV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230144; h=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=1rPn6RrafNXG2RcHcgcC/D23Cz4zUHe4Dy7SUb3RB1g=; b=EpSd571obdYJr2Ejz8cAd092WNGsBDH5KQLY3/fDQc8VspogARCC7PT/vQalWCnNNzhp583pLYgBYeN/si/e8WUZd/yWn3Iz13jT+xXu/XjywNxlGucyrfRaHjV9PO/DIYySj551CH1spa25YHumxkmx3FeT20lV4kG9qeEaoU4= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768230144073428.31811822567056; Mon, 12 Jan 2026 07:02:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJJm-0007n5-9M; Mon, 12 Jan 2026 09:54:54 -0500 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 ) id 1vfJJh-0007gc-9c for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:49 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJd-0001Wl-Rb for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:48 -0500 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-b8719ac9af7so163846166b.0 for ; Mon, 12 Jan 2026 06:54:43 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229683; x=1768834483; 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=1rPn6RrafNXG2RcHcgcC/D23Cz4zUHe4Dy7SUb3RB1g=; b=T3xNvQEGThwMKJpTmATSqA5ssHsewvXE5aIjEqVxLePaHDv3RxwxgXbGbtDwmPMqFL GTfYM3Z/0mwobHQoieVR9pEElfpqXhuoXiFJ9dSYiR2bB4eGgL773Xc/eoulCsu9gf7S A0KilLDk4rCzg3BA/eAy6Me4BGftHvCnls5KnlzfT32pdnjvRj5VtDfaPqUwVocFOft8 FkoNNtjPPappT55Cx10KF/57fnDySSAMlXEoEPy5pnv93q9pPkdFS0NraZ1jvzsMhiE7 AOv/JTK15/uViQq6JnGyQJDj7yi70OJXVaDMUKpa2nOJF/yIBplanb+85UZgjUQx1WKM tZbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229683; x=1768834483; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1rPn6RrafNXG2RcHcgcC/D23Cz4zUHe4Dy7SUb3RB1g=; b=XGawHofSZSp9MWM+Q5XbeS5X5zTdMoIboRgSrWFc2jfl0lilHRtWBgpfJT5L18kVV+ 7BGCw043c9HwfZ6eP5m8/YgYxbLSnXjFoG6XR8mWWvycPkHVZCUX/dBmibuw45Oxq13g 3g9Lh5jDuMQz0GBWhFrDjtX3Xf0qaFAgO0pFSJN1HasPlMPQPpc1qE//cS6vC652HctD 33QWHBIDwJhYey7hdenmYluAI5+WoEGSecmMcKciyPLMpXjPG0N8VRiiOR9mbLvTNlii 0AZXpUWh/QJS49nSaPVtRQZojABr4cPJ7fMZz15kCfjzbnZkOILcaL4IY4S/k/AC9KUZ KWYQ== X-Gm-Message-State: AOJu0Yxthp9ukZcy/MoM/XJdw4NiJPqBtZCj2c/zT4NHSdkTuEMAB0bU /2+GlrbvWFkSx36S4EdXSFhjTJ9qVgk8OP03KqaEGWtIi/V40oRp0VM2hNmUANfj X-Gm-Gg: AY/fxX5NK3E3yBt5xM3s14b3wYm4ybjm2zOYHeBkztbYhg8DlUZi5amVJll118OnqiJ 4Pp+zmAfsgFV24fCn+YvC0goFvDiWPT4Nk37Jl8Hx9sTJnXrQ2EdZOOxMzPvQAgFHye7ozquZuS OPn1PCsPoyhBTjaCijQABpLFm0g1j04xX/PDakli41JE0DwaN76Czb+IWRKlegyLvq37VqbGIae tdxVe85hzziF3UOkBqucypEdZ7h1GWKnqkExGvqWHmfQKP9U3O8PAZgQIyF8XnOWqlnZFX892mX LmDwRcELBTYIuTOjKsiWnu4NtcF0lypS9itEc6SYzvSy1s7YV6Ve2N2VOkSDym3egHBxAyZQxjW iORCc1RWRoNIAuySfF50T4VPY4Lo1wwL4OPJDmYzQILat1DySbIPF8Eshs1t37rGjExNv3Che9s 9d1nUnDSzcIIC6bJhJrYdnJRskdLReQuwOXPKjhPeu/KZBqJ/RTk1ND6GEXYWkCys7W4PUh657 X-Google-Smtp-Source: AGHT+IHqMvtkYlJMFRymhakMTyVu2RxZy0qKe9a+opLTAZ3Z6hqM5jcRAKhh1eQawAQQMUnGVBkDfg== X-Received: by 2002:a17:907:3f1c:b0:b87:2abc:4a2a with SMTP id a640c23a62f3a-b872abc6586mr159869166b.1.1768229682424; Mon, 12 Jan 2026 06:54:42 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 05/14] Revert "hw/sd/sdhci: Rename ESDHC_* defines to USDHC_*" Date: Mon, 12 Jan 2026 15:54:09 +0100 Message-ID: <20260112145418.220506-6-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::631; envelope-from=shentey@gmail.com; helo=mail-ej1-x631.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230145553158501 Content-Type: text/plain; charset="utf-8" This reverts commit 1e76667f7adf48c6c3596aaa26b8886b57b8498d. Unaware that the constants were named after Linux and U-Boot code, commit 1e76667f7adf ("hw/sd/sdhci: Rename ESDHC_* defines to USDHC_*") changed the naming to be consistent with the function names. Fix the constant naming to be consistent with Linux and U-Boot again. In the next step, the function names will be renamed according to Linux and U-Boot code as well. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/sd/sdhci.c | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 23d8f7cbc8..ccdfc59af8 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1639,24 +1639,24 @@ static void sdhci_bus_class_init(ObjectClass *klass= , const void *data) =20 /* --- qdev i.MX eSDHC --- */ =20 -#define USDHC_MIX_CTRL 0x48 +#define ESDHC_MIX_CTRL 0x48 =20 -#define USDHC_VENDOR_SPEC 0xc0 -#define USDHC_IMX_FRC_SDCLK_ON (1 << 8) +#define ESDHC_VENDOR_SPEC 0xc0 +#define ESDHC_IMX_FRC_SDCLK_ON (1 << 8) =20 -#define USDHC_DLL_CTRL 0x60 +#define ESDHC_DLL_CTRL 0x60 =20 -#define USDHC_TUNING_CTRL 0xcc -#define USDHC_TUNE_CTRL_STATUS 0x68 -#define USDHC_WTMK_LVL 0x44 +#define ESDHC_TUNING_CTRL 0xcc +#define ESDHC_TUNE_CTRL_STATUS 0x68 +#define ESDHC_WTMK_LVL 0x44 =20 /* Undocumented register used by guests working around erratum ERR004536 */ -#define USDHC_UNDOCUMENTED_REG27 0x6c +#define ESDHC_UNDOCUMENTED_REG27 0x6c =20 -#define USDHC_CTRL_4BITBUS (0x1 << 1) -#define USDHC_CTRL_8BITBUS (0x2 << 1) +#define ESDHC_CTRL_4BITBUS (0x1 << 1) +#define ESDHC_CTRL_8BITBUS (0x2 << 1) =20 -#define USDHC_PRNSTS_SDSTB (1 << 3) +#define ESDHC_PRNSTS_SDSTB (1 << 3) =20 static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) { @@ -1677,11 +1677,11 @@ static uint64_t usdhc_read(void *opaque, hwaddr off= set, unsigned size) hostctl1 =3D SDHC_DMA_TYPE(s->hostctl1) << (8 - 3); =20 if (s->hostctl1 & SDHC_CTRL_8BITBUS) { - hostctl1 |=3D USDHC_CTRL_8BITBUS; + hostctl1 |=3D ESDHC_CTRL_8BITBUS; } =20 if (s->hostctl1 & SDHC_CTRL_4BITBUS) { - hostctl1 |=3D USDHC_CTRL_4BITBUS; + hostctl1 |=3D ESDHC_CTRL_4BITBUS; } =20 ret =3D hostctl1; @@ -1692,21 +1692,21 @@ static uint64_t usdhc_read(void *opaque, hwaddr off= set, unsigned size) =20 case SDHC_PRNSTS: /* Add SDSTB (SD Clock Stable) bit to PRNSTS */ - ret =3D sdhci_read(opaque, offset, size) & ~USDHC_PRNSTS_SDSTB; + ret =3D sdhci_read(opaque, offset, size) & ~ESDHC_PRNSTS_SDSTB; if (s->clkcon & SDHC_CLOCK_INT_STABLE) { - ret |=3D USDHC_PRNSTS_SDSTB; + ret |=3D ESDHC_PRNSTS_SDSTB; } break; =20 - case USDHC_VENDOR_SPEC: + case ESDHC_VENDOR_SPEC: ret =3D s->vendor_spec; break; - case USDHC_DLL_CTRL: - case USDHC_TUNE_CTRL_STATUS: - case USDHC_UNDOCUMENTED_REG27: - case USDHC_TUNING_CTRL: - case USDHC_MIX_CTRL: - case USDHC_WTMK_LVL: + case ESDHC_DLL_CTRL: + case ESDHC_TUNE_CTRL_STATUS: + case ESDHC_UNDOCUMENTED_REG27: + case ESDHC_TUNING_CTRL: + case ESDHC_MIX_CTRL: + case ESDHC_WTMK_LVL: ret =3D 0; break; } @@ -1722,16 +1722,16 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) uint32_t value =3D (uint32_t)val; =20 switch (offset) { - case USDHC_DLL_CTRL: - case USDHC_TUNE_CTRL_STATUS: - case USDHC_UNDOCUMENTED_REG27: - case USDHC_TUNING_CTRL: - case USDHC_WTMK_LVL: + case ESDHC_DLL_CTRL: + case ESDHC_TUNE_CTRL_STATUS: + case ESDHC_UNDOCUMENTED_REG27: + case ESDHC_TUNING_CTRL: + case ESDHC_WTMK_LVL: break; =20 - case USDHC_VENDOR_SPEC: + case ESDHC_VENDOR_SPEC: s->vendor_spec =3D value; - if (value & USDHC_IMX_FRC_SDCLK_ON) { + if (value & ESDHC_IMX_FRC_SDCLK_ON) { s->prnsts &=3D ~SDHC_IMX_CLOCK_GATE_OFF; } else { s->prnsts |=3D SDHC_IMX_CLOCK_GATE_OFF; @@ -1796,12 +1796,12 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) * Second, split "Data Transfer Width" from bits 2 and 1 in to * bits 5 and 1 */ - if (value & USDHC_CTRL_8BITBUS) { + if (value & ESDHC_CTRL_8BITBUS) { hostctl1 |=3D SDHC_CTRL_8BITBUS; } =20 - if (value & USDHC_CTRL_4BITBUS) { - hostctl1 |=3D USDHC_CTRL_4BITBUS; + if (value & ESDHC_CTRL_4BITBUS) { + hostctl1 |=3D ESDHC_CTRL_4BITBUS; } =20 /* @@ -1824,7 +1824,7 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) sdhci_write(opaque, offset, value, size); break; =20 - case USDHC_MIX_CTRL: + case ESDHC_MIX_CTRL: /* * So, when SD/MMC stack in Linux tries to write to "Transfer * Mode Register", ESDHC i.MX quirk code will translate it --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230142; cv=none; d=zohomail.com; s=zohoarc; b=CB+rFSigw3z+PMH7K5wPw3gZH/dbpG1ZAFCa+ZrW7yPe6KfcSmKcpd/bV/2TNaaLdt2w4RQXvzhjco3/XCopbrL9FcnvfMTb5HsTW5rUbrecsUEVgqV5sQcYEQyWbmgT1DyeNSo6gnyGs2y7xqXs6QH52Uh1lrOerCd9qISWfsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230142; h=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=Y1LxjYjMYUoswFZn9nDXTMgtS1rPNwvvyqGhy82qro8=; b=CM3enzsHjkIXlLgIRp6Mry4B0RpHKhq90QVrxxasnH4ESdhk9gSHwz+x6PYdbfi5Uh2W84j9XKVBqRT6GMbgmC5NlPSUApGf7Z7Ft3K9oqJh1aQaxkkZNdOxh8lA5heVOdyNh9N/e/Qs9gbs/HZcZwM9hF5JMqVRkG/ZfigPnHw= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17682301423721013.2596382768027; Mon, 12 Jan 2026 07:02:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJJl-0007mr-R5; Mon, 12 Jan 2026 09:54:53 -0500 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 ) id 1vfJJg-0007fe-RZ for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:48 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJd-0001Xn-Rc for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:48 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-b87003e998bso265337166b.1 for ; Mon, 12 Jan 2026 06:54:45 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229684; x=1768834484; 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=Y1LxjYjMYUoswFZn9nDXTMgtS1rPNwvvyqGhy82qro8=; b=AUHxeNgI9ciszVJcOgOPwwdTIX+UJbMz0uO6pMIG6DDk4ZUay/Zpo/K+m55+zF85gu e+xlU1kr1pE4Nnqz7veBfqqmrWlrN3oCcZwGZulGcYOj0OKqlKK1xlCcXXUxViuturrr UgMz6UdOvTvrvqe4GDSIOf93oxiUcTJ63thV8c9fwE6Sy6WrX/Aaf7zJE8G++4zwFJdq jWjnH9vUKWDYmtfcyjJmqhFSA6CI4Lko48m/5gwHEPpMDlIBfaV99BlA4dYUVOtibN6J tlF0+hXqKX40YYlE0Ncec6sg3+TyjYckS+Km3lgT10p65HCK236yXmb2BaZISeUpRLb0 jOWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229684; x=1768834484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Y1LxjYjMYUoswFZn9nDXTMgtS1rPNwvvyqGhy82qro8=; b=ABFi5999jT7iOBiMCOok3Rx2yVuPuMaLwa30JnRj/HLHLFENyIK3wSEo/C5gL1gHeh lY6xrEfWNVtybCt26S+t9MD1SwFq9oqmhGS7LdukRkXYL+pCRi8Ga51cpih62dQ3wSTj tITDk25S0YjVgTzOBIeOUaGsjCb/e6sqQO5l68V7uPUkcxqH0xGtxc6DjCKKrktbf7E5 mxg0Cx7QHlEHWWu8si4DJMJSbvBeBlw2wXHkkBM/ECWsXTMRljoFTLCJB2uV3eyb9wBs j/nrTmN4N9ogYBgO51SGGoP6JNuDN9jQtH/DtNvRQmLN38/qLSiAdvhIz+4eyLlt4iYH xqcQ== X-Gm-Message-State: AOJu0YxiTAyCfo1khLlhJTmCs65pa2Jlqx1QuBjVljJdyPE/e7IprJJ+ YBAtE2CZ+x/Jmmi+j1AIsc/EreWeSrsDsc9LX4dpRqJz0ib1Wj+PoJhtRrGGyKP1 X-Gm-Gg: AY/fxX7fwdDnZ31pNsPmOqqJVMdGpYW/qWXAAb+moxQYovxWKGUxOS3mXo2n+v5GQhj PIHN4qA+Vno1IiOxoceoHCcRD3OL8dZJRM9orhPqa9Z5o6d3rfkqeKg2g9xnH5c016Ih8chXCaa Pth2VeWJlZfWMSgb9jR9578csZBIkjvKIPmnFtg0sAfanwRfDXQ7zctQYylQv9TqZIGW9V7sTWT BzIftchDFP0KTl5fAe/TprQ2P/P2Fpn0V/roji9HtvzjK8cBcrwulNfGCa26kX+eQZIaWImOwRM m1F8lgRrms99xl3rMvfD6gnjJRZoDtXjPvO7iveTbWDUWA7DlBgsqK3CTqUKqUb5Jqvx5THZkwR piGOLbo2Yhu4zSF1T0cTWdhR8/5PwS/cTfCLmutiG2Bu9W3ZG7nPisH+FsXbvavcaSnXLbVeR7z 72EB910tO16H4bFkuGLDXzOPf96FfDnj5ESR93AmRxp5F+8rgIqpgjFQPOcnNVJsdBfDdQig62 X-Google-Smtp-Source: AGHT+IEl+b07bG8+3Z0hGlXN5mIYnTrF9fwmZuhOzzlOmo0yshFxPLv4Z0v/ew312KsuxIKCV3GQag== X-Received: by 2002:a17:907:7b86:b0:b87:1891:48fb with SMTP id a640c23a62f3a-b8718916cf6mr383338366b.23.1768229683536; Mon, 12 Jan 2026 06:54:43 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 06/14] hw/sd/sdhci: Consolidate eSDHC constants Date: Mon, 12 Jan 2026 15:54:10 +0100 Message-ID: <20260112145418.220506-7-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::62d; envelope-from=shentey@gmail.com; helo=mail-ej1-x62d.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230143258158502 Content-Type: text/plain; charset="utf-8" Drop the "IMX_" part of the names since these are actually {E,U}SDHC specific and apply for PowerPC-based SoCs as well. While at it consolidate all ESDHC constants into the ESDHC section. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/sd/sdhci-internal.h | 1 - hw/sd/sdhci.c | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 3e81821dd1..f24532eed2 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -75,7 +75,6 @@ #define SDHC_CMD_INHIBIT 0x00000001 #define SDHC_DATA_INHIBIT 0x00000002 #define SDHC_DAT_LINE_ACTIVE 0x00000004 -#define SDHC_IMX_CLOCK_GATE_OFF 0x00000080 #define SDHC_DOING_WRITE 0x00000100 #define SDHC_DOING_READ 0x00000200 #define SDHC_SPACE_AVAILABLE 0x00000400 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ccdfc59af8..779f411bab 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1642,7 +1642,7 @@ static void sdhci_bus_class_init(ObjectClass *klass, = const void *data) #define ESDHC_MIX_CTRL 0x48 =20 #define ESDHC_VENDOR_SPEC 0xc0 -#define ESDHC_IMX_FRC_SDCLK_ON (1 << 8) +#define ESDHC_FRC_SDCLK_ON (1 << 8) =20 #define ESDHC_DLL_CTRL 0x60 =20 @@ -1657,6 +1657,7 @@ static void sdhci_bus_class_init(ObjectClass *klass, = const void *data) #define ESDHC_CTRL_8BITBUS (0x2 << 1) =20 #define ESDHC_PRNSTS_SDSTB (1 << 3) +#define ESDHC_PRNSTS_CLOCK_GATE_OFF BIT(7) =20 static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) { @@ -1731,10 +1732,10 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) =20 case ESDHC_VENDOR_SPEC: s->vendor_spec =3D value; - if (value & ESDHC_IMX_FRC_SDCLK_ON) { - s->prnsts &=3D ~SDHC_IMX_CLOCK_GATE_OFF; + if (value & ESDHC_FRC_SDCLK_ON) { + s->prnsts &=3D ~ESDHC_PRNSTS_CLOCK_GATE_OFF; } else { - s->prnsts |=3D SDHC_IMX_CLOCK_GATE_OFF; + s->prnsts |=3D ESDHC_PRNSTS_CLOCK_GATE_OFF; } break; =20 --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230415; cv=none; d=zohomail.com; s=zohoarc; b=kPVL06TyorLsW5JXW6telu7oE0LvYvlHsPHRJ8UPiAH387fXQZmMsM2xBbZVU5aRxplKM+b3jirPWVuM1S7pRpkfnTkyDED8RFfdrnPR2byaH0C2/Wjzn1NOZ9ElC0RaZju31WemF5xhV+sFNxf0ikTBNuqji0JCTvgkN4ocZZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230415; h=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=NZ8E/vLXW/n+4mH8Q0iJxaZz9OiFrfoLpfuE5uF7VSk=; b=iStU1KFtRc0U4QQHWsErha/Lx2BU+p1w2cWZE2q+3GpJCvJQHhTP7mDlAqDwKc7XPA8ktihAxbckUSLeMp0gCNvAqHM9M4ZGtnzMCr3xb7AHrAN07GeEbju33PGVwk6kOTCh03grAAuI7h2HX+qjjH5+/ynptRNLtQgYMrNNTks= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768230415288378.80798675513336; Mon, 12 Jan 2026 07:06:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJKA-0008C8-PW; Mon, 12 Jan 2026 09:55:18 -0500 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 ) id 1vfJJj-0007kX-8U for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:51 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJe-0001YO-PC for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:50 -0500 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-b8714a52072so183440266b.3 for ; Mon, 12 Jan 2026 06:54:46 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229685; x=1768834485; 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=NZ8E/vLXW/n+4mH8Q0iJxaZz9OiFrfoLpfuE5uF7VSk=; b=CN2H+i3MDRtsZeQF2HNHqA3OFkPX48k/GibIgdl5KCyaziTW5lccoYNnAFL3hH5/j7 a/6nUgFAqXG9ViMF5plNQw6aU/bnadbnQcd31Bu7Q2UCcYWcP5CaERP5F1x9QZYrwarT gUvRRNY7qCh5g4f3t2sxTp64ASLP6tYf8mvnlfn5ki2s1HeNXAcv6BZsPVCNlyR5RZeL WxTnKjOSKquAJaYQh5NeFAzYRs/AuesIvSbibulIbWV/d+NNG92XTvsf8DvgcbB4Y6kt 5iAazAluVlbtQiAWIybGV35Hsoq5TiAsB9V0u1hv1Ywb0bg0txzt5AA9aga77po9l5If XRvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229685; x=1768834485; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=NZ8E/vLXW/n+4mH8Q0iJxaZz9OiFrfoLpfuE5uF7VSk=; b=RZCA0drxwZ8ia++yq0CmhwWESTV7TR97eA8hVfwBY3kP7O7P5HcQq5Hoid5eenlGpq fQQ4oUDRRP4ZMs7PPGCO9x1s6vCWPXsh65ywD9CYuBvWsyH6fggYpDoqcYRfcpELN15c W79ycF0a0ZOzOYmcEslR/GrQQz1c7XBm47+LdFTE63sQIKctevoH4dWtgCpHMgszMfqi MOooJqaV3xwh2Yky9S9vwS3W9WP19XFqlbkIs4UcLQ31bK22Tobe/483GJU3Jprlgfot mp39Z95apsQkaOooYmdqD+RUJRrDwkpIyelCxrMpMhZFNj5Scu8YxwehM1aCz+jkOh61 Cnhw== X-Gm-Message-State: AOJu0YwfWb/lD8ML+KMQfE+cqeKM8roX3tboyRarJcTOFWOmgY6pZTd/ qHicuS3eLGTblD7WuG04N/nmLI+er2Nr4mIlnCLZgbZ7L5goK2S1CGnAXTkRbxXX X-Gm-Gg: AY/fxX5KZiDps3Al/u6Itw9xzjq2jU5AGQ6Hhx2eHwcT5ORqjQfPMx/05+lqqkUOT9J m6IKC/J5vecE2q3iC8GD/NYmxko92DPViUkPXgB7HrS0/DRrgbDSr7Hir0wHtNT7roagLc6aP7t e1C1WHkXcN5cyiIUwtnLuy88Y5IJhSHJ1prjs2Mb5QTkOcEljDErov5/OCZQIaZkkxKJz5E3MIi HqpAcs1HxTWeRia4UuuZ7a8HnmalL3lC1b85g4L99Qp5BLxqO7ajwVJ47Tz7oVTXD0CPK3W4Yn9 cLd8t/pJIlLjAblcJq4sQTyVcgPppSBWiMc3NL6ItkupeOdfk2kj/NwbOaCPlZjN8fd7djXAoNP 94z8IGqxQuVanFnJw0P2Welg2HFnRUtcbKbqnCNkW+lqAT2KLg/tajATpRxIABkfEU29O/jJRks V92BXGgHXF9D1Df9+OuXovF9ihoz7YgSJyrds3s17/IfQN5BN8d4L6F9LrZn/STG9MfB8Vm2/C X-Google-Smtp-Source: AGHT+IHsRslvJQAddX3envb+UZTEs4NgJTW38nwMX013zXf1mqEFwfqYAI4cCC+kyWDYSBBNCsEBDA== X-Received: by 2002:a17:906:f58d:b0:b87:1b23:cad3 with SMTP id a640c23a62f3a-b871b23cd09mr283903566b.9.1768229684803; Mon, 12 Jan 2026 06:54:44 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 07/14] hw/sd/sdhci: Rename usdhc_ functions Date: Mon, 12 Jan 2026 15:54:11 +0100 Message-ID: <20260112145418.220506-8-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::62e; envelope-from=shentey@gmail.com; helo=mail-ej1-x62e.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230417082158500 Content-Type: text/plain; charset="utf-8" The next patches will introduce eSDHC device models (big and little endian). Prepare for that by renaming the functions. Also, this makes the code have similar conventions as in Linux and U-Boot. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/sd/sdhci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 779f411bab..531dd3c291 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1659,7 +1659,7 @@ static void sdhci_bus_class_init(ObjectClass *klass, = const void *data) #define ESDHC_PRNSTS_SDSTB (1 << 3) #define ESDHC_PRNSTS_CLOCK_GATE_OFF BIT(7) =20 -static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) +static uint64_t esdhc_read(void *opaque, hwaddr offset, unsigned size) { SDHCIState *s =3D SYSBUS_SDHCI(opaque); uint32_t ret; @@ -1673,7 +1673,7 @@ static uint64_t usdhc_read(void *opaque, hwaddr offse= t, unsigned size) /* * For a detailed explanation on the following bit * manipulation code see comments in a similar part of - * usdhc_write() + * esdhc_write() */ hostctl1 =3D SDHC_DMA_TYPE(s->hostctl1) << (8 - 3); =20 @@ -1716,7 +1716,7 @@ static uint64_t usdhc_read(void *opaque, hwaddr offse= t, unsigned size) } =20 static void -usdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) +esdhc_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) { SDHCIState *s =3D SYSBUS_SDHCI(opaque); uint8_t hostctl1; @@ -1872,8 +1872,8 @@ usdhc_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) } =20 static const MemoryRegionOps usdhc_mmio_ops =3D { - .read =3D usdhc_read, - .write =3D usdhc_write, + .read =3D esdhc_read, + .write =3D esdhc_write, .valid =3D { .min_access_size =3D 1, .max_access_size =3D 4, --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768229796; cv=none; d=zohomail.com; s=zohoarc; b=Td3FtuPjskcpzD8kt08mZ97j1f0bc/PSRIXyiqwFGHRHuBe/JesU9skud1Wb1gw2AaPuIxZ1R2a2hWtU+J+MrpAjuBgkB6k5ZXFF7Z2U+LD8fW0wo4hQZeOfdAgYxGGfqbp0OE2uubF+5RWWtYfPdNsomNVZNLPaVWkLpfJHtSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768229796; h=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=FukVwTxoJHIN3FNbcOHO2weFoJlsrxf5RmTepg8qvQg=; b=ZlQaIBu/C2H9U3wPweUE2FasgUWfoaw0qrjMhF3noL5fJKL+X7o8iVshxZ3T+wgFmFdvO9o9TpOxW2o3IK1xlxM4Aq7J6VVLmjuuZexKAO6+QyZNwEzKEEFNfRQhZx215QrRUvYnGgQRvNd43o7DyUUJX8WwNNVjfZ+qn2bfXrg= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768229796325792.7227241008693; Mon, 12 Jan 2026 06:56:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJKB-0008Il-Ss; Mon, 12 Jan 2026 09:55:19 -0500 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 ) id 1vfJJk-0007lf-58 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:52 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJg-0001ZC-20 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:51 -0500 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-b802d5e9f06so943943366b.1 for ; Mon, 12 Jan 2026 06:54:47 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229686; x=1768834486; 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=FukVwTxoJHIN3FNbcOHO2weFoJlsrxf5RmTepg8qvQg=; b=KhkhYIkUkZDRe4vrPe32L6ODkp9qM/CaKkJTekNl4ju3xkeRltXI37rHRlSCX+Bt6G 0MwD73JqXw8z8PPZJ/VKA5SsCQe5oUnAsGAMyBhsw6mGu4eZF784UxXTd/w38xqEcWBl LnZEm5T4uQG/rj1C6+EpSHz/7ihfo+pWNJZ793lPOfpwSL0hGSj/2fpazmDqHVzivXgj T+VelILRcUjDuVC9dMcamoNCKYzUEaDCEMZ2K1ea2hCeFkDjZgS57QhjqR/hXEKYhZRO 7Qx7BKi+eu4iFlv7MiaFCHaALJEm8EwoK5L9H+21yrHQ8bY9cKoOFbHFJ40jhC+uQKEX fXcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229686; x=1768834486; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FukVwTxoJHIN3FNbcOHO2weFoJlsrxf5RmTepg8qvQg=; b=uBvPJi69LidiFvEbaxxYROQzHmxDneqTbB79BNUFNJ3uWi9JZrwgtsb6bg3Ut0vtFL FWaZOw+Q8vrWaKu6OA7KYC9gEoDkVAFzcV+VsKO8fRpZ+cOrB0wBiFFTDN3uzMgh5/fp jbXBSKEbPj8rzVsw+bqXDfWljPKyH9ARQlaW7hoGyTgLPSyUat8+eNggq3z9yMzaw/2O 1INuuyIHvHyQmTSGJ8iPz2vWTfujQu5U/FsJQ96yV79ySDO3tpUtX0Sz951BkJcJ8481 hneWb+drkVsETwCSTahcPWnD+qNwdcDZqq59+C+B4t6F/nKyncZyCsKPlDofl76DjixG vTRg== X-Gm-Message-State: AOJu0Ywzlsh/PqTOSnDL/nsxKyl6HXcwwoFX7vmq+u5nnHtshnLVYeHr i8+qtzgXT10erySMD+Oc+HCZGxJHbF4fNKJJ98s/e/ZeGJ2x73X9Tw7uElWtYeoJ X-Gm-Gg: AY/fxX7t9M8UmDCa4K1Uvb8h0LIUEkZwCmxuoXGHHoIHbDggawsg3wdxyoo30bsPzEP rXrtXnVzTLDPxEGpdNOYWk/a65qbYmjL8QqNhHhfPKeHNEnGE53Ts2cvHulml3CYgeJp/JTBuX5 2vBrHq+NykcAsV3oh4GY1Izb05XO/ZG4eWanzdi/vJjbSQJivVXcAJkl2boxiKIfGhi1f7NAwD7 nzj6XAjtjF8URw3mZMgKW8lFm39mutmdnuhnJo7MReMfMMZo7foofjtjJ+C7Wa0qBuX4Hakij8f z8Ww5NfAT2Rmc+czqkGlkqZSvZXNxWJO6kevTlu8FQqV65+B9jvCfMzlZ8f39jFDEHejRwQk3ms FG6u8XmyW97b1bl5XSqULOv89jnpQID8n3isAhDxNDkVMh2mV9hlgU4ICZunubEmPQrSfBrTi2q 9VNWb0iCPycftti3G7Aq3fvUZEI5aZ+Ns8kn108zcIQJGsI/+LXMlusqezVM4rxsQl4HRQ+rX1 X-Google-Smtp-Source: AGHT+IEyXT6Z2o39BteTzkxetNHbnp+sLXbZ+aq+UjAQcUtQp+l2biGMItp19RwvYrc73lEUdbJANA== X-Received: by 2002:a17:906:ef0d:b0:b76:bcf5:a38a with SMTP id a640c23a62f3a-b8444b8adafmr1794843066b.0.1768229685983; Mon, 12 Jan 2026 06:54:45 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 08/14] hw/sd/sdhci: Add TYPE_FSL_ESDHC_BE Date: Mon, 12 Jan 2026 15:54:12 +0100 Message-ID: <20260112145418.220506-9-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::62e; envelope-from=shentey@gmail.com; helo=mail-ej1-x62e.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768229798955158500 Content-Type: text/plain; charset="utf-8" For now, TYPE_FSL_ESDHC_BE is basically a big-endian variant of TYPE_IMX_USDHC. It will be used in the e500 machines in the next step which prevents Linux to flood the console with "mmc0: Internal clock never stabilised" messages. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 32962c210d..3eb0684a89 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -128,6 +128,8 @@ DECLARE_INSTANCE_CHECKER(SDHCIState, PCI_SDHCI, DECLARE_INSTANCE_CHECKER(SDHCIState, SYSBUS_SDHCI, TYPE_SYSBUS_SDHCI) =20 +#define TYPE_FSL_ESDHC_BE "fsl-esdhc-be" + #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 531dd3c291..6277abe870 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1871,6 +1871,32 @@ esdhc_write(void *opaque, hwaddr offset, uint64_t va= l, unsigned size) } } =20 +static const MemoryRegionOps esdhc_mmio_be_ops =3D { + .read =3D esdhc_read, + .write =3D esdhc_write, + .impl =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .valid =3D { + .min_access_size =3D 1, + .max_access_size =3D 4, + .unaligned =3D false + }, + .endianness =3D DEVICE_BIG_ENDIAN, +}; + +static void fsl_esdhc_be_init(Object *obj) +{ + SDHCIState *s =3D SYSBUS_SDHCI(obj); + DeviceState *dev =3D DEVICE(obj); + + s->io_ops =3D &esdhc_mmio_be_ops; + s->quirks =3D SDHCI_QUIRK_NO_BUSY_IRQ; + qdev_prop_set_uint8(dev, "sd-spec-version", 2); + qdev_prop_set_uint8(dev, "vendor", SDHCI_VENDOR_FSL); +} + static const MemoryRegionOps usdhc_mmio_ops =3D { .read =3D esdhc_read, .write =3D esdhc_write, @@ -1965,6 +1991,11 @@ static const TypeInfo sdhci_types[] =3D { .instance_finalize =3D sdhci_sysbus_finalize, .class_init =3D sdhci_sysbus_class_init, }, + { + .name =3D TYPE_FSL_ESDHC_BE, + .parent =3D TYPE_SYSBUS_SDHCI, + .instance_init =3D fsl_esdhc_be_init, + }, { .name =3D TYPE_IMX_USDHC, .parent =3D TYPE_SYSBUS_SDHCI, --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230414; cv=none; d=zohomail.com; s=zohoarc; b=J2wlAGMim6ADfKROUcFyEegz5p0AQTtmp5diHkQR6xo6x7ZTfzGfoqZJXJsfQuzBNxckMmWC1NU/hxYYtB16HevssX0ZB0S3G8i9Y9/p6/baZRf4u6d0Ofr9NZXO+ei+F8wM7qp3/tZDu6EC/SBMUnQ3vpq7SWQVu8TAzxHYe9w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230414; h=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=3gfNu2eoKafa2xTyp6cd5sW3VFdprV5NhfouBXm89iM=; b=mU51VzEO3WVnDKWamjHfe03FgFbKL/JNXwp1pJm6qGlAX6T/BpjucNdU5PUbA1NWTymtvyup4MIQvlSnavs1EuKUz6oK5Tm++T5xjwFigfyheFGxduSljxa6IOs4xKSpeV1V17v9SfD2azJFm1/AQUqHOI6ZR5bbqZ3jDz7uzBg= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768230414286762.2623040952219; Mon, 12 Jan 2026 07:06:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJKD-0008Qv-CP; Mon, 12 Jan 2026 09:55:21 -0500 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 ) id 1vfJJl-0007mS-4q for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:53 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJh-0001Zr-8H for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:52 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-64b9230f564so9147792a12.1 for ; Mon, 12 Jan 2026 06:54:48 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229687; x=1768834487; 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=3gfNu2eoKafa2xTyp6cd5sW3VFdprV5NhfouBXm89iM=; b=E/zjSJM/oS2PNakdyy89VuZet8g9kqDDElUqwiQeM6hvWPofTKWmc69de2D+pMV92k hCqjBqukwcG5WEPtqcGzbdfiu83zYvJRNDAHvmu3yBVxQaWELOpkssBgTTunONocQiJ6 yZufXcnjntKbG2GBeZw0UNyAW5OLnmgTxfHvHxborUYshhvvnliBsZLBXsStxrKg3HgY 5v24ppISyOxBLPdA22b6PyzyMjjGIOHKIo+JuIOWwdf49T1b2xtjV7egLC4NlNVauvcB pR9dwmZN0I9I/bil0kcdCfbMM6Tz18w/lBrOAH+q9SIBS3+WVyg8m8S4Cns89J0r5YNR ZI6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229687; x=1768834487; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3gfNu2eoKafa2xTyp6cd5sW3VFdprV5NhfouBXm89iM=; b=P9kHOvZR+w6DiPm2UYyU9sYvf2phIIlw+xfyxTRmr1fM4yJjya712hLNapNz7+AJ3L 6h2RBcpEp61xGk2Gx+LIWWEJww8GOys+GAvbl4uuef1mRU5pRpRKQns5ZmY6yZ8jTGsE aEVThKBLoRDHIuPD0N7C0sUxoB3dMPj9PjhchKcqq0qmxBFjWViwuJWUgCdZV0zERTdf MKNplqvN3fH4+TKAYBvMCs8kXwObYcGE9OTFl+yNmJrwpfX5pOMaXJOT7BYfVpK5e/LS snd/2lEKisQRrpZ4Q1Q6N9kLoikamVeCEVd/WZLVwnw/tnepMc4Wgng4w9j7k60zTq7t YnaA== X-Gm-Message-State: AOJu0YxrYI4YsKBKFdkUEp9oNQ1PNTGdLc0g8qJZGY6uiUSChe2SOPlI RQ9SnkbERoEpAKufdzARu5+/lB+bbqbaBBi8cqO4k6SBUyHAm8eQmDo7dibrtXJl X-Gm-Gg: AY/fxX6YxFj2ug8UwBlvZYrOXqE1sTkGfr59woNasJdb/IevdbXbRVkqqFgtfbOB+BY Hs+/JLPOWZSM7qnl+CWHcegGJNkCphRKyf5S/c+AUJct33oFXzUQC4oemI15Jmg2zo2L+Ji3JQ3 iXCFGWdMzdzHoHJmc8Emptt3ZlP6GE3Gb7E/l909XVq8Od1fVPtYAZGFZXWiHaCZVKUN69sKuDm AYkcOewl43MFc/HPmvtu44wdCFQHMqm8TMp0EI/cly3ESm5KnVPoX39CVuDuMh4XUhEMlt8bwJK QPcoLCwb+Q3IG7G3UL/tIL8OAPm4kn164fViJmAP0H3eas2kLziMq+7ayP8Q0GSSOlk0mGAHm/1 iJelj3Sl5FMCTJeAESUKkQCzu0N54hTNett6vo25ZmlKkeAJUcmNE7HbzfEQdFkgPe1OikqDek+ VriOPiF7mCZfwCzV4s5B4wKPy3PB0sZskA1nIgAeXOvTyJ2Sf9t/rcrMo+B0VE9mD47sZVSq9T X-Google-Smtp-Source: AGHT+IFMIamXqw+EdfYyEpkguAEuYIlm9cWOuuK8QI923kT+LufonieaG7Q2PHX051hmXg91Mi2TVw== X-Received: by 2002:a17:906:ef0c:b0:b83:246c:c514 with SMTP id a640c23a62f3a-b8444fce93fmr1824040566b.51.1768229687024; Mon, 12 Jan 2026 06:54:47 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 09/14] hw/ppc/e500: Use TYPE_FSL_ESDHC_BE Date: Mon, 12 Jan 2026 15:54:13 +0100 Message-ID: <20260112145418.220506-10-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::533; envelope-from=shentey@gmail.com; helo=mail-ed1-x533.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230415076158500 Content-Type: text/plain; charset="utf-8" TYPE_FSL_ESDHC_BE maches real hardware more closely by reusing code of TYPE_IMX_USDHC. For example, it fixes Linux to flood the guest console with "mmc0: Internal clock never stabilised" messages in the QEMU advent calendar 2018 day 19 image. Reported-by: Thomas Huth Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/ppc/e500.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index eb0d3a418e..d6ca2e8563 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1036,15 +1036,7 @@ void ppce500_init(MachineState *machine) memory_region_add_subregion(ccsr_addr_space, MPC85XX_ESDHC_REGS_OF= FSET, sysbus_mmio_get_region(s, 0)); =20 - /* - * Compatible with: - * - SD Host Controller Specification Version 2.0 Part A2 - * (See MPC8569E Reference Manual) - */ - dev =3D qdev_new(TYPE_SYSBUS_SDHCI); - qdev_prop_set_uint8(dev, "sd-spec-version", 2); - qdev_prop_set_uint8(dev, "endianness", DEVICE_BIG_ENDIAN); - qdev_prop_set_uint8(dev, "vendor", SDHCI_VENDOR_FSL); + dev =3D qdev_new(TYPE_FSL_ESDHC_BE); 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.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230397; cv=none; d=zohomail.com; s=zohoarc; b=mBgqqHgku2CwqxS9Oo2ItXBQ6RCMp1OaX5D984FlEP2po1HPBP6eOk8ja2hP5pqyq/e4w3yedcYdeF3eT+oLdacU38lI1gWKDzM4zC6sqQajOwtNlgz3Q6UYsUKdShqXpmuHRZF8kD5N139XCMG/wLny9dX87gs7wDsEWwxLWeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230397; h=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=u7oIuXS4LVRn8XUCBjKf1n6RhnUu4CtgkIdX5fQX0Q0=; b=fUnArK7n3IWJhssQsJJ7lKNTf30WT9Rz1YMcs2lBOdHyjzU/e+DSqGBzYGqh4SqHcz+jFc0+rrqL2lX9+Fote2BgQ33YjYIx4QtXJfQgAuk+TyInsK4wYay+sPCJIEJHMYAlqiwODZFllyPV6jlMDviUHLtN2Bx8Mb9Dk62H/Ag= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768230397025885.316226334803; Mon, 12 Jan 2026 07:06:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJKA-0008CC-Qy; Mon, 12 Jan 2026 09:55:18 -0500 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 ) id 1vfJJn-0007op-4W for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:55 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJi-0001at-7X for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:54 -0500 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-b8706ce18c0so240525466b.2 for ; Mon, 12 Jan 2026 06:54:49 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229688; x=1768834488; 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=u7oIuXS4LVRn8XUCBjKf1n6RhnUu4CtgkIdX5fQX0Q0=; b=DH3WAl9HkejOKFyX4/LEaGBICAskq7ozlLf81fwCIxtJJI2aG5c0Dz2cP3Ch/hOX/5 Az56Nk58zaHVzxIwwDXBj4UDqFxWYOYLW8J4YN/A/lbLUaji3vfC0LV/x05K25hXuTNo Vw15FkA3ieLzUn0YHGX/svTSlNIu/1jLlvVQjYOcVPKX1y8go/VzPXZur2NQEA6j5fM0 G+epVNRwQHP7wHa3//nENctmi6SzeFr3xYbz3eVPAFsPZdJtarM6v17zuRyzR6iJV/EB VZLMufMNd3oONM8stvePdmMxSIvzLNRjMnI0unuNbu4lTfTvPRMRLlGiC4QvSED/x00v cikA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229688; x=1768834488; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=u7oIuXS4LVRn8XUCBjKf1n6RhnUu4CtgkIdX5fQX0Q0=; b=ajtALq07gkog5xZgzSIha+1fwYV5CijCYUlV9BhZ0UJer4SIlhNGjefU2nOl5o1AEX t3gLUqykT/RNaPeXSWa7Um2hiTAOEBA4irBmcSeTX/f8oGPUE+4Jt77+i53MlUji/rZg leFiGdtl1iVqRdsX3IODq2BfdUufJKAGQVvCBfZRLUFyJzOkNaPheLqFF4SDbzH4n87V Fw+DWvrS3Aa9IR1t9JNJtM8zuwszeSKlriLz5tafgw38NMwoT1X8jKgT7K7kOCdlcfVj 4pri+UFzepans4XgGCLOJXj+tCv5s/zIg8T4PuuvXq2dPJqd6AEvHPkt8t3T3e2IL6mF 5Czg== X-Gm-Message-State: AOJu0Yy437uEeOaB/FwSjXnky73MVuOG3QesbSBhJsVj0EdXX7RkO4o3 9xhjNgTSx/icoLsMMwGXJ1RMSoXyU8DzSy/palI7iu6lxRothflPgUqmpPCKtKIq X-Gm-Gg: AY/fxX4DtPQLCiqwxQx2AK0gfP2Wt0v3v8aVdU2zAREn19qIUaCKXBEKioc8Srr+pRM 4qHyzunivTiXMV7ZOydBJvgZKHeQ7oxnvtVsWcEcS1mqlpmDWpN5sbWY/oT2kQV2JzZdBAvDfRS pJxon1OX9CCwpKwI9qLJuV64eLm04tx81hBryx74rDOjP6sMFlq4yyKAhFcKeKNEs0KwfhXLPxK 7NWV2yYaSFl+KAF3+sRIXvDKyXuqQ3ICvGyq9bRQ+ErSI5xfeF+5Qps/OJ1F7TTxAIj7D0DcHCi TeNYpviZh+nK2oSwNg3C+tSyMtt/gM7ynBmoQ22DxTYublbz7Zi0N5SFlCHQha2ATqc2ivGCcja 2Ovcr9yh3CtN9oSNXckJEKdbI8QxIIHX+ivR9ZtFYNP6MQpISL8BjGSlky6oNFeZLtuijw8j6Vf LJcZLY2CjbLT71H5LiMrMMVNQ3GDssQa+ujx3AHhWRU4TmnKdWdGgeRF6OHKmRujvji8r836dB X-Google-Smtp-Source: AGHT+IFOIJDr5Eb3sa5kxgWEv8nmZXnfhSC9ttRBIEnYs5YB6D2mH8Ba87XF6LE7ImxjgtgJpfdpWQ== X-Received: by 2002:a17:907:26c7:b0:b73:a2ce:540f with SMTP id a640c23a62f3a-b8444c80f04mr1758154366b.17.1768229688025; Mon, 12 Jan 2026 06:54:48 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 10/14] hw/arm/fsl-imx25: Extract TYPE_FSL_ESDHC_LE Date: Mon, 12 Jan 2026 15:54:14 +0100 Message-ID: <20260112145418.220506-11-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::629; envelope-from=shentey@gmail.com; helo=mail-ej1-x629.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230399063158500 Content-Type: text/plain; charset="utf-8" Extract an eSDHC (little endian) device model since the uSDHC device model will get an uSDHC-specific MMIO quirk. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- include/hw/sd/sdhci.h | 1 + hw/arm/fsl-imx25.c | 7 ++----- hw/sd/sdhci.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 3eb0684a89..32c52c7d0b 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -129,6 +129,7 @@ DECLARE_INSTANCE_CHECKER(SDHCIState, SYSBUS_SDHCI, TYPE_SYSBUS_SDHCI) =20 #define TYPE_FSL_ESDHC_BE "fsl-esdhc-be" +#define TYPE_FSL_ESDHC_LE "fsl-esdhc-le" =20 #define TYPE_IMX_USDHC "imx-usdhc" =20 diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 9e02063533..7f65f4ca4b 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -68,7 +68,8 @@ static void fsl_imx25_init(Object *obj) } =20 for (i =3D 0; i < FSL_IMX25_NUM_ESDHCS; i++) { - object_initialize_child(obj, "sdhc[*]", &s->esdhc[i], TYPE_IMX_USD= HC); + object_initialize_child(obj, "sdhc[*]", &s->esdhc[i], + TYPE_FSL_ESDHC_LE); } =20 for (i =3D 0; i < FSL_IMX25_NUM_USBS; i++) { @@ -239,12 +240,8 @@ static void fsl_imx25_realize(DeviceState *dev, Error = **errp) { FSL_IMX25_ESDHC2_ADDR, FSL_IMX25_ESDHC2_IRQ }, }; =20 - object_property_set_uint(OBJECT(&s->esdhc[i]), "sd-spec-version", = 2, - &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_FSL, &error_abort); if (!sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), errp)) { return; } diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 6277abe870..6001b71c61 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1897,6 +1897,32 @@ static void fsl_esdhc_be_init(Object *obj) qdev_prop_set_uint8(dev, "vendor", SDHCI_VENDOR_FSL); } =20 +static const MemoryRegionOps esdhc_mmio_le_ops =3D { + .read =3D esdhc_read, + .write =3D esdhc_write, + .impl =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .valid =3D { + .min_access_size =3D 1, + .max_access_size =3D 4, + .unaligned =3D false + }, + .endianness =3D DEVICE_LITTLE_ENDIAN, +}; + +static void fsl_esdhc_le_init(Object *obj) +{ + SDHCIState *s =3D SYSBUS_SDHCI(obj); + DeviceState *dev =3D DEVICE(obj); + + s->io_ops =3D &esdhc_mmio_le_ops; + s->quirks =3D SDHCI_QUIRK_NO_BUSY_IRQ; + qdev_prop_set_uint8(dev, "sd-spec-version", 2); + qdev_prop_set_uint8(dev, "vendor", SDHCI_VENDOR_FSL); +} + static const MemoryRegionOps usdhc_mmio_ops =3D { .read =3D esdhc_read, .write =3D esdhc_write, @@ -1996,6 +2022,11 @@ static const TypeInfo sdhci_types[] =3D { .parent =3D TYPE_SYSBUS_SDHCI, .instance_init =3D fsl_esdhc_be_init, }, + { + .name =3D TYPE_FSL_ESDHC_LE, + .parent =3D TYPE_SYSBUS_SDHCI, + .instance_init =3D fsl_esdhc_le_init, + }, { .name =3D TYPE_IMX_USDHC, .parent =3D TYPE_SYSBUS_SDHCI, --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230347; cv=none; d=zohomail.com; s=zohoarc; b=czOSXS6A8otDQfb0WlZuMewCvw7E03UHi+JwCLq0+KPb0Gij647oXw3XM/ucIhPutgWUU7rpXbj67syChz1tSF6XCSHRUz1rQJuBRYveKfMSZgn5S72sbLUFnXr8POqmBoFwWYkBBS2Vn+ZTVkIyPYnBYFaFublGettPyf2T920= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230347; h=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=GFkaOn9dkeddhVGvavU/6xkr3hsrAucosLysslgaXmA=; b=BK+6ez3TKDmCT0kHYShb2SrbSTSrz41iOITea9OiHKoXhi7Z9RRSgflowS0Qbr66YFweW48nZsnAr158QnwOuWw7k1et8WheSyPz99NGXj+wo1tdbJzJNxo2lU0vedJ5B1jGwZej1Hoqy/PxC/koBrqJ6y73Qq1uSiAA8gK1sl8= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768230347182139.6438045137885; Mon, 12 Jan 2026 07:05:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJKE-0008U9-4q; Mon, 12 Jan 2026 09:55:22 -0500 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 ) id 1vfJJo-0007pr-GW for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:57 -0500 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJj-0001bf-70 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:56 -0500 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-b87018f11e3so243032466b.0 for ; Mon, 12 Jan 2026 06:54:50 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229689; x=1768834489; 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=GFkaOn9dkeddhVGvavU/6xkr3hsrAucosLysslgaXmA=; b=AfOEoh23YVs6qWR2aBf6Ose5sIv5jjUcxgg/IiRk/IqarXsPmSpVgxCergbBZP9yDr d0eqNQTZx46G1DOKalOwAAKButCYL1o8TTsNqCl/4L8rNBmqPdt3U0SXCtFR5YUGuSCF 70Qy/PkYJKAsxC1lOpNuGWIf6C5ns8w1A1aC23JEawaJdoAdF3SR2nYHVyGO9DPvn9L2 Vhs/IxrwKcdLq2OhuQDs7OnvVA/pDuZTXcK68atYHAZbP2fBUIzAxibG0Go9pnr49ma8 wO6w4JS5ZZtgfISOfL5my97yhDSCflOFh+2sq/3iDZ2rMi7GiqUA3IbKBe8EQs4YMjDY dqFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229689; x=1768834489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GFkaOn9dkeddhVGvavU/6xkr3hsrAucosLysslgaXmA=; b=kWdBJVWOO4C17zV95Jlw/GsXWzPNTngLSZ7M5CzERwb/NHZPki/4IW/3zdAOUfzqjQ 3/I1W/jIXOOe2ftof3N4xUV9W9erAaWJXzJffg3LaRgNUSdkX60gz+atG3pC0/9ohW5q zDFq7X/qLT7NDXhaVBfuJ+UdQwXKe21y0UeYEaJ57M6YzIwTBsQASx+l1zRBRfasb2An q2k7z0YDsMiVe9Aep79327CpO+u+RATFnPkHb54crDtOwBeV4Ttfkbl/8DdarO2fPm5A ItQiun/f+npDcAOjAnOH3rsIQnPV7KNh2Pq5P8POAuRgUnyF45UQB88prHMDh8Z+3k7v D9LQ== X-Gm-Message-State: AOJu0YxNEBbI4A88Yi46yWG/+O8PeNVS0k2gKHpabFK9Sa9z31Sf5oHw QSjtEyxW3FkuMjrM2YQ6YIs4IuS4D78oDsA5m7KkvVCLP4kTrxLpnMxpbPDq66Kc X-Gm-Gg: AY/fxX6dDbATY2iQeP9NCeU4OEfzbG9Tc4CUDhusYLqMbgzN+IBX28w2DZlsS5rnQDa hLzejKnrej3xN/vzkiLYDYb/iwycvc/zEKnalUrhtP5kdhuszzWvwenc7ClagSaEcI+eT6fzE0j G8+Brv/P3Jb9+QPdnLpfDenXSSq1NFEQkrNxZhZa0qao9G1ImaQWlU0+LagE/bofODNqOfpeAo6 UhbyCAFTZ1MVUXfrGYqhCh1YnuD6hmDB/kTQyke18DaVa9PSrHVDSfWz/WdjRFwMw8PL+NaBXNW qcsQgIU8PKJi3+T869+JCqRwYwUbTy4z/nuXFjG8zmAdvUtDgwlR+AzxEAcxi5S1czu4BGn1rEq 6fSrUbOpCGEWJgUak+frgH771RY2Cr0Zc+HmWfwm+TInSzREAIcAiLi+IT8zY2iXQFJj+vU9bgT R+1fA1gjfZWo0xf2dDeKUHtR6KvfhneqnuEKrIkzwfWRQlmmzDgiGnEOIAtauKxW4PYWo+xXtXa h3tcKlhCiE= X-Google-Smtp-Source: AGHT+IGCum0tVd4xocmLeXxuZ3Rri5vYo8Gsw8H+xQMZt1UgOGNrgSm0BX0/t5mTEEnrAalkCGJ9pg== X-Received: by 2002:a17:907:1b08:b0:b73:6e0d:4f6b with SMTP id a640c23a62f3a-b8444f4aa3fmr1796213066b.36.1768229689132; Mon, 12 Jan 2026 06:54:49 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 11/14] hw/sd/sdhci: Remove endianness property Date: Mon, 12 Jan 2026 15:54:15 +0100 Message-ID: <20260112145418.220506-12-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::62f; envelope-from=shentey@gmail.com; helo=mail-ej1-x62f.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230348660158500 Content-Type: text/plain; charset="utf-8" The endianness property was only explicitly set in the e500 machine which now instantiates TYPE_FSL_ESDHC_BE. The property could also not be used meaningfully in a hypothetical, common TYPE_FSL_ESDHC device model since sdhci_common_realize() would fail in that case or it would need to know all MMIO implementations upfront. Remove the property in favor of dedicated device models. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/sd/sdhci-internal.h | 1 - include/hw/sd/sdhci.h | 1 - hw/sd/sdhci.c | 35 ++--------------------------------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index f24532eed2..50fb746a17 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -307,7 +307,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), \ DEFINE_PROP_UINT8("vendor", _state, vendor, SDHCI_VENDOR_NONE), \ diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 32c52c7d0b..51551348cf 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -96,7 +96,6 @@ struct SDHCIState { /* Configurable properties */ bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ uint32_t quirks; - uint8_t endianness; uint8_t sd_spec_version; uint8_t uhs_mode; uint8_t vendor; /* For vendor specific functionality */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 6001b71c61..eab814096d 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1374,7 +1374,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) value >> shift, value >> shift); } =20 -static const MemoryRegionOps sdhci_mmio_le_ops =3D { +static const MemoryRegionOps sdhci_mmio_ops =3D { .read =3D sdhci_read, .write =3D sdhci_write, .valid =3D { @@ -1385,21 +1385,6 @@ static const MemoryRegionOps sdhci_mmio_le_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 -static const MemoryRegionOps sdhci_mmio_be_ops =3D { - .read =3D sdhci_read, - .write =3D sdhci_write, - .impl =3D { - .min_access_size =3D 4, - .max_access_size =3D 4, - }, - .valid =3D { - .min_access_size =3D 1, - .max_access_size =3D 4, - .unaligned =3D false - }, - .endianness =3D DEVICE_BIG_ENDIAN, -}; - static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) { ERRP_GUARD(); @@ -1430,7 +1415,7 @@ void sdhci_initfn(SDHCIState *s) s->transfer_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer, s); =20 - s->io_ops =3D &sdhci_mmio_le_ops; + s->io_ops =3D &sdhci_mmio_ops; } =20 void sdhci_uninitfn(SDHCIState *s) @@ -1446,22 +1431,6 @@ void sdhci_common_realize(SDHCIState *s, Error **err= p) { ERRP_GUARD(); =20 - 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; --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230415; cv=none; d=zohomail.com; s=zohoarc; b=eHQ3bgezpzcFnHuzGAJw6nGoO0AJY/MCLyW3Ai1vMJEcsieDjNicTCq+6MKviTbnA799M9dISMxQ2SGrgWkpbLg01cWxKw70ldUMPMwCkV+sTM9Xbryx39VYN5MZZ/aec1g9rGzKkRybk78IF5IzdeIWIE1AEZp/jQGIqmSrvPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230415; h=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=BaTAsRHnOdECfannlW8tUPW9PoxsrFLrXmi2zEMp9G8=; b=QmBxPS2al1LoMsaU5pLHtS7Yx2Q4pB2AQMoHmRVULgYlWQYssYakkoY1ZlcPMtoFpUR4RASUEOEoUTffCqyxoBb66dhgp6RRiEVT6nM3f4y3EUdX9FlR9xfTo4exNAYt2+96uvpyytEIab++mPsrB9p5D+2MXjicoaok72b21VA= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768230415348523.0906732102497; Mon, 12 Jan 2026 07:06:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJKE-0008VK-Nj; Mon, 12 Jan 2026 09:55:22 -0500 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 ) id 1vfJJp-0007px-Dg for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:57 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJj-0001cC-VG for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:57 -0500 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-b86f81d8051so292067666b.1 for ; Mon, 12 Jan 2026 06:54:51 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229690; x=1768834490; 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=BaTAsRHnOdECfannlW8tUPW9PoxsrFLrXmi2zEMp9G8=; b=MTQ/2uSc5O9PXCLhD/gtb0LZ8iBdIOX7gECSII7u5tE0k7ai5HnR6pWvnRXENI/sUq rYA+xewxih7k+8yQcM2oxt03rayu0lYVo5Akb3mAk14Souxu+yY2u0tDRZQ4sjTnqGFQ HVs+77+Xh9Oj7dqbw17fQEhwyQmLZnsgZBiXq4VdGBwEpQeSqLYiulWQDAhA1+Qwiqd7 T+6QkJeSHpGv9TyIfEOtME6X/Ks+pySwpO2sVZeaoxzOOH5fHipgjx9XeTC8XoGlW5ho 1QGdQFlmvqudpQX00ae/lSaqbU4RVvaq7U5DdkjQj1Vj+69PsqCWnXEp82tXUj+zRH4s GSWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229690; x=1768834490; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BaTAsRHnOdECfannlW8tUPW9PoxsrFLrXmi2zEMp9G8=; b=TqmZ6xSXtSPSq0doZGMUGKGMHumfrnfJH1anwMy7f1GuIJFPqZi4pl1IIzgXmZqIJN aogsaAfOCvD0STQKjfY388iXxNbrQPCtwsLJivUbH5f4+/faNI98S9VPyj+IfhEuzYQ2 DC54dNeKm8i8BCjUQBZiGUdmKF5mcsRG6p4RCNr5BX+y7zPOjyQFRTvux7zf66avVLmR qCbqtHmFl+dLVA9QEBJeWtuMcPZzQhTCUJizSnsHjF01uHYHPFw2OjXmOtLHY/InS+Bh beBwnaw7I8WbZhhmzGtNTX29JyAj9PRmB5fi6ccZF8TO75mOcq9K4YP8aXMz5jAm+6eX OwEQ== X-Gm-Message-State: AOJu0YxCPQFJMCMD14uhmkvn/GbL4k9gBXV9Mrp5EnAp1ZgLKcHuk6a3 Fj8JC41/zex5qWltxBi0ICsSexOmGIujom9SSoUdms9EKxFYluls+jiWao/u7Xnt X-Gm-Gg: AY/fxX5PPBpZZOV1/SdqHX7of6FM+l9o776aAzbTaUHVmxHoxFatW9s9irjHE7RKI95 J6/JpALewa8HjR1dAnV9e+d7V5ZaGZ9Kr8DxBAFA2itrKa0zG8OdU4fmoZskjibtYovRXbdiyIx rWbizfcp+fzbSv0GcuSmiLY+hOMt6Q2uD3oxwgdN8WjqTZuz63eW1d0k5VsKSps/3WLo8YSdfOk I16tT0U3xSOTxQnMTY/j/R3FOfA8At95jMvfs9I/CeAgZTlELkhqjmLWMvZemmvfUTkA0uzOwPY hc7mxCFx4bDOXfUdOXUUv7ngPRo9dKzxiEn+AFlsE9JuaKjFbGwnKXf6OQmhazuF88kb7ZT+S1q g/GC2TDFzIb4+5YS3+uY0ShByQ7c0sgJ+hsh2TTh3yqFJAogGd3NLGq6jrkJknZuE+fcSSumkq5 dpuMzyIh2WELd0TxJzbVsMnXRXL5VgwCJySzlo2E0w+e5sPb6DjVuGjfpbOwBruQ38PEarhoZa X-Google-Smtp-Source: AGHT+IEz8v3qcfC80squY01h4UmdnPHp3L38lnKYF+Tv3/pLx9Cjve+BGkNsM/QhYpadj5iIGsRm/Q== X-Received: by 2002:a17:907:3d11:b0:b80:3fb7:8e68 with SMTP id a640c23a62f3a-b84299be630mr2295540766b.21.1768229690028; Mon, 12 Jan 2026 06:54:50 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 12/14] hw/sd/sdhci: Add uSDHC-specific quirk Date: Mon, 12 Jan 2026 15:54:16 +0100 Message-ID: <20260112145418.220506-13-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::629; envelope-from=shentey@gmail.com; helo=mail-ej1-x629.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230417003158500 Content-Type: text/plain; charset="utf-8" This quirk is required for imx8mp-evk to boot via u-boot successfully. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/sd/sdhci.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index eab814096d..3b0a26ef53 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1892,9 +1892,33 @@ static void fsl_esdhc_le_init(Object *obj) qdev_prop_set_uint8(dev, "vendor", SDHCI_VENDOR_FSL); } =20 +static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) +{ + if (offset =3D=3D SDHC_CLKCON) { + /* we force the reset value of the lower nibble since QEMU alters = it */ + return esdhc_read(opaque, offset, size) | 0xf; + } + + return esdhc_read(opaque, offset, size); +} + +static void usdhc_write(void *opaque, hwaddr offset, uint64_t val, + unsigned size) +{ + if (offset =3D=3D SDHC_CLKCON) { + if ((val & 0xf) !=3D 1) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: SYS_CTRL[3..0] shall always be written as 0= xf", + DEVICE(opaque)->canonical_path); + } + } + + esdhc_write(opaque, offset, val, size); +} + static const MemoryRegionOps usdhc_mmio_ops =3D { - .read =3D esdhc_read, - .write =3D esdhc_write, + .read =3D usdhc_read, + .write =3D usdhc_write, .valid =3D { .min_access_size =3D 1, .max_access_size =3D 4, --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768230396; cv=none; d=zohomail.com; s=zohoarc; b=FuY4N4T66RgpsFmbx+CDjGXvbJ0SO79nhlKaJmn+yeLIdSbiw0mh+1Fr94f0AiXdiA6qzLbTZdr9zKOHf+iVFjz9CDRabE8eJ4jr9NN2Be+aIWfMFjAtp7l01QG5g9MSiC/Vo6m7KJn7rtiYeParJSAHjWtjwcNj4p9MgkWYHOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768230396; h=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=8gA+Ri6T2SgxvAr0I5jL2NjeYKgeXs1ivfULeQGhHhE=; b=kgFRJI6d/v4x4v+OuG362hvBFjBDJREVHFBYeNbh7/oW8V1rjylj3/3ky2s2tBVi7js387/mD1d24JQSlx0pLc5BwCGUYY3Dl6OER067OsWlbHMjqadowHk3tosU+xJm84bTWFTywOPXCcCxufmouoDRRe0HtRrro7F+kwcuDMc= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176823039652352.88078143879795; Mon, 12 Jan 2026 07:06:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJKE-0008Tt-2D; Mon, 12 Jan 2026 09:55:22 -0500 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 ) id 1vfJJq-0007qD-6U for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:55:00 -0500 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJl-0001ct-Dv for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:57 -0500 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-b7cf4a975d2so1070155366b.2 for ; Mon, 12 Jan 2026 06:54:53 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229691; x=1768834491; 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=8gA+Ri6T2SgxvAr0I5jL2NjeYKgeXs1ivfULeQGhHhE=; b=TDt+2T9NCw7x0I44XfJz+JKR/kSiOAhnphEj3R7DTbAN1J2FaHVsddPtMC0lElY6dy 6Oi0994laFKz+ZT3Jwy1H6S/5J2V9Bk3qA3KAVi2dxntqojdMqUnuebVIZXDB0KM45gk qZ86wV6H6RcUguxJmLsSOlea8ZmIkraIHwgTojY1wQe21i3/OhvHpVt5BivCAHjHrT0q p/C+bwDYB3VCaGzsvowjr6nEQoy6OSgdXY6c/eGmopzQGcYWy4BvW55JGfeeecuc/9ko vypl9z95jqU3KF/idIdjKghZmIYjJ3LvfJGrjwwltehjX52m8vQZKBQZzwHSkzbCvS6o FeyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229691; x=1768834491; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8gA+Ri6T2SgxvAr0I5jL2NjeYKgeXs1ivfULeQGhHhE=; b=fyIHIW3Jwosp8Bt7/PYKgrI/p2AoVd8EF98dLX0MZzSWVX7cl9dKYAnJ/R1WS9Bbmo Ls6k1eY9wOyhJO86ymd6qVb+owtOBHN1OzHoHcdIVnGIoyyuaKnR6NPngpxSHZqD3MLA 39bKwUrAEV7G20Le7RJCbD+bV9hYRv1j9Ymkl1ReJFG6tVmlRbj3nWzjq1U43RwQXMil 5NNIWGtpWhEA3dpuRjqLzlLFME6KEyxNfcLseGi03VM6UBssDYcJdVNVg6TytcKgECO3 s/8rNtQlRxnZzdE3stVM1iIENzsipjeQvTA+f+SK2j4gf3QNNSFYtlb1gYj6dqIggWrl opdg== X-Gm-Message-State: AOJu0YyTvqiJGPjxWN1d4vr80L1OB3VGA4gXfUucg3ekuvDuqG7bGJNG JAnf+0Q5hUpX6y514j5oPf+Xwv2vbYdQswCf1+wNa94KGoQysocG3yk21bGlobtd X-Gm-Gg: AY/fxX6PuBrLlaVw8G6loOgmAeiDe1GmW0l13IRS/HYed/5DQGUYPk5mA1I5+3pSHxT Kc8lpM6PqsM21X1zonRCmeZ42XPNg6d4bOYcwWkuNWpOCYcFKoNHOEkfhA/0an0SeufukjdfGI3 zSPEOR2x7lnFRf/21va+xXFQGs03zmaNzEYHPj1hZ/gpcdoG4wRbrZszraF9y+MGgzt29HHsqNW AgL91GFTxc0Egt8YpTbSc30Q0dGa3kDZ2xjRk0Us4GagD2wUDCeMccHvoNut54RIrvaU2OAbGQO uUsg8Y+bf7DyQ6AOvZeeh7/vtYXOsOJbMiiTytyNTjD2qAtsbXgy/HRtL/1rMAYyqGmbiRo9XmE lhWlJ5Lrc4VKn5u7O6NNg1qNgDiRa/UM7i7SwztjWxTt98dYqZ7NJXzfM7oYsCGhIknYAfKbBn7 Q5+tKdQVpl3mDQw0Gh50Cs1bPwPwKZwpea0hBaaSDfrHX95/XGDBQUd27lnjTdOetBrPnAgmsa X-Google-Smtp-Source: AGHT+IFWywqkm7qft/zv4Zb5OGV+Kmwvx4nKdLfZGkdQFZZdeennuy3wXrtENGgF0mcISnafMb4Mwg== X-Received: by 2002:a17:907:6090:b0:b87:2d79:61c with SMTP id a640c23a62f3a-b872d7908a9mr129565666b.8.1768229691093; Mon, 12 Jan 2026 06:54:51 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 13/14] hw/sd/sdhci: Remove vendor property Date: Mon, 12 Jan 2026 15:54:17 +0100 Message-ID: <20260112145418.220506-14-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::630; envelope-from=shentey@gmail.com; helo=mail-ej1-x630.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768230423611158501 Content-Type: text/plain; charset="utf-8" Now that there are dedicated eSDHC device models it is possible to replace the "vendor" property (which is really a device-specific property) with a dynamic cast, "fishing" out only the device models which shall have the quirk applied. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/sd/sdhci-internal.h | 1 - include/hw/sd/sdhci.h | 4 ---- hw/sd/sdhci.c | 5 ++--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 50fb746a17..4aeed120bf 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -309,7 +309,6 @@ extern const VMStateDescription sdhci_vmstate; #define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ 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 51551348cf..a9da6203fc 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -98,7 +98,6 @@ struct SDHCIState { uint32_t quirks; 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. @@ -107,9 +106,6 @@ struct SDHCIState { }; typedef struct SDHCIState SDHCIState; =20 -#define SDHCI_VENDOR_NONE 0 -#define SDHCI_VENDOR_FSL 2 - /* * Controller does not provide transfer-complete interrupt when not * busy. diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 3b0a26ef53..d7640b3789 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -307,7 +307,8 @@ static void sdhci_reset(SDHCIState *s) s->data_count =3D 0; s->stopped_state =3D sdhc_not_stopped; s->pending_insert_state =3D false; - if (s->vendor =3D=3D SDHCI_VENDOR_FSL) { + if (object_dynamic_cast(OBJECT(s), TYPE_FSL_ESDHC_BE) || + object_dynamic_cast(OBJECT(s), TYPE_FSL_ESDHC_LE)) { s->norintstsen =3D 0x013f; s->errintstsen =3D 0x117f; } @@ -1863,7 +1864,6 @@ static void fsl_esdhc_be_init(Object *obj) s->io_ops =3D &esdhc_mmio_be_ops; s->quirks =3D SDHCI_QUIRK_NO_BUSY_IRQ; qdev_prop_set_uint8(dev, "sd-spec-version", 2); - qdev_prop_set_uint8(dev, "vendor", SDHCI_VENDOR_FSL); } =20 static const MemoryRegionOps esdhc_mmio_le_ops =3D { @@ -1889,7 +1889,6 @@ static void fsl_esdhc_le_init(Object *obj) s->io_ops =3D &esdhc_mmio_le_ops; s->quirks =3D SDHCI_QUIRK_NO_BUSY_IRQ; qdev_prop_set_uint8(dev, "sd-spec-version", 2); - qdev_prop_set_uint8(dev, "vendor", SDHCI_VENDOR_FSL); } =20 static uint64_t usdhc_read(void *opaque, hwaddr offset, unsigned size) --=20 2.52.0 From nobody Mon Feb 9 17:07:46 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768229862; cv=none; d=zohomail.com; s=zohoarc; b=HRKfpA081suOwyWQu0an+8tVXU0jK4Yjp861fal5SyfTuI+wQYj6zrkGmsvesKxxgyyuitDn97pI0hRY299BGciusyMzsnQKoFIs0xWrS9ubIS0j/ascKjLpkyCUxk7pLrYMpMKxxh1xlEpxVJ9RpFYjqtGvJL+DW0D+gQ1dFuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768229862; h=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=vae9tFKipWcRHp6Pwi3fV7Q94asRnHBvfdec3wvV7X0=; b=C9wQaLa73tC3plAGYAAygB/JneSlU00y2lXPd17o0205AAOHhjpDT66Soggh38iSSsMd2279chH1fvlpYGmmVpHBRDUFdK5XdpfkmsSMpyxKsDQe3l0fidcxtFNR/bK/YbcyjjJPex8PSZyCDguzH1KgDUgoGLnyKyVXAOY1GjE= 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= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768229862857126.13237114510275; Mon, 12 Jan 2026 06:57:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfJKC-0008LH-Bw; Mon, 12 Jan 2026 09:55:20 -0500 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 ) id 1vfJJr-0007qp-79 for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:55:01 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vfJJl-0001dP-Sm for qemu-devel@nongnu.org; Mon, 12 Jan 2026 09:54:58 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-65089cebdb4so8640663a12.0 for ; Mon, 12 Jan 2026 06:54:53 -0800 (PST) Received: from archlinux (dynamic-077-188-226-222.77.188.pool.telefonica.de. [77.188.226.222]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b8731f0718asm37387966b.67.2026.01.12.06.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jan 2026 06:54:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768229692; x=1768834492; 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=vae9tFKipWcRHp6Pwi3fV7Q94asRnHBvfdec3wvV7X0=; b=VSLnl5zWu8g0+7bqphvX/i8TFE3e8n0Xh91Hrz1SRYL5m0Z1LIyN7MdLusBTB0sllW jnNgKVzGamopC/BXzPvkiKO5YoGzUV3yZDUyeLPjhjl9dUF8vHN8absKh8cmlT2uRV2I tfGZjgy0pvMplacU/jNxEzKpPJ9hvT+dVEv8/yMNofHobUEhOCgJ7oJ5l3BRwBtpw1my yDZmOpmIZP9jad89EOietJE2HMRLZlMG10ISTn/jQldHJIcX2ycD97G6bfVCFQo29uh9 TcMxeoC0TXNLcFyUk+UnTDUqRZRy8Bfwx0KEx8TIMPN/sDBQ3Mq4pUP/0+4ueRb+oWR8 rXHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768229692; x=1768834492; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vae9tFKipWcRHp6Pwi3fV7Q94asRnHBvfdec3wvV7X0=; b=q+oKfdILbydfBSXWasGgL1OeVgNV57ii5YQC8AGsH4Ambdfukcu4RwrhPiW/keKP/r hW9we90lkHN/4wDUD1QzitAUQ3IEnofEeIS96a6J+Kk14JolSKUGmnLidxHpbWS+2ytx x4RRx2YENKV/lZGEcRAv3gKCHp9FKXbRvxTLFbdUaR/Q1iNg1OBqVYmizMGcSmL9y/Vw WmRTmZaUMwswwWyNqCShtC7hKYo7zS4jEIQpdLooxvF+N/Q8pe1q5WGNPodQGHp7CX/E 7t8XuATXtoIDt96CdbYfBBgq2IVrGH3wkrvlHW39S2fKngtMW4ePgVMEOkEevZqqrk6o cBug== X-Gm-Message-State: AOJu0Ywh0v9dzN2umemA+FfnxCXxhcBO/k2r7UAk+qoi9iLCAMXJDld9 uETcIAldvtThvBxoW7UwDu9LhkmPV4Xq4U7I+LK+jefHLon5wIyxG+OA2RuWEBbi X-Gm-Gg: AY/fxX5vUFyNZH6UzRPjywt7X49dNKqactR3Q5jqr9eAWeKieFWVC9ikeOSPM2R6bg3 HAC6cLGGOcOSgW5oNXSgrrxU7/boTa9Qv0CsGpAggmOOfBD1BfDraFgV0gL98ZJcvCNy8i6dBEm SR1/xu6Ea1Hoke8efGcCAWgyH29hcfpksNude8nnMsy7GyF6K3cvRsmAiCRmzYvwIYxxz4BXRpK G+CvbU45ERn9osHcq4rv6wVm/A4uf662QQZYve0lg/lvoqVxu7dNA+kJnGqnpZkBXGxxq8dBehP mXnOiLQ4xIohigdqfIHVYVl42B9NMw1gJV5NfNQxV2kIwc8VHgvEjAfO6Yn390yGSHQRlH1z7F8 BIZgZkOEH9pmdui8HKZ2kgYQCBWHWNy15lMhhUO46oJgp7f3uu7RJ8PnGKEVSrl0Dq0JpCrjXpE hVnrr8ThmpNkYbLyFVt31UyWsfv2xfWeX0Yb66iiLFd+DU7VMi7+CA6D1Qyp6yDGf+OpkIWqcA X-Google-Smtp-Source: AGHT+IGyuG3YbVzCEJjBV8WcMWIzeNjwbNjEW1diFhtb9EUGoLtMrPtxrUUIbIsBg8ur63ED4UY2Lw== X-Received: by 2002:a17:907:d1d:b0:b84:2075:b902 with SMTP id a640c23a62f3a-b844534526emr1714653566b.36.1768229692047; Mon, 12 Jan 2026 06:54:52 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jean-Christophe Dubois , qemu-arm@nongnu.org, Bernhard Beschow , Guenter Roeck , Bin Meng , Thomas Huth , Peter Maydell , qemu-block@nongnu.org, qemu-ppc@nongnu.org Subject: [PATCH 14/14] hw/sd/trace-events: Remove redundant "SWITCH " command name Date: Mon, 12 Jan 2026 15:54:18 +0100 Message-ID: <20260112145418.220506-15-shentey@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112145418.220506-1-shentey@gmail.com> References: <20260112145418.220506-1-shentey@gmail.com> MIME-Version: 1.0 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 (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::52f; envelope-from=shentey@gmail.com; helo=mail-ed1-x52f.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, FREEMAIL_FROM=0.001, 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 @gmail.com) X-ZM-MESSAGEID: 1768229863331158500 Content-Type: text/plain; charset="utf-8" "switch" is already part of the function name. No need to repeat it. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: BALATON Zoltan --- hw/sd/trace-events | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/trace-events b/hw/sd/trace-events index d30daa2143..4ec52d2a81 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -58,7 +58,7 @@ sdcard_write_data(const char *proto, const char *cmd_desc= , uint8_t cmd, uint32_t sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, uin= t32_t offset, uint64_t size, uint32_t blklen) "%s %20s/ CMD%02d ofs %"PRIu3= 2" size %"PRIu64" blklen %" PRIu32 sdcard_set_voltage(uint16_t millivolts) "%u mV" sdcard_ext_csd_update(unsigned index, uint8_t oval, uint8_t nval) "index %= u: 0x%02x -> 0x%02x" -sdcard_switch(unsigned access, unsigned index, unsigned value, unsigned se= t) "SWITCH acc:%u idx:%u val:%u set:%u" +sdcard_switch(unsigned access, unsigned index, unsigned value, unsigned se= t) "acc:%u idx:%u val:%u set:%u" sdcard_rpmb_read_block(uint16_t resp, uint16_t read_addr, uint16_t result)= "resp 0x%x read_addr 0x%x result 0x%x" sdcard_rpmb_write_block(uint16_t req, uint16_t result) "req 0x%x result 0x= %x" =20 --=20 2.52.0