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

Commit 0ca0ef10 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/resource' 

  - Convert pci_resource_to_user() to a weak function to remove
    HAVE_ARCH_PCI_RESOURCE_TO_USER #defines (Denis Efremov)

  - Use PCI_SRIOV_NUM_BARS for idiomatic loop structure (Denis Efremov)

  - Fix Resizable BAR size suspend/restore for 1MB BARs (Sumit Saxena)

  - Correct "pci=resource_alignment" example in documentation (Alexey
    Kardashevskiy)

* pci/resource:
  PCI: Correct pci=resource_alignment parameter example
  PCI: Restore Resizable BAR size bits correctly for 1MB BARs
  PCI: Use PCI_SRIOV_NUM_BARS in loops instead of PCI_IOV_RESOURCE_END
  PCI: Convert pci_resource_to_user() to a weak function

# Conflicts:
#	drivers/pci/pci.c
parents 203104c8 3b1b1ce3

Documentation/admin-guide/kernel-parameters.txt

+3 −2
Original line number Diff line number Diff line
@@ -3452,12 +3452,13 @@ 
				specify the device is described above.

				If <order of align> is not specified,

				PAGE_SIZE is used as alignment.

				PCI-PCI bridge can be specified, if resource

				A PCI-PCI bridge can be specified if resource

				windows need to be expanded.

				To specify the alignment for several

				instances of a device, the PCI vendor,

				device, subvendor, and subdevice may be

				specified, e.g., 4096@pci:8086:9c22:103c:198f

				specified, e.g., 12@pci:8086:9c22:103c:198f

				for 4096-byte alignment.

		ecrc=		Enable/disable PCIe ECRC (transaction layer

				end-to-end CRC checking).

				bios: Use BIOS/firmware settings. This is the

arch/microblaze/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, 
					 unsigned long size,

					 pgprot_t prot);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER



/* This part of code was originally in xilinx-pci.h */

#ifdef CONFIG_PCI_XILINX

extern void __init xilinx_pci_init(void);

arch/mips/include/asm/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ extern unsigned long PCIBIOS_MIN_MEM; 


#define HAVE_PCI_MMAP

#define ARCH_GENERIC_PCI_MMAP_RESOURCE

#define HAVE_ARCH_PCI_RESOURCE_TO_USER



/*

 * Dynamic DMA mapping stuff.

arch/powerpc/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -112,8 +112,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, 
					 unsigned long size,

					 pgprot_t prot);



#define HAVE_ARCH_PCI_RESOURCE_TO_USER



extern resource_size_t pcibios_io_space_offset(struct pci_controller *hose);

extern void pcibios_setup_bus_devices(struct pci_bus *bus);

extern void pcibios_setup_bus_self(struct pci_bus *bus);

arch/sparc/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) 
#define arch_can_pci_mmap_io()	1

#define HAVE_ARCH_PCI_GET_UNMAPPED_AREA

#define get_pci_unmapped_area get_fb_unmapped_area



#define HAVE_ARCH_PCI_RESOURCE_TO_USER

#endif /* CONFIG_SPARC64 */



#if defined(CONFIG_SPARC64) || defined(CONFIG_LEON_PCI)