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

Commit 18e5e691 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/aer', 'pci/enumeration', 'pci/kconfig', 'pci/misc',... 

Merge branches 'pci/aer', 'pci/enumeration', 'pci/kconfig', 'pci/misc', 'pci/virtualization' and 'pci/vpd' into next

* pci/aer:
  PCI/AER: Log aer_inject error injections
  PCI/AER: Log actual error causes in aer_inject
  PCI/AER: Use dev_warn() in aer_inject
  PCI/AER: Fix aer_inject error codes

* pci/enumeration:
  PCI: Fix broken URL for Dell biosdevname

* pci/kconfig:
  PCI: Cleanup pci/pcie/Kconfig whitespace
  PCI: Include pci/hotplug Kconfig directly from pci/Kconfig
  PCI: Include pci/pcie/Kconfig directly from pci/Kconfig

* pci/misc:
  PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition
  PCI: Add QEMU top-level IDs for (sub)vendor & device
  unicore32: Remove unused HAVE_ARCH_PCI_SET_DMA_MASK definition
  PCI: Consolidate PCI DMA constants and interfaces in linux/pci-dma-compat.h
  PCI: Move pci_dma_* helpers to common code
  frv/PCI: Remove stray pci_{alloc,free}_consistent() declaration

* pci/virtualization:
  PCI: Wait for up to 1000ms after FLR reset
  PCI: Support SR-IOV on any function type

* pci/vpd:
  PCI: Prevent VPD access for buggy devices
  PCI: Sleep rather than busy-wait for VPD access completion
  PCI: Fold struct pci_vpd_pci22 into struct pci_vpd
  PCI: Rename VPD symbols to remove unnecessary "pci22"
  PCI: Remove struct pci_vpd_ops.release function pointer
  PCI: Move pci_vpd_release() from header file to pci/access.c
  PCI: Move pci_read_vpd() and pci_write_vpd() close to other VPD code
  PCI: Determine actual VPD size on first access
  PCI: Use bitfield instead of bool for struct pci_vpd_pci22.busy
  PCI: Allow access to VPD attributes with size 0
  PCI: Update VPD definitions
parents a314966f 8e47e15e 6ca7227b cc73176c 7b78f48a 5adecf81 7c20078a

arch/alpha/include/asm/pci.h

+0 −7
Original line number Diff line number Diff line
@@ -65,13 +65,6 @@ extern void pcibios_set_master(struct pci_dev *dev); 
   decisions.  */

#define PCI_DMA_BUS_IS_PHYS  0



#ifdef CONFIG_PCI



/* implement the pci_ DMA API in terms of the generic device dma_ one */

#include <asm-generic/pci-dma-compat.h>



#endif



/* TODO: integrate with include/asm-generic/pci.h ? */

static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

{

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1212,7 +1212,6 @@ config PCI_HOST_ITE8152 
	select DMABOUNCE



source "drivers/pci/Kconfig"

source "drivers/pci/pcie/Kconfig"



source "drivers/pcmcia/Kconfig"

arch/arm/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define ASMARM_PCI_H



#ifdef __KERNEL__

#include <asm-generic/pci-dma-compat.h>

#include <asm/mach/pci.h> /* for pci_sys_data */



extern unsigned long pcibios_min_io;

arch/arm64/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -235,8 +235,6 @@ config PCI_SYSCALL 
	def_bool PCI



source "drivers/pci/Kconfig"

source "drivers/pci/pcie/Kconfig"

source "drivers/pci/hotplug/Kconfig"



endmenu

arch/arm64/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/dma-mapping.h>



#include <asm/io.h>

#include <asm-generic/pci-dma-compat.h>



#define PCIBIOS_MIN_IO		0x1000

#define PCIBIOS_MIN_MEM		0