* [PATCH] PCI/PM: Call .bridge_d3() hook only if non-NULL
@ 2020-04-15 0:06 Bjorn Helgaas
2020-04-15 7:29 ` Mika Westerberg
2020-04-24 19:34 ` Bjorn Helgaas
0 siblings, 2 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2020-04-15 0:06 UTC (permalink / raw)
To: linux-pci
Cc: Rafael J . Wysocki, linux-kernel, Bjorn Helgaas, Mika Westerberg
From: Bjorn Helgaas <bhelgaas@google.com>
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.
Fixes: 26ad34d510a8 ("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/pci/pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 595fcf59843f..dfa7ec008963 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -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;
}
/**
--
2.26.0.110.g2183baf09c-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] PCI/PM: Call .bridge_d3() hook only if non-NULL
2020-04-15 0:06 [PATCH] PCI/PM: Call .bridge_d3() hook only if non-NULL Bjorn Helgaas
@ 2020-04-15 7:29 ` Mika Westerberg
2020-04-24 19:34 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Mika Westerberg @ 2020-04-15 7:29 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-pci, Rafael J . Wysocki, linux-kernel, Bjorn Helgaas
On Tue, Apr 14, 2020 at 07:06:35PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> 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.
>
> Fixes: 26ad34d510a8 ("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports")
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PCI/PM: Call .bridge_d3() hook only if non-NULL
2020-04-15 0:06 [PATCH] PCI/PM: Call .bridge_d3() hook only if non-NULL Bjorn Helgaas
2020-04-15 7:29 ` Mika Westerberg
@ 2020-04-24 19:34 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2020-04-24 19:34 UTC (permalink / raw)
To: linux-pci; +Cc: Rafael J . Wysocki, linux-kernel, Mika Westerberg
On Tue, Apr 14, 2020 at 07:06:35PM -0500, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> 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.
>
> Fixes: 26ad34d510a8 ("PCI / ACPI: Whitelist D3 for more PCIe hotplug ports")
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Applied with Mika's reviewed-by to pci/pm for v5.8.
> ---
> drivers/pci/pci.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 595fcf59843f..dfa7ec008963 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -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;
> }
>
> /**
> --
> 2.26.0.110.g2183baf09c-goog
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-24 19:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-15 0:06 [PATCH] PCI/PM: Call .bridge_d3() hook only if non-NULL Bjorn Helgaas
2020-04-15 7:29 ` Mika Westerberg
2020-04-24 19:34 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).