PCI/PM: Call .bridge_d3() hook only if non-NULL
PATCH 1/1 PCI/PM: Call .bridge_d3() hook only if non-NULL
From: Bjorn Helgaas <[email protected]>
26ad34d510a8 ("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports") added the struct pci_platform_pm_ops.bridge_d3() function pointer and platform_pci_bridge_d3() to use it.
The .bridge_d3() op is implemented by acpi_pci_platform_pm, but not by mid_pci_platform_pm. We don't expect platform_pci_bridge_d3() to be called on Intel MID platforms, but nothing in the code itself would prevent that.
Check the .bridge_d3() pointer for NULL before calling it.
--- drivers/pci/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/pci.c +3 -1
@@ -868,7 +868,9 @@ static inline bool platform_pci_need_resume(struct pci_dev *dev)static inline bool platform_pci_bridge_d3 (struct pci_dev *dev) { -return pci_platform_pm ? pci_platform_pm->bridge_d3 (dev) : false; +if (pci_platform_pm && pci_platform_pm->bridge_d3) +return pci_platform_pm->bridge_d3 (dev); +return false; }/**
Signature · 1 line
2.26.0.110.g2183baf09c-goog
Quoted 10 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
26ad34d510a8("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports") added the structpci_platform_pm_ops.bridge_d3()function pointer andplatform_pci_bridge_d3()to use it.The .bridge_d3() op is implemented by
acpi_pci_platform_pm, but not bymid_pci_platform_pm. We don't expectplatform_pci_bridge_d3()to be called on Intel MID platforms, but nothing in the code itself would prevent that.
Quoted 5 lines
Check the .bridge_d3() pointer for NULL before calling it.
Fixes 26ad34d510a8 ("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports")Signed-off-by Bjorn Helgaas <[email protected]>Cc Mika Westerberg <[email protected]>
Thanks!
Quoted 10 lines · Bjorn Helgaas
From: Bjorn Helgaas <[email protected]>
26ad34d510a8("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports") added the structpci_platform_pm_ops.bridge_d3()function pointer andplatform_pci_bridge_d3()to use it.The .bridge_d3() op is implemented by
acpi_pci_platform_pm, but not bymid_pci_platform_pm. We don't expectplatform_pci_bridge_d3()to be called on Intel MID platforms, but nothing in the code itself would prevent that.
Quoted 5 lines
Check the .bridge_d3() pointer for NULL before calling it.
Fixes 26ad34d510a8 ("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports")Signed-off-by Bjorn Helgaas <[email protected]>Cc Mika Westerberg <[email protected]>
Applied with Mika's reviewed-by to pci/pm for v5.8.
Quoted 22 lines
--- drivers/pci/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/pci/pci.c +3
-1@@ -868,7 +868,9 @@ static inline bool platform_pci_need_resume(struct pci_dev *dev)static inline bool platform_pci_bridge_d3 (struct pci_dev *dev) { -return pci_platform_pm ? pci_platform_pm->bridge_d3 (dev) : false; +if (pci_platform_pm && pci_platform_pm->bridge_d3) +return pci_platform_pm->bridge_d3 (dev); +return false; }/** Signature · 1 line
2.26.0.110.g2183baf09c-goog