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

Commit 1f9a30ec authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/aer', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/resource'... 

Merge branches 'pci/aer', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/resource' and 'pci/virtualization' into next

* pci/aer:
  PCI/AER: Clear error status registers during enumeration and restore

* pci/hotplug:
  PCI: pciehp: Queue power work requests in dedicated function

* pci/misc:
  PCI: Turn off Request Attributes to avoid Chelsio T5 Completion erratum
  x86/PCI: Make pci_subsys_init() static
  PCI: Add builtin_pci_driver() to avoid registration boilerplate
  PCI: Remove unnecessary "if" statement

* pci/msi:
  x86/PCI: Don't alloc pcibios-irq when MSI is enabled
  PCI/MSI: Export all remapped MSIs to sysfs attributes
  PCI: Disable MSI on SiS 761

* pci/resource:
  sparc/PCI: Add mem64 resource parsing for root bus
  PCI: Expand Enhanced Allocation BAR output
  PCI: Make Enhanced Allocation bitmasks more obvious
  PCI: Handle Enhanced Allocation capability for SR-IOV devices
  PCI: Add support for Enhanced Allocation devices
  PCI: Add Enhanced Allocation register entries
  PCI: Handle IORESOURCE_PCI_FIXED when assigning resources
  PCI: Handle IORESOURCE_PCI_FIXED when sizing resources
  PCI: Clear IORESOURCE_UNSET when reverting to firmware-assigned address

* pci/virtualization:
  PCI: Fix sriov_enable() error path for pcibios_enable_sriov() failures
  PCI: Wait 1 second between disabling VFs and clearing NumVFs
  PCI: Reorder pcibios_sriov_disable()
  PCI: Remove VFs in reverse order if virtfn_add() fails
  PCI: Remove redundant validation of SR-IOV offset/stride registers
  PCI: Set SR-IOV NumVFs to zero after enumeration
  PCI: Enable SR-IOV ARI Capable Hierarchy before reading TotalVFs
  PCI: Don't try to restore VF BARs
parents 6ff33f39 b07461a8 bee67756 c56d4450 8affb487 af86fa40 c23b6135

arch/sparc/kernel/pci.c

+6 −1
Original line number Diff line number Diff line
@@ -185,8 +185,10 @@ static unsigned long pci_parse_of_flags(u32 addr0) 


	if (addr0 & 0x02000000) {

		flags = IORESOURCE_MEM | PCI_BASE_ADDRESS_SPACE_MEMORY;

		flags |= (addr0 >> 22) & PCI_BASE_ADDRESS_MEM_TYPE_64;

		flags |= (addr0 >> 28) & PCI_BASE_ADDRESS_MEM_TYPE_1M;

		if (addr0 & 0x01000000)

			flags |= IORESOURCE_MEM_64

				 | PCI_BASE_ADDRESS_MEM_TYPE_64;

		if (addr0 & 0x40000000)

			flags |= IORESOURCE_PREFETCH

				 | PCI_BASE_ADDRESS_MEM_PREFETCH;
@@ -655,6 +657,9 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm, 
				pbm->io_space.start);

	pci_add_resource_offset(&resources, &pbm->mem_space,

				pbm->mem_space.start);

	if (pbm->mem64_space.flags)

		pci_add_resource_offset(&resources, &pbm->mem64_space,

					pbm->mem_space.start);

	pbm->busn.start = pbm->pci_first_busno;

	pbm->busn.end	= pbm->pci_last_busno;

	pbm->busn.flags	= IORESOURCE_BUS;

arch/sparc/kernel/pci_common.c

+15 −2
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm) 
	}



	num_pbm_ranges = i / sizeof(*pbm_ranges);

	memset(&pbm->mem64_space, 0, sizeof(struct resource));



	for (i = 0; i < num_pbm_ranges; i++) {

		const struct linux_prom_pci_ranges *pr = &pbm_ranges[i];
@@ -451,7 +452,12 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm) 
			break;



		case 3:

			/* XXX 64-bit MEM handling XXX */

			/* 64-bit MEM handling */

			pbm->mem64_space.start = a;

			pbm->mem64_space.end = a + size - 1UL;

			pbm->mem64_space.flags = IORESOURCE_MEM;

			saw_mem = 1;

			break;



		default:

			break;
@@ -465,15 +471,22 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm) 
		prom_halt();

	}



	printk("%s: PCI IO[%llx] MEM[%llx]\n",

	printk("%s: PCI IO[%llx] MEM[%llx]",

	       pbm->name,

	       pbm->io_space.start,

	       pbm->mem_space.start);

	if (pbm->mem64_space.flags)

		printk(" MEM64[%llx]",

		       pbm->mem64_space.start);

	printk("\n");



	pbm->io_space.name = pbm->mem_space.name = pbm->name;

	pbm->mem64_space.name = pbm->name;



	request_resource(&ioport_resource, &pbm->io_space);

	request_resource(&iomem_resource, &pbm->mem_space);

	if (pbm->mem64_space.flags)

		request_resource(&iomem_resource, &pbm->mem64_space);



	pci_register_legacy_regions(&pbm->io_space,

				    &pbm->mem_space);

arch/sparc/kernel/pci_impl.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ struct pci_pbm_info { 
	/* PBM I/O and Memory space resources. */

	struct resource			io_space;

	struct resource			mem_space;

	struct resource			mem64_space;

	struct resource			busn;



	/* Base of PCI Config space, can be per-PBM or shared. */

arch/x86/pci/common.c

+8 −0
Original line number Diff line number Diff line
@@ -674,6 +674,14 @@ int pcibios_add_device(struct pci_dev *dev) 


int pcibios_alloc_irq(struct pci_dev *dev)

{

	/*

	 * If the PCI device was already claimed by core code and has

	 * MSI enabled, probing of the pcibios IRQ will overwrite

	 * dev->irq.  So bail out if MSI is already enabled.

	 */

	if (pci_dev_msi_enabled(dev))

		return -EBUSY;



	return pcibios_enable_irq(dev);

}

arch/x86/pci/legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void pcibios_scan_specific_bus(int busn) 
}

EXPORT_SYMBOL_GPL(pcibios_scan_specific_bus);



int __init pci_subsys_init(void)

static int __init pci_subsys_init(void)

{

	/*

	 * The init function returns an non zero value when