From: Shanker Donthineni <sdonthineni@nvidia.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Alex Williamson <alex.williamson@redhat.com>,
<linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<kw@linux.com>, Len Brown <lenb@kernel.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Sinan Kaya <okaya@kernel.org>,
"Amey Narkhede" <ameynarkhede03@gmail.com>,
Shanker Donthineni <sdonthineni@nvidia.com>
Subject: [PATCH v11 5/8] PCI: Define a function to set ACPI_COMPANION in pci_dev
Date: Thu, 15 Jul 2021 16:30:57 -0500 [thread overview]
Message-ID: <20210715213100.11539-6-sdonthineni@nvidia.com> (raw)
In-Reply-To: <20210715213100.11539-1-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 36bc23e217592..eaddbf7017594 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 482d26cff7912..37381734fcc78 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -708,7 +708,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.25.1
next prev parent reply other threads:[~2021-07-15 21:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 21:30 [PATCH v11 0/8] PCI: Add support for ACPI _RST reset method Shanker Donthineni
2021-07-15 21:30 ` [PATCH v11 1/8] PCI: Add pcie_reset_flr to follow calling convention of other reset methods Shanker Donthineni
2021-07-15 21:30 ` [PATCH v11 2/8] PCI: Add new array for keeping track of ordering of " Shanker Donthineni
2021-07-15 21:30 ` [PATCH v11 3/8] PCI: Remove reset_fn field from pci_dev Shanker Donthineni
2021-07-15 21:30 ` [PATCH v11 4/8] PCI/sysfs: Allow userspace to query and set device reset mechanism Shanker Donthineni
2021-07-15 21:30 ` Shanker Donthineni [this message]
2021-07-15 21:30 ` [PATCH v11 6/8] PCI: Setup ACPI fwnode early and at the same time with OF Shanker Donthineni
2021-07-15 21:30 ` [PATCH v11 7/8] PCI: Add support for ACPI _RST reset method Shanker Donthineni
2021-07-15 21:31 ` [PATCH v11 8/8] PCI: Change the type of probe argument in reset functions Shanker Donthineni
2021-07-16 15:23 ` [PATCH v11 0/8] PCI: Add support for ACPI _RST reset method Shanker R Donthineni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210715213100.11539-6-sdonthineni@nvidia.com \
--to=sdonthineni@nvidia.com \
--cc=alex.williamson@redhat.com \
--cc=ameynarkhede03@gmail.com \
--cc=bhelgaas@google.com \
--cc=kw@linux.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=okaya@kernel.org \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).