From: "Kuppuswamy, Sathyanarayanan" <sathyanarayanan.kuppuswamy@linux.intel.com>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: bhelgaas@google.com, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, ashok.raj@intel.com
Subject: Re: [PATCH v8 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set.
Date: Sun, 13 Sep 2020 13:54:38 -0700 [thread overview]
Message-ID: <badc377a-09f9-aabe-0b34-9f806da4b255@linux.intel.com> (raw)
In-Reply-To: <20200910201426.GA809535@bjorn-Precision-5520>
On 9/10/20 1:14 PM, Bjorn Helgaas wrote:
> On Fri, Jul 24, 2020 at 08:58:53PM -0700, sathyanarayanan.kuppuswamy@linux.intel.com wrote:
>> From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
>>
>> pcie_ports_native is set only if user requests native handling
>> of PCIe capabilities via pcie_port_setup command line option.
>> User input takes precedence over _OSC based control negotiation
>> result. So consider the _OSC negotiated result only if
>> pcie_ports_native is unset.
>>
>> Also, since struct pci_host_bridge ->native_* members caches the
>> ownership status of various PCIe capabilities, use them instead
>> of distributed checks for pcie_ports_native.
>>
>> Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
>> ---
>> drivers/acpi/pci_root.c | 61 ++++++++++++++++++++++++++-----
>> 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, 56 insertions(+), 21 deletions(-)
>>
>> diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
>> index f90e841c59f5..f8981d4e044d 100644
>> --- a/drivers/acpi/pci_root.c
>> +++ b/drivers/acpi/pci_root.c
>> @@ -145,6 +145,17 @@ static struct pci_osc_bit_struct pci_osc_control_bit[] = {
>> { OSC_PCI_EXPRESS_DPC_CONTROL, "DPC" },
>> };
>>
>> + else
>> + dev_warn(&bus->dev, "OS overrides %s firmware control",
>> + get_osc_desc(OSC_PCI_EXPRESS_NATIVE_HP_CONTROL));
>
> There's got to be a way to write this more concisely. Maybe something
> like this?
>
> #define OSC_OWNER(ctrl, bit, flag) \
> if (!(ctrl & bit)) \
> flag = 0;
>
> if (pcie_ports_native)
> decode_osc_control(root, "OS forcibly taking over", ~0);
BIT1 and BIT6 does not have PCIe dependency. And BIT7-31 are reserved.
So we can't force all _OSC bits based on pcie_ports_native value.
So, IM0, its better to handle PCIe features seperatly.
> else {
> ctrl = root->osc_control_set;
> OSC_OWNER(ctrl, OSC_PCI_EXPRESS_AER_CONTROL, host_bridge->native_aer);
> OSC_OWNER(ctrl, OSC_PCI_EXPRESS_PME_CONTROL, host_bridge->native_pme);
> ...
> }
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
next prev parent reply other threads:[~2020-09-13 20:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-25 3:58 [PATCH v8 0/5] Simplify PCIe native ownership detection logic sathyanarayanan.kuppuswamy
2020-07-25 3:58 ` [PATCH v8 1/5] PCI: Conditionally initialize host bridge native_* members sathyanarayanan.kuppuswamy
2020-09-10 19:49 ` Bjorn Helgaas
2020-09-10 21:00 ` Kuppuswamy, Sathyanarayanan
2020-09-13 20:49 ` Kuppuswamy, Sathyanarayanan
2020-09-15 22:17 ` Bjorn Helgaas
2020-09-16 2:30 ` Kuppuswamy, Sathyanarayanan
2020-07-25 3:58 ` [PATCH v8 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set sathyanarayanan.kuppuswamy
2020-07-25 10:35 ` Andy Shevchenko
2020-09-10 20:14 ` Bjorn Helgaas
2020-09-13 20:54 ` Kuppuswamy, Sathyanarayanan [this message]
2020-09-15 22:20 ` Bjorn Helgaas
2020-09-16 2:33 ` Kuppuswamy, Sathyanarayanan
2020-07-25 3:58 ` [PATCH v8 3/5] ACPI/PCI: Ignore _OSC DPC negotiation result if pcie_ports_dpc_native " sathyanarayanan.kuppuswamy
2020-07-25 3:58 ` [PATCH v8 4/5] PCI/portdrv: Remove redundant pci_aer_available() check in DPC enable logic sathyanarayanan.kuppuswamy
2020-07-25 3:58 ` [PATCH v8 5/5] PCI/DPC: Move AER/DPC dependency checks out of DPC driver sathyanarayanan.kuppuswamy
2020-07-25 10:38 ` Andy Shevchenko
2020-08-27 18:22 ` [PATCH v8 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=badc377a-09f9-aabe-0b34-9f806da4b255@linux.intel.com \
--to=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=helgaas@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/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