From: Bjorn Helgaas <helgaas@kernel.org>
To: "Kuppuswamy,
Sathyanarayanan" <sathyanarayanan.kuppuswamy@linux.intel.com>
Cc: ashok.raj@intel.com, knsathya@kernel.org,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>
Subject: Re: [PATCH 4/5] PCI/ACPI: Centralize pcie_ports_native checking
Date: Sat, 28 Nov 2020 15:45:52 -0600 [thread overview]
Message-ID: <20201128214552.GA907628@bjorn-Precision-5520> (raw)
In-Reply-To: <0c7eb524-ff3a-d3ec-f9e6-7656e75b3437@linux.intel.com>
On Wed, Nov 25, 2020 at 07:20:53PM -0800, Kuppuswamy, Sathyanarayanan wrote:
> On 11/25/20 5:18 PM, Bjorn Helgaas wrote:
> > From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> >
> > If the user booted with "pcie_ports=native", we take control of the PCIe
> > features unconditionally, regardless of what _OSC says.
> >
> > Centralize the testing of pcie_ports_native in acpi_pci_root_create(),
> > where we interpret the _OSC results, so other places only have to check
> > host_bridge->native_X and we don't have to sprinkle tests of
> > pcie_ports_native everywhere.
> >
> > [bhelgaas: commit log, rework OSC_PCI_EXPRESS_CONTROL_MASKS, logging]
> > Link: https://lore.kernel.org/r/bc87c9e675118960949043a832bed86bc22becbd.1603766889.git.sathyanarayanan.kuppuswamy@linux.intel.com
> > Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> > ---
> > drivers/acpi/pci_root.c | 19 +++++++++++++++++++
> > drivers/pci/hotplug/pciehp_core.c | 2 +-
> > drivers/pci/pci-acpi.c | 3 ---
> > drivers/pci/pcie/aer.c | 2 +-
> > drivers/pci/pcie/portdrv_core.c | 9 +++------
> > 5 files changed, 24 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
> > index 6db071038fd5..36142ed7b8f8 100644
> > --- a/drivers/acpi/pci_root.c
> > +++ b/drivers/acpi/pci_root.c
> > @@ -882,6 +882,8 @@ static void acpi_pci_root_release_info(struct pci_host_bridge *bridge)
> > flag = 0; \
> > } while (0)
> > +#define FLAG(x) ((x) ? '+' : '-')
> > +
> > struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
> > struct acpi_pci_root_ops *ops,
> > struct acpi_pci_root_info *info,
> > @@ -930,6 +932,23 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
> > OSC_OWNER(ctrl, OSC_PCI_EXPRESS_LTR_CONTROL, host_bridge->native_ltr);
> > OSC_OWNER(ctrl, OSC_PCI_EXPRESS_DPC_CONTROL, host_bridge->native_dpc);
> > + if (pcie_ports_native) {
> > + dev_info(&root->device->dev, "Taking control of PCIe-related features because \"pcie_ports=native\" specified; may conflict with firmware\n");
> > + host_bridge->native_pcie_hotplug = 1;
> > + host_bridge->native_aer = 1;
> > + host_bridge->native_pme = 1;
> > + host_bridge->native_ltr = 1;
> > + host_bridge->native_dpc = 1;
> > + }
> Won't it be better if its merged with above OSC_OWNER() calls? If
> pcie_ports_native is set, then above OSC_OWNER() calls for PCIe
> related features are redundant. Let me know.
Yes, I think you're right. I think it would also be nice to know
exactly which services we're overriding _OSC for, i.e., when we turn
native_aer from 0 to 1 and so on. If we merge this back in, we'll
have a way to keep track of those.
> > @@ -208,8 +208,7 @@ static int get_port_device_capability(struct pci_dev *dev)
> > struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
> > int services = 0;
> > - if (dev->is_hotplug_bridge &&
> > - (pcie_ports_native || host->native_pcie_hotplug)) {
> > + if (host->native_pcie_hotplug && dev->is_hotplug_bridge) {
> May be this reordering can be split into a different patch ?
Good point, that makes the diff a little easier to read, thanks!
next prev parent reply other threads:[~2020-11-28 22:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 1:18 [PATCH v12 0/5] Simplify PCIe native ownership Bjorn Helgaas
2020-11-26 1:18 ` [PATCH 1/5] PCI/DPC: Ignore devices with no AER Capability Bjorn Helgaas
2020-11-26 2:01 ` Kuppuswamy, Sathyanarayanan
2020-11-28 20:24 ` Bjorn Helgaas
2020-11-28 21:49 ` Kuppuswamy, Sathyanarayanan
2020-11-28 21:53 ` Bjorn Helgaas
2020-11-28 21:56 ` Kuppuswamy, Sathyanarayanan
2020-11-28 23:25 ` Bjorn Helgaas
2020-11-29 4:32 ` Kuppuswamy, Sathyanarayanan
2020-12-01 15:34 ` Bjorn Helgaas
2020-11-26 1:18 ` [PATCH 2/5] PCI: Assume control of portdrv-related features only when portdrv enabled Bjorn Helgaas
2020-11-26 1:18 ` [PATCH 3/5] PCI/ACPI: Tidy _OSC control bit checking Bjorn Helgaas
2020-11-26 1:18 ` [PATCH 4/5] PCI/ACPI: Centralize pcie_ports_native checking Bjorn Helgaas
2020-11-26 3:20 ` Kuppuswamy, Sathyanarayanan
2020-11-28 21:45 ` Bjorn Helgaas [this message]
2020-11-26 1:18 ` [PATCH 5/5] PCI/ACPI: Centralize pci_aer_available() checking Bjorn Helgaas
2020-11-26 3:48 ` [PATCH v12 0/5] Simplify PCIe native ownership Kuppuswamy, Sathyanarayanan
2020-12-01 1:11 ` Kuppuswamy, Sathyanarayanan
2020-12-08 6:03 ` Kuppuswamy, Sathyanarayanan
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=20201128214552.GA907628@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=knsathya@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
/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).