From nobody Tue Feb 10 06:26:26 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 --- 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