From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 1 Aug 2016 17:23:44 +0000 (-0500)
Subject: Merge branch 'pci/resource' into next
X-Git-Tag: v4.8-rc1~56^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3efc7023787f8a6ddc50fa96707614677a568466;p=karo-tx-linux.git

Merge branch 'pci/resource' into next

* pci/resource:
  unicore32/PCI: Remove pci=firmware command line parameter handling
  ARM/PCI: Remove arch-specific pcibios_enable_device()
  ARM64/PCI: Remove arch-specific pcibios_enable_device()
  MIPS/PCI: Claim bus resources on PCI_PROBE_ONLY set-ups
  ARM/PCI: Claim bus resources on PCI_PROBE_ONLY set-ups
  PCI: generic: Claim bus resources on PCI_PROBE_ONLY set-ups
  PCI: Add generic pci_bus_claim_resources()
  alx: Use pci_(request|release)_mem_regions
  ethernet/intel: Use pci_(request|release)_mem_regions
  GenWQE: Use pci_(request|release)_mem_regions
  lpfc: Use pci_(request|release)_mem_regions
  NVMe: Use pci_(request|release)_mem_regions
  PCI: Add helpers to request/release memory and I/O regions
  PCI: Extending pci=resource_alignment to specify device/vendor IDs
  sparc/PCI: Implement pci_resource_to_user() with pcibios_resource_to_bus()
  powerpc/pci: Implement pci_resource_to_user() with pcibios_resource_to_bus()
  microblaze/PCI: Implement pci_resource_to_user() with pcibios_resource_to_bus()
  PCI: Unify pci_resource_to_user() declarations
  microblaze/PCI: Remove useless __pci_mmap_set_pgprot()
  powerpc/pci: Remove __pci_mmap_set_pgprot()
  PCI: Ignore write combining when mapping I/O port space
---

3efc7023787f8a6ddc50fa96707614677a568466
diff --cc arch/arm64/kernel/pci.c
index 94cd43c20130,39cfa032ffa7..acf38722457b
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@@ -39,30 -36,12 +39,17 @@@ resource_size_t pcibios_align_resource(
  	return res->start;
  }
  
- /**
-  * pcibios_enable_device - Enable I/O and memory.
-  * @dev: PCI device to be enabled
-  * @mask: bitmask of BARs to enable
-  */
- int pcibios_enable_device(struct pci_dev *dev, int mask)
- {
- 	if (pci_has_flag(PCI_PROBE_ONLY))
- 		return 0;
- 
- 	return pci_enable_resources(dev, mask);
- }
- 
  /*
 - * Try to assign the IRQ number from DT when adding a new device
 + * Try to assign the IRQ number when probing a new device
   */
 -int pcibios_add_device(struct pci_dev *dev)
 +int pcibios_alloc_irq(struct pci_dev *dev)
  {
 -	dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
 +	if (acpi_disabled)
 +		dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
 +#ifdef CONFIG_ACPI
 +	else
 +		return acpi_pci_irq_enable(dev);
 +#endif
  
  	return 0;
  }