Commit 414ae760 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/resource' into next 

* pci/resource:
  PCI: tegra: Remove PCI_REASSIGN_ALL_BUS use on Tegra
  resource: Set type when reserving new regions
  resource: Set type of "reserve=" user-specified resources
  irqchip/i8259: Set I/O port resource types correctly
  powerpc: Set I/O port resource types correctly
  MIPS: Set I/O port resource types correctly
  vgacon: Set VGA struct resource types
  PCI: Use dev_info() rather than dev_err() for ROM validation
  PCI: Remove PCI_REASSIGN_ALL_RSRC use on arm and arm64
  PCI: Remove sysfs resource mmap warning

Conflicts:
	drivers/pci/rom.c
parents 11377725 a9b94b74

Documentation/admin-guide/kernel-parameters.txt

+5 −1
Original line number Diff line number Diff line
@@ -3675,7 +3675,11 @@ 
			[KNL, SMP] Set scheduler's default relax_domain_level.

			See Documentation/cgroup-v1/cpusets.txt.



	reserve=	[KNL,BUGS] Force the kernel to ignore some iomem area

	reserve=	[KNL,BUGS] Force kernel to ignore I/O ports or memory

			Format: <base1>,<size1>[,<base2>,<size2>,...]

			Reserve I/O ports or memory so the kernel won't use

			them.  If <base> is less than 0x10000, the region

			is assumed to be I/O ports; otherwise it is memory.



	reservetop=	[X86-32]

			Format: nn[KMG]

arch/alpha/kernel/console.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
struct pci_controller *pci_vga_hose;

static struct resource alpha_vga = {

	.name	= "alpha-vga+",

	.flags	= IORESOURCE_IO,

	.start	= 0x3C0,

	.end	= 0x3DF

};

arch/arm/include/asm/pci.h

+1 −4
Original line number Diff line number Diff line
@@ -10,10 +10,7 @@ extern unsigned long pcibios_min_io; 
extern unsigned long pcibios_min_mem;

#define PCIBIOS_MIN_MEM pcibios_min_mem



static inline int pcibios_assign_all_busses(void)

{

	return pci_has_flag(PCI_REASSIGN_ALL_RSRC);

}

#define pcibios_assign_all_busses()	pci_has_flag(PCI_REASSIGN_ALL_BUS)



#ifdef CONFIG_PCI_DOMAINS

static inline int pci_proc_domain(struct pci_bus *bus)

arch/arm/kernel/bios32.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ void pci_common_init_dev(struct device *parent, struct hw_pci *hw) 
	struct pci_sys_data *sys;

	LIST_HEAD(head);



	pci_add_flags(PCI_REASSIGN_ALL_RSRC);

	pci_add_flags(PCI_REASSIGN_ALL_BUS);

	if (hw->preinit)

		hw->preinit();

	pcibios_init_hw(parent, hw, &head);

arch/mips/jazz/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -32,22 +32,22 @@ static struct resource jazz_io_resources[] = { 
		.start	= 0x00,

		.end	= 0x1f,

		.name	= "dma1",

		.flags	= IORESOURCE_BUSY

		.flags	= IORESOURCE_IO | IORESOURCE_BUSY

	}, {

		.start	= 0x40,

		.end	= 0x5f,

		.name	= "timer",

		.flags	= IORESOURCE_BUSY

		.flags	= IORESOURCE_IO | IORESOURCE_BUSY

	}, {

		.start	= 0x80,

		.end	= 0x8f,

		.name	= "dma page reg",

		.flags	= IORESOURCE_BUSY

		.flags	= IORESOURCE_IO | IORESOURCE_BUSY

	}, {

		.start	= 0xc0,

		.end	= 0xdf,

		.name	= "dma2",

		.flags	= IORESOURCE_BUSY

		.flags	= IORESOURCE_IO | IORESOURCE_BUSY

	}

};