From nobody Mon Feb 9 08:56:48 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1768934495; cv=none; d=zohomail.com; s=zohoarc; b=DIF4qAiylA3Nz+UUjPPnZl3mWRFHvjbJ/tsOwWi7hL6bQyepk6r4+BJVy7fADs/bvlr1KGNaHCVttM+nj0hmClgJvW5E4GvfKUSx0u0MXOfIydFSiizTplxaliO518W3rNJwSM+s0FAWab2PKWFOCPhmR3E/OVQ94t30a3VTzXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768934495; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=g2CdOzO4uzMuyL3eUd9Xq4lX5VlpfqF563IVR0wUOKc=; b=NFfsjyP8TRlFYNjfXasCBtZL8PhQAqT9bZ2fnm4DURMBJSm+SZjm5HLD7/Ps2Z9BdSnsZzQZcG/mcEIa6/OTBRzNlr74eMo+/i/V7zZ3AhEPAYhM9jvWl4MmuchpV6cW00vmOjCWqHrcuk/1uYhp2q6BDjKYT3FiymXe3yTd/GE= 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 1768934495962182.6488272761743; Tue, 20 Jan 2026 10:41:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1viGf0-0001rm-KH; Tue, 20 Jan 2026 13:41:02 -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 1viGef-0001aJ-1N for qemu-devel@nongnu.org; Tue, 20 Jan 2026 13:40:42 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1viGec-0006L6-7K for qemu-devel@nongnu.org; Tue, 20 Jan 2026 13:40:39 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-43596062728so79635f8f.1 for ; Tue, 20 Jan 2026 10:40:37 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4356997e6dasm31430283f8f.32.2026.01.20.10.40.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 20 Jan 2026 10:40:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768934436; x=1769539236; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=g2CdOzO4uzMuyL3eUd9Xq4lX5VlpfqF563IVR0wUOKc=; b=lRw8RMRtX73qGmiqzipqTRqiUaP1040I3S7WintEseBY+t+twHDvmgiHRnfljXLyeW pomnMRGXZrSGBSELNFpiTGIafs/pRh+bru/hgjpUb8kS81FHHCkSz9sVFoGrMGax+PZc xtLU+FwGbI0B27JoeDln1AP/nlUsxQtHvRDiESHyhhY6K/7a9ChqyDr03Pi4+xzmWSM5 ZFsAtxUE6vmsUMHC13eW0yU0NeqrflETit0DF1qI/IQ58oklsRd57v7fAJYGAUWjE13k N7F191Y5RRWiDFxVUr8hHckEYSYNY9orETbdjnsPKReWNVMsgqK2UJZJB0sYUlpWpbbZ /VZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768934436; x=1769539236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=g2CdOzO4uzMuyL3eUd9Xq4lX5VlpfqF563IVR0wUOKc=; b=F5Xih8dJJtIh/SB1HMh/WmuT6FMRMPGs7MUbq7GDtN2oErneAug5zUPz4Rqo9HfTco kjiNDMYj/3frIOKRzlcqaElCq+YFd9BIMRCIr0aGHMuQ/Q/wW4a62hyHBmCZlnVBBS84 GnJeSpPP7YUphnQ31Mzz0b1JQQOsRHlXuoyeszpUYCitBxY4q/UCr2KIx1859TsB4J8X zeTBYSzhiBWCV5HhRB51FFTxlYhbOm74aeSH2gf0ftruLAZyTAu0HJ1v627OtoNK7Yy7 1F/kZgLSy8wwVuw0b2o7jwIU4lroHwEfOZv/ShaVMsJfoMzvFkxXqtXjdff5v8GF5nLn Uc9Q== X-Gm-Message-State: AOJu0YydPs49Bq+t+E2P/lEsdS35VxE7Lfr6JdBo2v1fjRKycMbWW/Fi rHZmN8arJZEYk3LASlP9A1JXU9obBbQJsoxGE00usocavIqvcmBi2Fu7ZsLF/YVJe7m6xzpXqLQ yw4muNKk= X-Gm-Gg: AZuq6aI3JsuiZ40rxIEgOdBwwponPJSpypvbloX81EM8sx15TVgLsVtBRXBLQcCV1nw r/3fe8gcR+nGQq4V9PFFqqkgtsttCj/HQ3vNISFIkBAfxZoqHEKw3pP54fNHyk+KwhExmddX/2f 0SK7hEm6vP3EJTnLC/ZtlPAHwgzWXY2OkqB3Jxuj7kP5bSixnWLiz9m5wRKS0eckwFLtmbmcukH He+rFVuybTd19Esm9ZzH8VfKPlYcsCE7S1cQlC+/TE56hPFg9DmgVig/lRQzVyxmCx7PjdbTwuL wXHgbqgvcDwKd3CIy35xXxcL6j/batoDHkKsUgBsCWyRCOSCfdpwkZCh71CwwvAVDzLfTP7/uFJ 8RtRfTqtLPAzhGd+7JTn2aV/i2v/A+klh6tqJVOfRjR2bUHzRIw21jaKyLdwGV2+izJ8ciEP1TX bxHyLKAHNXSfmp45TYFG7n57qPrNlelXv8tjPKny7w8L8I9njjuVA4to2wSvBY X-Received: by 2002:a5d:588c:0:b0:432:c0b8:ee42 with SMTP id ffacd0b85a97d-434d7553187mr30023517f8f.11.1768934436253; Tue, 20 Jan 2026 10:40:36 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/29] Revert "hw/sd/sdhci: Rename ESDHC_* defines to USDHC_*" Date: Tue, 20 Jan 2026 19:38:46 +0100 Message-ID: <20260120183902.73845-14-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260120183902.73845-1-philmd@linaro.org> References: <20260120183902.73845-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (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::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu 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 @linaro.org) X-ZM-MESSAGEID: 1768934499229154100 From: Bernhard Beschow 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 Message-ID: <20260112145418.220506-6-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 23d8f7cbc8d..ccdfc59af85 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