Skip to contentSkip to conversation

PCI: rcar: Check if device is runtime suspended instead of __clk_is_enabled()

PATCH Applied [email protected] 3 participants 3 messages Nov 15, 2021 – Dec 1, 2021

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

PATCH v4 1/1 PCI: rcar: Check if device is runtime suspended instead of __clk_is_enabled()

From: Marek Vasut <[email protected]>

Replace __clk_is_enabled() with pm_runtime_suspended(),
as __clk_is_enabled() was checking the wrong bus clock
and caused the following build error too:
arm-linux-gnueabi-ld: drivers/pci/controller/pcie-rcar-host.o: in function `rcar_pcie_aarch32_abort_handler':
pcie-rcar-host.c:(.text+0xdd0): undefined reference to `__clk_is_enabled'

Fixes a115b1bd3af0 ("PCI: rcar: Add L1 link state fix into data abort hook")
Cc Arnd Bergmann <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Lorenzo Pieralisi <[email protected]>
Cc Stephen Boyd <[email protected]>
Cc Wolfram Sang <[email protected]>
Cc Yoshihiro Shimoda <[email protected]>

---
V2: Drop the __clk_is_enabled(), like it was done already in V1 of
a115b1bd3af0 ("PCI: rcar: Add L1 link state fix into data abort hook")
V3: Use pm_runtime_suspended() instead of __clk_is_enabled()
V4: Rework the commit message

---
 drivers/pci/controller/pcie-rcar-host.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pci/controller/pcie-rcar-host.c +5 -5
index e12c2d8be05a..138592e22600 100644
@@ -50,10 +50,10 @@ struct rcar_msi {
  */
 static void __iomem *pcie_base;
 /*
- * Static copy of bus clock pointer, so we can check whether the clock
- * is enabled or not.
+ * Static copy of pcie device pointer, so we can check whether the
+ * device is runtime suspended or not.
  */
-static struct clk *pcie_bus_clk;
+static struct device *pcie_dev;
 #endif
 
 /* Structure representing the PCIe interface */
@@ -792,7 +792,7 @@ static int rcar_pcie_get_resources(struct rcar_pcie_host *host)
 #ifdef CONFIG_ARM
 	/* Cache static copy for L1 link state fixup hook on aarch32 */
 	pcie_base = pcie->base;
-	pcie_bus_clk = host->bus_clk;
+	pcie_dev = pcie->dev;
 #endif
 
 	return 0;
@@ -1062,7 +1062,7 @@ static int rcar_pcie_aarch32_abort_handler(unsigned long addr,
 
 	spin_lock_irqsave(&pmsr_lock, flags);
 
-	if (!pcie_base || !__clk_is_enabled(pcie_bus_clk)) {
+	if (!pcie_base || pm_runtime_suspended(pcie_dev)) {
 		ret = 1;
 		goto unlock_exit;
 	}
Signature · 1 line
2.33.0
#1 lore raw

[+CC Adding Sasha for visibility]

Hi Marek,

Thank you for taking care about this. I am adding Sasha since this is something we should most likely port to stable and long-term kernels, especially since this isn't a new driver.

[...]

Quoted 4 lines

- * Static copy of bus clock pointer, so we can check whether the clock
- * is enabled or not.
+ * Static copy of pcie device pointer, so we can check whether the
+ * device is runtime suspended or not.

A small nitpick: it would be "PCIe" in the above comment. However, probably not worth sending another version just for this.

Krzysztof

#2 lore raw
In reply to [email protected]
Quoted 9 lines · On Mon, 15 Nov 2021 21:46:41 +0100, [email protected] wrote:

From: Marek Vasut <[email protected]>

Replace __clk_is_enabled() with pm_runtime_suspended(),
as __clk_is_enabled() was checking the wrong bus clock
and caused the following build error too:
arm-linux-gnueabi-ld: drivers/pci/controller/pcie-rcar-host.o: in function `rcar_pcie_aarch32_abort_handler':
pcie-rcar-host.c:(.text+0xdd0): undefined reference to `__clk_is_enabled'

[...]

Applied to pci/rcar, thanks!

[1/1] PCI: rcar: Check if device is runtime suspended instead of __clk_is_enabled()

      https://git.kernel.org/lpieralisi/pci/c/d2a14b5498

Thanks,
Lorenzo