Skip to contentSkip to conversation

ARM: dts: marvell: add SDHCI clock-names to Armada 38x

PATCH In review Rosen Penev 3 participants 3 messages Aug 23 – Aug 28

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: marvell: add SDHCI clock-names to Armada 38x

The marvell,armada-380-sdhci binding requires clock-names, but the Armada 38x SDHCI node only carries an unnamed clock reference. Add the missing clock name so the node passes schema validation.

Fixes 6eccc52b448e ("ARM: mvebu: enable the SDHCI interface on Armada 385")
Assisted-by opencode:big-pickle
---
 arch/arm/boot/dts/marvell/armada-38x.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/marvell/armada-38x.dtsi +1 -0
index 1155bee20523..598022645dd2 100644
@@ -627,6 +627,7 @@ sdhci: mmc@d8000 {
 					<0x18454 0x4>;
 				interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&gateclk 17>;
+				clock-names = "io";
 				mrvl,clk-delay-cycles = <0x1F>;
 				status = "disabled";
 			};
Signature · 1 line
2.55.0
#1 lore raw
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:

Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:

Pre-existing issues:
- [High] The driver ignores the return value of clk_prepare_enable() for its primary clocks, risking unclocked register accesses.
- [High] The driver improperly handles -EPROBE_DEFER from devm_pinctrl_get(), allowing the probe to succeed without necessary pins.
- [High] The driver ignores the return value of pm_runtime_get_sync() in suspend, resume, and remove callbacks. --

--- Patch [1]: [PATCH] ARM: dts: marvell: add SDHCI clock-names to Armada 38x --- commit 00932f716bef42c94516ea3abd25e12b0e972f6b
Author: Rosen Penev <[email protected]>

ARM: dts: marvell: add SDHCI clock-names to Armada 38x

The marvell,armada-380-sdhci binding requires clock-names, but the Armada 38x SDHCI node only carries an unnamed clock reference. Add the missing clock name so the node passes schema validation.

arch/arm/boot/dts/marvell/armada-38x.dtsi sdhci: sdhci@d8000 { · line 633

Quoted 12 lines
arch/arm/boot/dts/marvell/armada-38x.dtsi +1 -0
index 1d616edda322d..0618779090d04 100644
@@ -627,6 +627,7 @@ sdhci: sdhci@d8000 {
 					<0x18454 0x4>;
 				interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&gateclk 17>;
+				clock-names = "io";
 				mrvl,clk-delay-cycles = <0x1F>;
 				status = "disabled";
 			};

[Severity: High]
This is a pre-existing issue, but does the host driver ignore the return value of clk_prepare_enable() for its primary clocks?

Looking at drivers/mmc/host/sdhci-pxav3.c in sdhci_pxav3_probe():

    clk_prepare_enable(pxa->clk_io);
    ...
    clk_prepare_enable(pxa->clk_core);

And in sdhci_pxav3_runtime_resume():

    clk_prepare_enable(pxa->clk_io);
    clk_prepare_enable(pxa->clk_core);

If clock enablement fails, could the hardware remain unclocked and cause subsequent register accesses to trigger a bus hang?

[Severity: High]
This is a pre-existing issue, but does the driver improperly handle -EPROBE_DEFER?

Looking at drivers/mmc/host/sdhci-pxav3.c in sdhci_pxav3_probe():

    } else {
        dev_dbg(dev, "could not get pinctrl handle: %ld\n", PTR_ERR(pxa->pinctrl));
    }

If devm_pinctrl_get() returns -EPROBE_DEFER, the driver drops the error code and allows the probe to succeed without necessary pins. Will this cause high-speed SD/MMC cards to fail tuning or experience data corruption when the driver attempts to switch to high-speed UHS modes?

[Severity: High]
This is a pre-existing issue, but are the return values of pm_runtime_get_sync() ignored during power management transitions?

Looking at drivers/mmc/host/sdhci-pxav3.c in sdhci_pxav3_remove():

    pm_runtime_get_sync(&pdev->dev);

This also happens in sdhci_pxav3_suspend():

    pm_runtime_get_sync(dev);

And in sdhci_pxav3_resume():

    pm_runtime_get_sync(dev);

If pm_runtime_get_sync() fails and returns a negative error code, does the driver unconditionally proceed to call the host functions which read and write host controller registers?

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
maintainer
#2 lore raw
In reply to Rosen Penev
Quoted 7 lines · Rosen Penev

The marvell,armada-380-sdhci binding requires clock-names, but the Armada 38x SDHCI node only carries an unnamed clock reference. Add the missing clock name so the node passes schema validation.

Fixes 6eccc52b448e ("ARM: mvebu: enable the SDHCI interface on Armada 385")
Assisted-by opencode:big-pickle

Fix already applied with ARM: dts: marvell: add missing SDHCI clock-names

Quoted 19 lines
---
 arch/arm/boot/dts/marvell/armada-38x.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/marvell/armada-38x.dtsi +1 -0
index 1155bee20523..598022645dd2 100644
@@ -627,6 +627,7 @@ sdhci: mmc@d8000 {
 					<0x18454 0x4>;
 				interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&gateclk 17>;
+				clock-names = "io";
 				mrvl,clk-delay-cycles = <0x1F>;
 				status = "disabled";
 			};
Signature · 1 line
2.55.0
Signature · 3 lines
Grégory CLEMENT, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com