PCI: rcar: Check if device is runtime suspended instead of __clk_is_enabled()
[ Upstream commitd2a14b5498
] 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' Link: https://lore.kernel.org/r/20211115204641.12941-1-marek.vasut@gmail.com Fixes:a115b1bd3a
("PCI: rcar: Add L1 link state fix into data abort hook") Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Randy Dunlap <rdunlap@infradead.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Stephen Boyd <sboyd@kernel.org> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Cc: linux-renesas-soc@vger.kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
aa805236ed
Коммит
d9fc43aab6
|
@ -52,10 +52,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 */
|
||||
|
@ -794,7 +794,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;
|
||||
|
@ -1064,7 +1064,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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче