Commit 4cea8776 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.8-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "Here are two changes for v4.8.  The first fixes a "[Firmware Bug]: reg
  0x10: invalid BAR (can't size)" warning on Haswell, and the second
  fixes a problem in some new runtime suspend functionality we merged
  for v4.8.  Summary:

  Enumeration:
    Mark Haswell Power Control Unit as having non-compliant BARs (Bjorn Helgaas)

  Power management:
    Fix bridge_d3 update on device removal (Lukas Wunner)"

* tag 'pci-v4.8-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Fix bridge_d3 update on device removal
  PCI: Mark Haswell Power Control Unit as having non-compliant BARs
parents 77e5bdf9 035ee288

arch/x86/pci/fixup.c

+13 −7
Original line number Diff line number Diff line
@@ -553,15 +553,21 @@ static void twinhead_reserve_killing_zone(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x27B9, twinhead_reserve_killing_zone);



/*

 * Broadwell EP Home Agent BARs erroneously return non-zero values when read.

 * Device [8086:2fc0]

 * Erratum HSE43

 * CONFIG_TDP_NOMINAL CSR Implemented at Incorrect Offset

 * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v3-spec-update.html

 *

 * See http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v4-spec-update.html

 * entry BDF2.

 * Devices [8086:6f60,6fa0,6fc0]

 * Erratum BDF2

 * PCI BARs in the Home Agent Will Return Non-Zero Values During Enumeration

 * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v4-spec-update.html

 */

static void pci_bdwep_bar(struct pci_dev *dev)

static void pci_invalid_bar(struct pci_dev *dev)

{

	dev->non_compliant_bars = 1;

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_bdwep_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_bdwep_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_bdwep_bar);
 
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_invalid_bar);

drivers/pci/remove.c

+1 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static void pci_destroy_dev(struct pci_dev *dev) 
	list_del(&dev->bus_list);

	up_write(&pci_bus_sem);



	pci_bridge_d3_device_removed(dev);

	pci_free_resources(dev);

	put_device(&dev->dev);

}
@@ -96,8 +97,6 @@ static void pci_remove_bus_device(struct pci_dev *dev) 
		dev->subordinate = NULL;

	}



	pci_bridge_d3_device_removed(dev);



	pci_destroy_dev(dev);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE