From: Bjorn Helgaas <helgaas@kernel.org> To: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> Cc: bhelgaas@google.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ashok.raj@intel.com, knsathya@kernel.org Subject: Re: [PATCH v11 3/5] ACPI/PCI: Ignore _OSC DPC negotiation result if pcie_ports_dpc_native is set. Date: Wed, 25 Nov 2020 14:50:28 -0600 Message-ID: <20201125205028.GA677519@bjorn-Precision-5520> (raw) In-Reply-To: <0ec11f2b7470070768886a138f2a755620725a06.1603766889.git.sathyanarayanan.kuppuswamy@linux.intel.com> On Mon, Oct 26, 2020 at 07:57:06PM -0700, Kuppuswamy Sathyanarayanan wrote: > pcie_ports_dpc_native is set only if user requests native handling > of PCIe DPC capability via pcie_port_setup command line option. > User input takes precedence over _OSC based control negotiation > result. So consider the _OSC negotiated result for DPC ownership > only if pcie_ports_dpc_native is unset. > > Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> > --- > drivers/acpi/pci_root.c | 8 ++++++-- > drivers/pci/pcie/dpc.c | 3 ++- > drivers/pci/pcie/portdrv.h | 2 -- > drivers/pci/pcie/portdrv_core.c | 2 +- > include/linux/pci.h | 2 ++ > 5 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index a9e6b782622d..2e2bc80c42fe 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -933,8 +933,12 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, > host_bridge->native_pme); > 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_dpc_native) > + dev_warn(&bus->dev, "OS forcibly taking over DPC\n"); > + else > + OSC_OWNER(ctrl, OSC_PCI_EXPRESS_DPC_CONTROL, > + host_bridge->native_dpc); > + > } > > if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL)) > diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c > index e05aba86a317..21f77420632b 100644 > --- a/drivers/pci/pcie/dpc.c > +++ b/drivers/pci/pcie/dpc.c > @@ -283,11 +283,12 @@ void pci_dpc_init(struct pci_dev *pdev) > static int dpc_probe(struct pcie_device *dev) > { > struct pci_dev *pdev = dev->port; > + struct pci_host_bridge *host = pci_find_host_bridge(pdev->bus); > struct device *device = &dev->device; > int status; > u16 ctl, cap; > > - if (!pcie_aer_is_native(pdev) && !pcie_ports_dpc_native) > + if (!pcie_aer_is_native(pdev) && !host->native_dpc) > return -ENOTSUPP; Wow, I don't even know what those negations mean and I don't want to take ten minutes to figure it out. Not your fault, obviously; it was that way before. "If AER is not native and DPC is not native, return -ENOTSUPP"? In other words, "if not (AER is native OR DPC is native), return -ENOTSUPP"? Or "if (AER is native OR DPC is native), keep going"? I guess this is tied up with 35a0b2378c19 ("PCI/DPC: Add "pcie_ports=dpc-native" to allow DPC without AER control") But we still ought to be able to consolidate some of this testing in acpi_pci_root_create() so we only have to look at host->native_dpc here (and maybe dev->aer_cap). > status = devm_request_threaded_irq(device, dev->irq, dpc_irq, > diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h > index af7cf237432a..0ac20feef24e 100644 > --- a/drivers/pci/pcie/portdrv.h > +++ b/drivers/pci/pcie/portdrv.h > @@ -25,8 +25,6 @@ > > #define PCIE_PORT_DEVICE_MAXSERVICES 5 > > -extern bool pcie_ports_dpc_native; > - > #ifdef CONFIG_PCIEAER > int pcie_aer_init(void); > int pcie_aer_is_native(struct pci_dev *dev); > diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c > index ccd5e0ce5605..2c0278f0fdcc 100644 > --- a/drivers/pci/pcie/portdrv_core.c > +++ b/drivers/pci/pcie/portdrv_core.c > @@ -253,7 +253,7 @@ static int get_port_device_capability(struct pci_dev *dev) > */ > if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) && > pci_aer_available() && > - (pcie_ports_dpc_native || (services & PCIE_PORT_SERVICE_AER))) > + (host->native_dpc || (services & PCIE_PORT_SERVICE_AER))) > services |= PCIE_PORT_SERVICE_DPC; > > if (pci_pcie_type(dev) == PCI_EXP_TYPE_DOWNSTREAM || > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 22207a79762c..388121ec88b5 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1559,9 +1559,11 @@ static inline int pci_irqd_intx_xlate(struct irq_domain *d, > #ifdef CONFIG_PCIEPORTBUS > extern bool pcie_ports_disabled; > extern bool pcie_ports_native; > +extern bool pcie_ports_dpc_native; > #else > #define pcie_ports_disabled true > #define pcie_ports_native false > +#define pcie_ports_dpc_native false > #endif > > #define PCIE_LINK_STATE_L0S BIT(0) > -- > 2.17.1 >
next prev parent reply index Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-27 2:57 [PATCH v11 0/5] Simplify PCIe native ownership detection logic Kuppuswamy Sathyanarayanan 2020-10-27 2:57 ` [PATCH v11 1/5] PCI: Conditionally initialize host bridge native_* members Kuppuswamy Sathyanarayanan 2020-10-28 6:09 ` Ethan Zhao 2020-10-28 17:14 ` Kuppuswamy, Sathyanarayanan 2020-10-27 2:57 ` [PATCH v11 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set Kuppuswamy Sathyanarayanan 2020-11-25 20:12 ` Bjorn Helgaas 2020-11-25 22:21 ` Kuppuswamy, Sathyanarayanan 2020-11-25 22:25 ` Bjorn Helgaas 2020-11-25 22:38 ` Kuppuswamy, Sathyanarayanan 2020-11-25 20:28 ` Bjorn Helgaas 2020-11-26 0:58 ` Kuppuswamy, Sathyanarayanan 2020-10-27 2:57 ` [PATCH v11 3/5] ACPI/PCI: Ignore _OSC DPC negotiation result if pcie_ports_dpc_native " Kuppuswamy Sathyanarayanan 2020-11-25 20:50 ` Bjorn Helgaas [this message] 2020-10-27 2:57 ` [PATCH v11 4/5] PCI/portdrv: Remove redundant pci_aer_available() check in DPC enable logic Kuppuswamy Sathyanarayanan 2020-10-28 6:00 ` Ethan Zhao 2020-10-28 17:13 ` Kuppuswamy, Sathyanarayanan 2020-11-02 9:59 ` Ethan Zhao 2020-10-27 2:57 ` [PATCH v11 5/5] PCI/DPC: Move AER/DPC dependency checks out of DPC driver Kuppuswamy Sathyanarayanan 2020-11-13 21:59 ` [PATCH v11 0/5] Simplify PCIe native ownership detection logic 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=20201125205028.GA677519@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
Linux-PCI Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-pci/0 linux-pci/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-pci linux-pci/ https://lore.kernel.org/linux-pci \ linux-pci@vger.kernel.org public-inbox-index linux-pci Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-pci AGPL code for this site: git clone https://public-inbox.org/public-inbox.git