* [PATCH v7 1/5] PCI: Conditionally initialize host bridge native_* members
2020-07-17 17:23 [PATCH v7 0/5] Simplify PCIe native ownership detection logic sathyanarayanan.kuppuswamy
@ 2020-07-17 17:23 ` sathyanarayanan.kuppuswamy
2020-07-17 17:23 ` [PATCH v7 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set sathyanarayanan.kuppuswamy
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: sathyanarayanan.kuppuswamy @ 2020-07-17 17:23 UTC (permalink / raw)
To: bhelgaas; +Cc: linux-pci, linux-kernel, ashok.raj, sathyanarayanan.kuppuswamy
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
If CONFIG_PCIEPORTBUS is not enabled in kernel then initialing
struct pci_host_bridge PCIe specific native_* members to "1" is
incorrect. So protect the PCIe specific member initialization
with CONFIG_PCIEPORTBUS.
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
drivers/pci/probe.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 2f66988cea25..a94b97564ceb 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -588,12 +588,14 @@ static void pci_init_host_bridge(struct pci_host_bridge *bridge)
* may implement its own AER handling and use _OSC to prevent the
* OS from interfering.
*/
+#ifdef CONFIG_PCIEPORTBUS
bridge->native_aer = 1;
bridge->native_pcie_hotplug = 1;
- bridge->native_shpc_hotplug = 1;
bridge->native_pme = 1;
bridge->native_ltr = 1;
bridge->native_dpc = 1;
+#endif
+ bridge->native_shpc_hotplug = 1;
device_initialize(&bridge->dev);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v7 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set.
2020-07-17 17:23 [PATCH v7 0/5] Simplify PCIe native ownership detection logic sathyanarayanan.kuppuswamy
2020-07-17 17:23 ` [PATCH v7 1/5] PCI: Conditionally initialize host bridge native_* members sathyanarayanan.kuppuswamy
@ 2020-07-17 17:23 ` sathyanarayanan.kuppuswamy
2020-07-18 8:01 ` kernel test robot
2020-07-18 8:01 ` kernel test robot
2020-07-17 17:23 ` [PATCH v7 3/5] ACPI/PCI: Ignore _OSC DPC negotiation result if pcie_ports_dpc_native is set sathyanarayanan.kuppuswamy
` (2 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: sathyanarayanan.kuppuswamy @ 2020-07-17 17:23 UTC (permalink / raw)
To: bhelgaas; +Cc: linux-pci, linux-kernel, ashok.raj, sathyanarayanan.kuppuswamy
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 | 62 ++++++++++++++++++++++++++-----
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, 57 insertions(+), 21 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index f90e841c59f5..a82069d064fe 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -145,6 +145,18 @@ static struct pci_osc_bit_struct pci_osc_control_bit[] = {
{ OSC_PCI_EXPRESS_DPC_CONTROL, "DPC" },
};
+static char *get_osc_desc(u32 bit)
+{
+ int len = sizeof(pci_osc_control_bit) / sizeof(pci_osc_control_bit[0]);
+ int i = 0;
+
+ for (i = 0; i <len; i++)
+ if (bit == pci_osc_control_bit[i].bit)
+ return pci_osc_control_bit[i].desc;
+
+ return NULL;
+}
+
static void decode_osc_bits(struct acpi_pci_root *root, char *msg, u32 word,
struct pci_osc_bit_struct *table, int size)
{
@@ -914,18 +926,48 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
goto out_release_info;
host_bridge = to_pci_host_bridge(bus->bridge);
- if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
- host_bridge->native_pcie_hotplug = 0;
+ if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL)) {
+ if (!pcie_ports_native)
+ host_bridge->native_pcie_hotplug = 0;
+ else
+ dev_warn(&bus->dev, "OS overrides %s firmware control",
+ get_osc_desc(OSC_PCI_EXPRESS_NATIVE_HP_CONTROL));
+ }
+
if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
host_bridge->native_shpc_hotplug = 0;
- if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
- host_bridge->native_aer = 0;
- if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
- host_bridge->native_pme = 0;
- if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
- host_bridge->native_ltr = 0;
- if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
- host_bridge->native_dpc = 0;
+
+ if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL)) {
+ if (!pcie_ports_native)
+ host_bridge->native_aer = 0;
+ else
+ dev_warn(&bus->dev, "OS overrides %s firmware control",
+ get_osc_desc(OSC_PCI_EXPRESS_AER_CONTROL));
+ }
+
+ if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL)) {
+ if (!pcie_ports_native)
+ host_bridge->native_pme = 0;
+ else
+ dev_warn(&bus->dev, "OS overrides %s firmware control",
+ get_osc_desc(OSC_PCI_EXPRESS_PME_CONTROL));
+ }
+
+ if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL)) {
+ if (!pcie_ports_native)
+ host_bridge->native_ltr = 0;
+ else
+ dev_warn(&bus->dev, "OS overrides %s firmware control",
+ get_osc_desc(OSC_PCI_EXPRESS_LTR_CONTROL));
+ }
+
+ if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL)) {
+ if (!pcie_ports_native)
+ host_bridge->native_dpc = 0;
+ else
+ dev_warn(&bus->dev, "OS overrides %s firmware control",
+ get_osc_desc(OSC_PCI_EXPRESS_DPC_CONTROL));
+ }
/*
* Evaluate the "PCI Boot Configuration" _DSM Function. If it
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index bf779f291f15..5fc999bf6f1b 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -255,7 +255,7 @@ static bool pme_is_native(struct pcie_device *dev)
const struct pci_host_bridge *host;
host = pci_find_host_bridge(dev->port->bus);
- return pcie_ports_native || host->native_pme;
+ return host->native_pme;
}
static void pciehp_disable_interrupt(struct pcie_device *dev)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 7224b1e5f2a8..e09589571a9d 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -800,9 +800,6 @@ bool pciehp_is_native(struct pci_dev *bridge)
if (!(slot_cap & PCI_EXP_SLTCAP_HPC))
return false;
- if (pcie_ports_native)
- return true;
-
host = pci_find_host_bridge(bridge->bus);
return host->native_pcie_hotplug;
}
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 3acf56683915..d663bd9c7257 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -219,7 +219,7 @@ int pcie_aer_is_native(struct pci_dev *dev)
if (!dev->aer_cap)
return 0;
- return pcie_ports_native || host->native_aer;
+ return host->native_aer;
}
int pci_enable_pcie_error_reporting(struct pci_dev *dev)
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 50a9522ab07d..ccd5e0ce5605 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -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 (dev->is_hotplug_bridge && host->native_pcie_hotplug) {
services |= PCIE_PORT_SERVICE_HP;
/*
@@ -221,8 +220,7 @@ static int get_port_device_capability(struct pci_dev *dev)
}
#ifdef CONFIG_PCIEAER
- if (dev->aer_cap && pci_aer_available() &&
- (pcie_ports_native || host->native_aer)) {
+ if (dev->aer_cap && pci_aer_available() && host->native_aer) {
services |= PCIE_PORT_SERVICE_AER;
/*
@@ -238,8 +236,7 @@ static int get_port_device_capability(struct pci_dev *dev)
* Event Collectors can also generate PMEs, but we don't handle
* those yet.
*/
- if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT &&
- (pcie_ports_native || host->native_pme)) {
+ if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT && host->native_pme) {
services |= PCIE_PORT_SERVICE_PME;
/*
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v7 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set.
2020-07-17 17:23 ` [PATCH v7 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set sathyanarayanan.kuppuswamy
@ 2020-07-18 8:01 ` kernel test robot
2020-07-18 8:01 ` kernel test robot
1 sibling, 0 replies; 12+ messages in thread
From: kernel test robot @ 2020-07-18 8:01 UTC (permalink / raw)
To: sathyanarayanan.kuppuswamy, bhelgaas
Cc: kbuild-all, linux-pci, linux-kernel, ashok.raj,
sathyanarayanan.kuppuswamy
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
Hi,
I love your patch! Perhaps something to improve:
[auto build test WARNING on pci/next]
[also build test WARNING on pm/linux-next linux/master linus/master v5.8-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/sathyanarayanan-kuppuswamy-linux-intel-com/Simplify-PCIe-native-ownership-detection-logic/20200718-012614
base: https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next
config: x86_64-randconfig-c002-20200717 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
coccinelle warnings: (new ones prefixed by >>)
>> drivers/acpi/pci_root.c:150:37-38: WARNING: Use ARRAY_SIZE
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 29970 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] ACPI/PCI: fix array_size.cocci warnings
2020-07-17 17:23 ` [PATCH v7 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set sathyanarayanan.kuppuswamy
@ 2020-07-18 8:01 ` kernel test robot
2020-07-18 8:01 ` kernel test robot
1 sibling, 0 replies; 12+ messages in thread
From: kernel test robot @ 2020-07-18 8:01 UTC (permalink / raw)
To: sathyanarayanan.kuppuswamy, bhelgaas
Cc: kbuild-all, linux-pci, linux-kernel, ashok.raj,
sathyanarayanan.kuppuswamy
From: kernel test robot <lkp@intel.com>
drivers/acpi/pci_root.c:150:37-38: WARNING: Use ARRAY_SIZE
Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element
Semantic patch information:
This makes an effort to find cases where ARRAY_SIZE can be used such as
where there is a division of sizeof the array by the sizeof its first
element or by any indexed element or the element type. It replaces the
division of the two sizeofs by ARRAY_SIZE.
Generated by: scripts/coccinelle/misc/array_size.cocci
CC: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
---
url: https://github.com/0day-ci/linux/commits/sathyanarayanan-kuppuswamy-linux-intel-com/Simplify-PCIe-native-ownership-detection-logic/20200718-012614
base: https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next
pci_root.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -147,7 +147,7 @@ static struct pci_osc_bit_struct pci_osc
static char *get_osc_desc(u32 bit)
{
- int len = sizeof(pci_osc_control_bit) / sizeof(pci_osc_control_bit[0]);
+ int len = ARRAY_SIZE(pci_osc_control_bit);
int i = 0;
for (i = 0; i <len; i++)
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH] ACPI/PCI: fix array_size.cocci warnings
@ 2020-07-18 8:01 ` kernel test robot
0 siblings, 0 replies; 12+ messages in thread
From: kernel test robot @ 2020-07-18 8:01 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]
From: kernel test robot <lkp@intel.com>
drivers/acpi/pci_root.c:150:37-38: WARNING: Use ARRAY_SIZE
Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element
Semantic patch information:
This makes an effort to find cases where ARRAY_SIZE can be used such as
where there is a division of sizeof the array by the sizeof its first
element or by any indexed element or the element type. It replaces the
division of the two sizeofs by ARRAY_SIZE.
Generated by: scripts/coccinelle/misc/array_size.cocci
CC: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
---
url: https://github.com/0day-ci/linux/commits/sathyanarayanan-kuppuswamy-linux-intel-com/Simplify-PCIe-native-ownership-detection-logic/20200718-012614
base: https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next
pci_root.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -147,7 +147,7 @@ static struct pci_osc_bit_struct pci_osc
static char *get_osc_desc(u32 bit)
{
- int len = sizeof(pci_osc_control_bit) / sizeof(pci_osc_control_bit[0]);
+ int len = ARRAY_SIZE(pci_osc_control_bit);
int i = 0;
for (i = 0; i <len; i++)
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] ACPI/PCI: fix array_size.cocci warnings
2020-07-18 8:01 ` kernel test robot
@ 2020-07-18 14:27 ` Joe Perches
-1 siblings, 0 replies; 12+ messages in thread
From: Joe Perches @ 2020-07-18 14:27 UTC (permalink / raw)
To: kernel test robot, sathyanarayanan.kuppuswamy, bhelgaas
Cc: kbuild-all, linux-pci, linux-kernel, ashok.raj
On Sat, 2020-07-18 at 16:01 +0800, kernel test robot wrote:
> From: kernel test robot <lkp@intel.com>
>
> drivers/acpi/pci_root.c:150:37-38: WARNING: Use ARRAY_SIZE
>
> Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element
[]
> static char *get_osc_desc(u32 bit)
> {
> - int len = sizeof(pci_osc_control_bit) / sizeof(pci_osc_control_bit[0]);
> + int len = ARRAY_SIZE(pci_osc_control_bit);
> int i = 0;
>
> for (i = 0; i <len; i++)
And likely better to not declare len at all
and ARRAY_SIZE directly instead.
static char *get_osc_desc(u32 bit)
{
int i;
for (i = 0; i < ARRAY_SIZE(pci_osc_control_bit); i++) {
if (bit == pci_osc_control_bit[i].bit)
return pci_osc_control_bit[i].desc;
}
return NULL;
}
and also likely both arrays should be const.
Something like:
---
drivers/acpi/pci_root.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index f90e841c59f5..bfb437cf749a 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -122,10 +122,10 @@ static acpi_status try_get_root_bridge_busnr(acpi_handle handle,
struct pci_osc_bit_struct {
u32 bit;
- char *desc;
+ const char *desc;
};
-static struct pci_osc_bit_struct pci_osc_support_bit[] = {
+static const struct pci_osc_bit_struct pci_osc_support_bit[] = {
{ OSC_PCI_EXT_CONFIG_SUPPORT, "ExtendedConfig" },
{ OSC_PCI_ASPM_SUPPORT, "ASPM" },
{ OSC_PCI_CLOCK_PM_SUPPORT, "ClockPM" },
@@ -135,7 +135,7 @@ static struct pci_osc_bit_struct pci_osc_support_bit[] = {
{ OSC_PCI_HPX_TYPE_3_SUPPORT, "HPX-Type3" },
};
-static struct pci_osc_bit_struct pci_osc_control_bit[] = {
+static const struct pci_osc_bit_struct pci_osc_control_bit[] = {
{ OSC_PCI_EXPRESS_NATIVE_HP_CONTROL, "PCIeHotplug" },
{ OSC_PCI_SHPC_NATIVE_HP_CONTROL, "SHPCHotplug" },
{ OSC_PCI_EXPRESS_PME_CONTROL, "PME" },
@@ -146,17 +146,18 @@ static struct pci_osc_bit_struct pci_osc_control_bit[] = {
};
static void decode_osc_bits(struct acpi_pci_root *root, char *msg, u32 word,
- struct pci_osc_bit_struct *table, int size)
+ const struct pci_osc_bit_struct *table, int size)
{
char buf[80];
int i, len = 0;
- struct pci_osc_bit_struct *entry;
buf[0] = '\0';
- for (i = 0, entry = table; i < size; i++, entry++)
- if (word & entry->bit)
+ for (i = 0; i < size; i++) {
+ if (word & table->bit)
len += scnprintf(buf + len, sizeof(buf) - len, "%s%s",
- len ? " " : "", entry->desc);
+ len ? " " : "", table->desc);
+ table++;
+ }
dev_info(&root->device->dev, "_OSC: %s [%s]\n", msg, buf);
}
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH] ACPI/PCI: fix array_size.cocci warnings
@ 2020-07-18 14:27 ` Joe Perches
0 siblings, 0 replies; 12+ messages in thread
From: Joe Perches @ 2020-07-18 14:27 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 2707 bytes --]
On Sat, 2020-07-18 at 16:01 +0800, kernel test robot wrote:
> From: kernel test robot <lkp@intel.com>
>
> drivers/acpi/pci_root.c:150:37-38: WARNING: Use ARRAY_SIZE
>
> Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element
[]
> static char *get_osc_desc(u32 bit)
> {
> - int len = sizeof(pci_osc_control_bit) / sizeof(pci_osc_control_bit[0]);
> + int len = ARRAY_SIZE(pci_osc_control_bit);
> int i = 0;
>
> for (i = 0; i <len; i++)
And likely better to not declare len@all
and ARRAY_SIZE directly instead.
static char *get_osc_desc(u32 bit)
{
int i;
for (i = 0; i < ARRAY_SIZE(pci_osc_control_bit); i++) {
if (bit == pci_osc_control_bit[i].bit)
return pci_osc_control_bit[i].desc;
}
return NULL;
}
and also likely both arrays should be const.
Something like:
---
drivers/acpi/pci_root.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index f90e841c59f5..bfb437cf749a 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -122,10 +122,10 @@ static acpi_status try_get_root_bridge_busnr(acpi_handle handle,
struct pci_osc_bit_struct {
u32 bit;
- char *desc;
+ const char *desc;
};
-static struct pci_osc_bit_struct pci_osc_support_bit[] = {
+static const struct pci_osc_bit_struct pci_osc_support_bit[] = {
{ OSC_PCI_EXT_CONFIG_SUPPORT, "ExtendedConfig" },
{ OSC_PCI_ASPM_SUPPORT, "ASPM" },
{ OSC_PCI_CLOCK_PM_SUPPORT, "ClockPM" },
@@ -135,7 +135,7 @@ static struct pci_osc_bit_struct pci_osc_support_bit[] = {
{ OSC_PCI_HPX_TYPE_3_SUPPORT, "HPX-Type3" },
};
-static struct pci_osc_bit_struct pci_osc_control_bit[] = {
+static const struct pci_osc_bit_struct pci_osc_control_bit[] = {
{ OSC_PCI_EXPRESS_NATIVE_HP_CONTROL, "PCIeHotplug" },
{ OSC_PCI_SHPC_NATIVE_HP_CONTROL, "SHPCHotplug" },
{ OSC_PCI_EXPRESS_PME_CONTROL, "PME" },
@@ -146,17 +146,18 @@ static struct pci_osc_bit_struct pci_osc_control_bit[] = {
};
static void decode_osc_bits(struct acpi_pci_root *root, char *msg, u32 word,
- struct pci_osc_bit_struct *table, int size)
+ const struct pci_osc_bit_struct *table, int size)
{
char buf[80];
int i, len = 0;
- struct pci_osc_bit_struct *entry;
buf[0] = '\0';
- for (i = 0, entry = table; i < size; i++, entry++)
- if (word & entry->bit)
+ for (i = 0; i < size; i++) {
+ if (word & table->bit)
len += scnprintf(buf + len, sizeof(buf) - len, "%s%s",
- len ? " " : "", entry->desc);
+ len ? " " : "", table->desc);
+ table++;
+ }
dev_info(&root->device->dev, "_OSC: %s [%s]\n", msg, buf);
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v7 3/5] ACPI/PCI: Ignore _OSC DPC negotiation result if pcie_ports_dpc_native is set.
2020-07-17 17:23 [PATCH v7 0/5] Simplify PCIe native ownership detection logic sathyanarayanan.kuppuswamy
2020-07-17 17:23 ` [PATCH v7 1/5] PCI: Conditionally initialize host bridge native_* members sathyanarayanan.kuppuswamy
2020-07-17 17:23 ` [PATCH v7 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set sathyanarayanan.kuppuswamy
@ 2020-07-17 17:23 ` sathyanarayanan.kuppuswamy
2020-07-17 17:23 ` [PATCH v7 4/5] PCI/portdrv: Remove redundant pci_aer_available() check in DPC enable logic sathyanarayanan.kuppuswamy
2020-07-17 17:23 ` [PATCH v7 5/5] PCI/DPC: Move AER/DPC dependency checks out of DPC driver sathyanarayanan.kuppuswamy
4 siblings, 0 replies; 12+ messages in thread
From: sathyanarayanan.kuppuswamy @ 2020-07-17 17:23 UTC (permalink / raw)
To: bhelgaas; +Cc: linux-pci, linux-kernel, ashok.raj, sathyanarayanan.kuppuswamy
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
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 | 2 +-
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, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index a82069d064fe..a7bc1a864b14 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -962,7 +962,7 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
}
if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL)) {
- if (!pcie_ports_native)
+ if (!pcie_ports_native && !pcie_ports_dpc_native)
host_bridge->native_dpc = 0;
else
dev_warn(&bus->dev, "OS overrides %s firmware control",
diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
index daa9a4153776..5b1025a2994d 100644
--- a/drivers/pci/pcie/dpc.c
+++ b/drivers/pci/pcie/dpc.c
@@ -280,11 +280,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;
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 34c1c4f45288..fe7ce06a4f40 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1556,9 +1556,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
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v7 4/5] PCI/portdrv: Remove redundant pci_aer_available() check in DPC enable logic
2020-07-17 17:23 [PATCH v7 0/5] Simplify PCIe native ownership detection logic sathyanarayanan.kuppuswamy
` (2 preceding siblings ...)
2020-07-17 17:23 ` [PATCH v7 3/5] ACPI/PCI: Ignore _OSC DPC negotiation result if pcie_ports_dpc_native is set sathyanarayanan.kuppuswamy
@ 2020-07-17 17:23 ` sathyanarayanan.kuppuswamy
2020-07-17 17:23 ` [PATCH v7 5/5] PCI/DPC: Move AER/DPC dependency checks out of DPC driver sathyanarayanan.kuppuswamy
4 siblings, 0 replies; 12+ messages in thread
From: sathyanarayanan.kuppuswamy @ 2020-07-17 17:23 UTC (permalink / raw)
To: bhelgaas; +Cc: linux-pci, linux-kernel, ashok.raj, sathyanarayanan.kuppuswamy
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
In DPC service enable logic, check for
services & PCIE_PORT_SERVICE_AER implies pci_aer_available()
is true. So there is no need to explicitly check it again.
Also, passing pcie_ports=dpc-native in kernel command line
implies DPC needs to be enabled in native mode irrespective
of AER ownership status. So checking for pci_aer_available()
without checking for pcie_ports status is incorrect.
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
drivers/pci/pcie/portdrv_core.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 2c0278f0fdcc..e257a2ca3595 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -252,7 +252,6 @@ static int get_port_device_capability(struct pci_dev *dev)
* permission to use AER.
*/
if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
- pci_aer_available() &&
(host->native_dpc || (services & PCIE_PORT_SERVICE_AER)))
services |= PCIE_PORT_SERVICE_DPC;
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v7 5/5] PCI/DPC: Move AER/DPC dependency checks out of DPC driver
2020-07-17 17:23 [PATCH v7 0/5] Simplify PCIe native ownership detection logic sathyanarayanan.kuppuswamy
` (3 preceding siblings ...)
2020-07-17 17:23 ` [PATCH v7 4/5] PCI/portdrv: Remove redundant pci_aer_available() check in DPC enable logic sathyanarayanan.kuppuswamy
@ 2020-07-17 17:23 ` sathyanarayanan.kuppuswamy
4 siblings, 0 replies; 12+ messages in thread
From: sathyanarayanan.kuppuswamy @ 2020-07-17 17:23 UTC (permalink / raw)
To: bhelgaas; +Cc: linux-pci, linux-kernel, ashok.raj, sathyanarayanan.kuppuswamy
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Currently, AER and DPC Capabilities dependency checks is
distributed between DPC and portdrv service drivers. So move
them out of DPC driver.
Also, since services & PCIE_PORT_SERVICE_AER check already
ensures AER native ownership, no need to add additional
pcie_aer_is_native() check.
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
drivers/pci/pcie/dpc.c | 3 ---
drivers/pci/pcie/portdrv_core.c | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
index 5b1025a2994d..3efbe43764f3 100644
--- a/drivers/pci/pcie/dpc.c
+++ b/drivers/pci/pcie/dpc.c
@@ -285,9 +285,6 @@ static int dpc_probe(struct pcie_device *dev)
int status;
u16 ctl, cap;
- if (!pcie_aer_is_native(pdev) && !host->native_dpc)
- return -ENOTSUPP;
-
status = devm_request_threaded_irq(device, dev->irq, dpc_irq,
dpc_handler, IRQF_SHARED,
"pcie-dpc", pdev);
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index e257a2ca3595..ffa1d9fc458e 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -252,6 +252,7 @@ static int get_port_device_capability(struct pci_dev *dev)
* permission to use AER.
*/
if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC) &&
+ host->native_dpc &&
(host->native_dpc || (services & PCIE_PORT_SERVICE_AER)))
services |= PCIE_PORT_SERVICE_DPC;
--
2.17.1
^ permalink raw reply related [flat|nested] 12+ messages in thread