UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI/portdrv: Rename and reverse sense of pcie_ports_auto 

The platform may restrict the OS's use of PCIe services, e.g., via the ACPI
_OSC method.  The user may use "pcie_ports=native" to force the port driver
to use PCIe services even if the platform asked us not to.

The "pcie_ports=native" parameter determines the setting of
pcie_ports_auto.  Rename this to pcie_ports_native and reverse the
sense to simplify the code.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2018-03-09 11:21:30 -06:00 committed by Bjorn Helgaas
parent 842b447f00
commit d850882b72
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/pcie/portdrv.h
View File

@ -12,7 +12,7 @@
#include <linux/compiler.h> #include <linux/compiler.h>
extern bool pcie_ports_auto; extern bool pcie_ports_native;
/* Service Type */ /* Service Type */
#define PCIE_PORT_SERVICE_PME_SHIFT 0 /* Power Management Event */ #define PCIE_PORT_SERVICE_PME_SHIFT 0 /* Power Management Event */

15
drivers/pci/pcie/portdrv_core.c
View File

@ -193,17 +193,10 @@ legacy_irq:
static int get_port_device_capability(struct pci_dev *dev) static int get_port_device_capability(struct pci_dev *dev)
{ {
struct pci_host_bridge *host = pci_find_host_bridge(dev->bus); struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);
bool native;
int services = 0; int services = 0;
/* if (dev->is_hotplug_bridge &&
* If the user specified "pcie_ports=native", use the PCIe services (pcie_ports_native || host->native_hotplug)) {
* regardless of whether the platform has given us permission. On
* ACPI systems, this means we ignore _OSC.
*/
native = !pcie_ports_auto;
if (dev->is_hotplug_bridge && (native || host->native_hotplug)) {
services |= PCIE_PORT_SERVICE_HP; services |= PCIE_PORT_SERVICE_HP;
/* /*
@ -215,7 +208,7 @@ static int get_port_device_capability(struct pci_dev *dev)
} }
if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR) && if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR) &&
pci_aer_available() && (native || host->native_aer)) { pci_aer_available() && (pcie_ports_native || host->native_aer)) {
services |= PCIE_PORT_SERVICE_AER; services |= PCIE_PORT_SERVICE_AER;
/* /*
@ -231,7 +224,7 @@ static int get_port_device_capability(struct pci_dev *dev)
* those yet. * those yet.
*/ */
if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT && if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT &&
(native || host->native_pme)) { (pcie_ports_native || host->native_pme)) {
services |= PCIE_PORT_SERVICE_PME; services |= PCIE_PORT_SERVICE_PME;
/* /*

15
drivers/pci/pcie/portdrv_pci.c
View File

@ -25,19 +25,18 @@
bool pcie_ports_disabled; bool pcie_ports_disabled;
/* /*
* If this switch is set, ACPI _OSC will be used to determine whether or not to * If the user specified "pcie_ports=native", use the PCIe services regardless
* enable PCIe port native services. * of whether the platform has given us permission. On ACPI systems, this
* means we ignore _OSC.
*/ */
bool pcie_ports_auto = true; bool pcie_ports_native;
static int __init pcie_port_setup(char *str) static int __init pcie_port_setup(char *str)
{ {
if (!strncmp(str, "compat", 6)) { if (!strncmp(str, "compat", 6))
pcie_ports_disabled = true; pcie_ports_disabled = true;
} else if (!strncmp(str, "native", 6)) { else if (!strncmp(str, "native", 6))
pcie_ports_disabled = false; pcie_ports_native = true;
pcie_ports_auto = false;
}
return 1; return 1;
} }