* [PATCH] mmc: sdhci-brcmstb: use correct register offset for V1 pin_sel restore
@ 2026-02-16 19:15 Kamal Dasu
2026-02-17 14:55 ` Ulf Hansson
2026-02-17 18:47 ` Florian Fainelli
0 siblings, 2 replies; 4+ messages in thread
From: Kamal Dasu @ 2026-02-16 19:15 UTC (permalink / raw)
To: adrian.hunter, ulf.hansson, florian.fainelli
Cc: bcm-kernel-feedback-list, linux-mmc, linux-arm-kernel,
linux-kernel, Kamal Dasu
The restore path for SDIO_CFG_CORE_V1 was incorrectly using
SDIO_CFG_SD_PIN_SEL (offset 0x44) instead of SDIO_CFG_V1_SD_PIN_SEL
(offset 0x54), causing the wrong register to be written on resume.
The save path already uses the correct V1-specific offset. This
affects BCM7445 and BCM72116 platforms which use the V1 config core.
Fixes: b7e614802e3f ("mmc: sdhci-brcmstb: save and restore registers during PM")
Signed-off-by: Kamal Dasu <kamal.dasu@broadcom.com>
---
drivers/mmc/host/sdhci-brcmstb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
index c9442499876c..57e45951644e 100644
--- a/drivers/mmc/host/sdhci-brcmstb.c
+++ b/drivers/mmc/host/sdhci-brcmstb.c
@@ -116,7 +116,7 @@ static void sdhci_brcmstb_restore_regs(struct mmc_host *mmc, enum cfg_core_ver v
writel(sr->boot_main_ctl, priv->boot_regs + SDIO_BOOT_MAIN_CTL);
if (ver == SDIO_CFG_CORE_V1) {
- writel(sr->sd_pin_sel, cr + SDIO_CFG_SD_PIN_SEL);
+ writel(sr->sd_pin_sel, cr + SDIO_CFG_V1_SD_PIN_SEL);
return;
}
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: sdhci-brcmstb: use correct register offset for V1 pin_sel restore
2026-02-16 19:15 [PATCH] mmc: sdhci-brcmstb: use correct register offset for V1 pin_sel restore Kamal Dasu
@ 2026-02-17 14:55 ` Ulf Hansson
2026-02-17 18:47 ` Florian Fainelli
1 sibling, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2026-02-17 14:55 UTC (permalink / raw)
To: Kamal Dasu
Cc: adrian.hunter, florian.fainelli, bcm-kernel-feedback-list,
linux-mmc, linux-arm-kernel, linux-kernel
On Mon, 16 Feb 2026 at 20:15, Kamal Dasu <kamal.dasu@broadcom.com> wrote:
>
> The restore path for SDIO_CFG_CORE_V1 was incorrectly using
> SDIO_CFG_SD_PIN_SEL (offset 0x44) instead of SDIO_CFG_V1_SD_PIN_SEL
> (offset 0x54), causing the wrong register to be written on resume.
> The save path already uses the correct V1-specific offset. This
> affects BCM7445 and BCM72116 platforms which use the V1 config core.
>
> Fixes: b7e614802e3f ("mmc: sdhci-brcmstb: save and restore registers during PM")
> Signed-off-by: Kamal Dasu <kamal.dasu@broadcom.com>
Applied for fixes and by adding a stable tag, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-brcmstb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
> index c9442499876c..57e45951644e 100644
> --- a/drivers/mmc/host/sdhci-brcmstb.c
> +++ b/drivers/mmc/host/sdhci-brcmstb.c
> @@ -116,7 +116,7 @@ static void sdhci_brcmstb_restore_regs(struct mmc_host *mmc, enum cfg_core_ver v
> writel(sr->boot_main_ctl, priv->boot_regs + SDIO_BOOT_MAIN_CTL);
>
> if (ver == SDIO_CFG_CORE_V1) {
> - writel(sr->sd_pin_sel, cr + SDIO_CFG_SD_PIN_SEL);
> + writel(sr->sd_pin_sel, cr + SDIO_CFG_V1_SD_PIN_SEL);
> return;
> }
>
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: sdhci-brcmstb: use correct register offset for V1 pin_sel restore
2026-02-16 19:15 [PATCH] mmc: sdhci-brcmstb: use correct register offset for V1 pin_sel restore Kamal Dasu
2026-02-17 14:55 ` Ulf Hansson
@ 2026-02-17 18:47 ` Florian Fainelli
2026-02-18 11:28 ` Ulf Hansson
1 sibling, 1 reply; 4+ messages in thread
From: Florian Fainelli @ 2026-02-17 18:47 UTC (permalink / raw)
To: Kamal Dasu, adrian.hunter, ulf.hansson, florian.fainelli
Cc: bcm-kernel-feedback-list, linux-mmc, linux-arm-kernel, linux-kernel
On 2/16/26 11:15, Kamal Dasu wrote:
> The restore path for SDIO_CFG_CORE_V1 was incorrectly using
> SDIO_CFG_SD_PIN_SEL (offset 0x44) instead of SDIO_CFG_V1_SD_PIN_SEL
> (offset 0x54), causing the wrong register to be written on resume.
> The save path already uses the correct V1-specific offset. This
> affects BCM7445 and BCM72116 platforms which use the V1 config core.
>
> Fixes: b7e614802e3f ("mmc: sdhci-brcmstb: save and restore registers during PM")
> Signed-off-by: Kamal Dasu <kamal.dasu@broadcom.com>
Late to the party but:
Tested-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: sdhci-brcmstb: use correct register offset for V1 pin_sel restore
2026-02-17 18:47 ` Florian Fainelli
@ 2026-02-18 11:28 ` Ulf Hansson
0 siblings, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2026-02-18 11:28 UTC (permalink / raw)
To: Florian Fainelli
Cc: Kamal Dasu, adrian.hunter, bcm-kernel-feedback-list, linux-mmc,
linux-arm-kernel, linux-kernel
On Tue, 17 Feb 2026 at 19:47, Florian Fainelli
<florian.fainelli@broadcom.com> wrote:
>
> On 2/16/26 11:15, Kamal Dasu wrote:
> > The restore path for SDIO_CFG_CORE_V1 was incorrectly using
> > SDIO_CFG_SD_PIN_SEL (offset 0x44) instead of SDIO_CFG_V1_SD_PIN_SEL
> > (offset 0x54), causing the wrong register to be written on resume.
> > The save path already uses the correct V1-specific offset. This
> > affects BCM7445 and BCM72116 platforms which use the V1 config core.
> >
> > Fixes: b7e614802e3f ("mmc: sdhci-brcmstb: save and restore registers during PM")
> > Signed-off-by: Kamal Dasu <kamal.dasu@broadcom.com>
>
> Late to the party but:
No worries!
>
> Tested-by: Florian Fainelli <florian.fainelli@broadcom.com>
> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
The tags added to the commit and thanks for testing/reviewing!
Kind regards
Uffe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-02-18 11:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-02-16 19:15 [PATCH] mmc: sdhci-brcmstb: use correct register offset for V1 pin_sel restore Kamal Dasu
2026-02-17 14:55 ` Ulf Hansson
2026-02-17 18:47 ` Florian Fainelli
2026-02-18 11:28 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®