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

Commit 755bda3f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI/ASPM: Warn when driver asks to disable ASPM, but we can't do it
  sparc/PCI: Use PCI_UNKNOWN for unknown power state
  powerpc/PCI: Use PCI_UNKNOWN for unknown power state
  PCI/ACPI: Check acpi_resource_to_address64() return value
  PCI: Work around Ivytown NTB BAR size issue
parents f722406f 2add0ec1

arch/powerpc/kernel/pci_of_scan.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 
	pr_debug("    class: 0x%x\n", dev->class);

	pr_debug("    revision: 0x%x\n", dev->revision);



	dev->current_state = 4;		/* unknown power state */

	dev->current_state = PCI_UNKNOWN;	/* unknown power state */

	dev->error_state = pci_channel_io_normal;

	dev->dma_mask = 0xffffffff;

arch/sparc/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
	if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE)

		pci_set_master(dev);



	dev->current_state = 4;		/* unknown power state */

	dev->current_state = PCI_UNKNOWN;	/* unknown power state */

	dev->error_state = pci_channel_io_normal;

	dev->dma_mask = 0xffffffff;

drivers/acpi/pci_root.c

+3 −4
Original line number Diff line number Diff line
@@ -100,13 +100,12 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data) 
{

	struct resource *res = data;

	struct acpi_resource_address64 address;

	acpi_status status;



	if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 &&

	    resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 &&

	    resource->type != ACPI_RESOURCE_TYPE_ADDRESS64)

	status = acpi_resource_to_address64(resource, &address);

	if (ACPI_FAILURE(status))

		return AE_OK;



	acpi_resource_to_address64(resource, &address);

	if ((address.address_length > 0) &&

	    (address.resource_type == ACPI_BUS_NUMBER_RANGE)) {

		res->start = address.minimum;

drivers/pci/pcie/aspm.c

+13 −3
Original line number Diff line number Diff line
@@ -724,9 +724,6 @@ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem, 
	struct pci_dev *parent = pdev->bus->self;

	struct pcie_link_state *link;



	if (aspm_disabled && !force)

		return;



	if (!pci_is_pcie(pdev))

		return;
@@ -736,6 +733,19 @@ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem, 
	if (!parent || !parent->link_state)

		return;



	/*

	 * A driver requested that ASPM be disabled on this device, but

	 * if we don't have permission to manage ASPM (e.g., on ACPI

	 * systems we have to observe the FADT ACPI_FADT_NO_ASPM bit and

	 * the _OSC method), we can't honor that request.  Windows has

	 * a similar mechanism using "PciASPMOptOut", which is also

	 * ignored in this situation.

	 */

	if (aspm_disabled && !force) {

		dev_warn(&pdev->dev, "can't disable ASPM; OS doesn't have ASPM control\n");

		return;

	}



	if (sem)

		down_read(&pci_bus_sem);

	mutex_lock(&aspm_lock);

drivers/pci/quirks.c

+25 −0
Original line number Diff line number Diff line
@@ -2865,6 +2865,31 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);





/*

 * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum.  To

 * work around this, query the size it should be configured to by the device and

 * modify the resource end to correspond to this new size.

 */

static void quirk_intel_ntb(struct pci_dev *dev)

{

	int rc;

	u8 val;



	rc = pci_read_config_byte(dev, 0x00D0, &val);

	if (rc)

		return;



	dev->resource[2].end = dev->resource[2].start + ((u64) 1 << val) - 1;



	rc = pci_read_config_byte(dev, 0x00D1, &val);

	if (rc)

		return;



	dev->resource[4].end = dev->resource[4].start + ((u64) 1 << val) - 1;

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);



static ktime_t fixup_debug_start(struct pci_dev *dev,

				 void (*fn)(struct pci_dev *dev))

{