lkml.org 
[lkml]   [2021]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v16 6/9] PCI: Define a function to set ACPI_COMPANION in pci_dev
    Date
    From: Shanker Donthineni <sdonthineni@nvidia.com>

    Move the existing code logic from acpi_pci_bridge_d3() to a separate
    function pci_set_acpi_fwnode() to set the ACPI fwnode.

    No functional change with this patch.

    Signed-off-by: Shanker Donthineni <sdonthineni@nvidia.com>
    Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
    ---
    drivers/pci/pci-acpi.c | 12 ++++++++----
    drivers/pci/pci.h | 2 ++
    2 files changed, 10 insertions(+), 4 deletions(-)

    diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
    index 36bc23e21..eaddbf701 100644
    --- a/drivers/pci/pci-acpi.c
    +++ b/drivers/pci/pci-acpi.c
    @@ -934,6 +934,13 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)

    static struct acpi_device *acpi_pci_find_companion(struct device *dev);

    +void pci_set_acpi_fwnode(struct pci_dev *dev)
    +{
    + if (!ACPI_COMPANION(&dev->dev) && !pci_dev_is_added(dev))
    + ACPI_COMPANION_SET(&dev->dev,
    + acpi_pci_find_companion(&dev->dev));
    +}
    +
    static bool acpi_pci_bridge_d3(struct pci_dev *dev)
    {
    const struct fwnode_handle *fwnode;
    @@ -945,11 +952,8 @@ static bool acpi_pci_bridge_d3(struct pci_dev *dev)
    return false;

    /* Assume D3 support if the bridge is power-manageable by ACPI. */
    + pci_set_acpi_fwnode(dev);
    adev = ACPI_COMPANION(&dev->dev);
    - if (!adev && !pci_dev_is_added(dev)) {
    - adev = acpi_pci_find_companion(&dev->dev);
    - ACPI_COMPANION_SET(&dev->dev, adev);
    - }

    if (adev && acpi_device_power_manageable(adev))
    return true;
    diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
    index 31458d48e..8ef379b6c 100644
    --- a/drivers/pci/pci.h
    +++ b/drivers/pci/pci.h
    @@ -703,7 +703,9 @@ static inline int pci_aer_raw_clear_status(struct pci_dev *dev) { return -EINVAL
    #ifdef CONFIG_ACPI
    int pci_acpi_program_hp_params(struct pci_dev *dev);
    extern const struct attribute_group pci_dev_acpi_attr_group;
    +void pci_set_acpi_fwnode(struct pci_dev *dev);
    #else
    +static inline void pci_set_acpi_fwnode(struct pci_dev *dev) {}
    static inline int pci_acpi_program_hp_params(struct pci_dev *dev)
    {
    return -ENODEV;
    --
    2.32.0
    \
     
     \ /
      Last update: 2021-08-17 20:07    [W:3.441 / U:0.788 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site