Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d850882b authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 842b447f

drivers/pci/pcie/portdrv.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include <linux/compiler.h>



extern bool pcie_ports_auto;

extern bool pcie_ports_native;



/* Service Type */

#define PCIE_PORT_SERVICE_PME_SHIFT	0	/* Power Management Event */

drivers/pci/pcie/portdrv_core.c

+4 −11
Original line number Diff line number Diff line
@@ -193,17 +193,10 @@ static int pcie_init_service_irqs(struct pci_dev *dev, int *irqs, int mask) 
static int get_port_device_capability(struct pci_dev *dev)

{

	struct pci_host_bridge *host = pci_find_host_bridge(dev->bus);

	bool native;

	int services = 0;



	/*

	 * If the user specified "pcie_ports=native", use the PCIe services

	 * 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)) {

	if (dev->is_hotplug_bridge &&

	    (pcie_ports_native || host->native_hotplug)) {

		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) &&

	    pci_aer_available() && (native || host->native_aer)) {

	    pci_aer_available() && (pcie_ports_native || host->native_aer)) {

		services |= PCIE_PORT_SERVICE_AER;



		/*
@@ -231,7 +224,7 @@ static int get_port_device_capability(struct pci_dev *dev) 
	 * those yet.

	 */

	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;



		/*

drivers/pci/pcie/portdrv_pci.c

+7 −8
Original line number Diff line number Diff line
@@ -25,19 +25,18 @@ 
bool pcie_ports_disabled;



/*

 * If this switch is set, ACPI _OSC will be used to determine whether or not to

 * enable PCIe port native services.

 * If the user specified "pcie_ports=native", use the PCIe services regardless

 * 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)

{

	if (!strncmp(str, "compat", 6)) {

	if (!strncmp(str, "compat", 6))

		pcie_ports_disabled = true;

	} else if (!strncmp(str, "native", 6)) {

		pcie_ports_disabled = false;

		pcie_ports_auto = false;

	}

	else if (!strncmp(str, "native", 6))

		pcie_ports_native = true;



	return 1;

}