LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Amey Narkhede <ameynarkhede03@gmail.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: alex.williamson@redhat.com,
Raphael Norwitz <raphael.norwitz@nutanix.com>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
kw@linux.com, Shanker Donthineni <sdonthineni@nvidia.com>,
Sinan Kaya <okaya@kernel.org>, Len Brown <lenb@kernel.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>
Subject: [PATCH v10 5/8] PCI: Define a function to set ACPI_COMPANION in pci_dev
Date: Fri, 9 Jul 2021 18:08:10 +0530 [thread overview]
Message-ID: <20210709123813.8700-6-ameynarkhede03@gmail.com> (raw)
In-Reply-To: <20210709123813.8700-1-ameynarkhede03@gmail.com>
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>
---
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 db1ad94e7..990b73e90 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -704,7 +704,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
next prev parent reply other threads:[~2021-07-09 12:39 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-09 12:38 [PATCH v10 0/8] Expose and manage PCI device reset Amey Narkhede
2021-07-09 12:38 ` [PATCH v10 1/8] PCI: Add pcie_reset_flr to follow calling convention of other reset methods Amey Narkhede
2021-07-12 22:07 ` Alex Williamson
2021-07-27 22:12 ` Bjorn Helgaas
2021-07-28 18:54 ` Shanker R Donthineni
2021-07-28 20:23 ` Bjorn Helgaas
2021-07-28 21:58 ` Shanker R Donthineni
2021-07-28 22:04 ` Shanker R Donthineni
2021-07-28 22:16 ` Bjorn Helgaas
2021-07-09 12:38 ` [PATCH v10 2/8] PCI: Add new array for keeping track of ordering of " Amey Narkhede
2021-07-27 22:59 ` Bjorn Helgaas
2021-07-28 17:45 ` Amey Narkhede
2021-07-28 17:59 ` Bjorn Helgaas
2021-07-28 18:17 ` Shanker R Donthineni
2021-07-28 18:08 ` Shanker R Donthineni
2021-07-28 18:31 ` Shanker R Donthineni
2021-07-28 20:25 ` Bjorn Helgaas
2021-07-28 22:01 ` Shanker R Donthineni
2021-07-09 12:38 ` [PATCH v10 3/8] PCI: Remove reset_fn field from pci_dev Amey Narkhede
2021-07-09 12:38 ` [PATCH v10 4/8] PCI/sysfs: Allow userspace to query and set device reset mechanism Amey Narkhede
2021-07-27 23:28 ` Bjorn Helgaas
2021-07-28 1:27 ` Krzysztof Wilczyński
2021-07-28 15:36 ` Bjorn Helgaas
2021-07-28 17:59 ` Amey Narkhede
2021-07-28 18:13 ` Bjorn Helgaas
2021-07-28 18:58 ` Amey Narkhede
2021-07-28 20:18 ` Bjorn Helgaas
2021-07-31 19:15 ` Amey Narkhede
2021-07-28 17:09 ` Bjorn Helgaas
2021-07-09 12:38 ` Amey Narkhede [this message]
2021-07-12 22:29 ` [PATCH v10 5/8] PCI: Define a function to set ACPI_COMPANION in pci_dev Alex Williamson
2021-07-09 12:38 ` [PATCH v10 6/8] PCI: Setup ACPI fwnode early and at the same time with OF Amey Narkhede
2021-07-12 23:09 ` Alex Williamson
2021-07-27 23:30 ` Bjorn Helgaas
2021-07-27 23:50 ` Shanker R Donthineni
2021-07-09 12:38 ` [PATCH v10 7/8] PCI: Add support for ACPI _RST reset method Amey Narkhede
2021-07-12 23:09 ` Alex Williamson
2021-07-13 0:51 ` Shanker R Donthineni
2021-07-14 22:56 ` Alex Williamson
2021-07-09 12:38 ` [PATCH v10 8/8] PCI: Change the type of probe argument in reset functions Amey Narkhede
2021-07-12 22:24 ` Alex Williamson
2021-07-27 22:22 ` Bjorn Helgaas
2021-07-28 17:35 ` Amey Narkhede
2021-07-28 17:55 ` Bjorn Helgaas
2021-07-09 12:46 ` [PATCH v10 0/8] Expose and manage PCI device reset Amey Narkhede
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=20210709123813.8700-6-ameynarkhede03@gmail.com \
--to=ameynarkhede03@gmail.com \
--cc=alex.williamson@redhat.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=raphael.norwitz@nutanix.com \
--cc=rjw@rjwysocki.net \
--cc=sdonthineni@nvidia.com \
--subject='Re: [PATCH v10 5/8] PCI: Define a function to set ACPI_COMPANION in pci_dev' \
/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
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).