From nobody Tue Feb 10 04:16:40 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 --- 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