lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 124/215] PCI/PM: Call .bridge_d3() hook only if non-NULL
    Date
    From: Bjorn Helgaas <bhelgaas@google.com>

    commit c3aaf086701d05a82c8156ee8620af41e5a7d6fe upstream.

    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>
    Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/pci/pci.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/pci/pci.c
    +++ b/drivers/pci/pci.c
    @@ -802,7 +802,9 @@ static inline bool platform_pci_need_res

    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;
    }

    /**

    \
     
     \ /
      Last update: 2020-07-20 18:28    [W:4.928 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site