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

17 files changed, 79 insertions, 52 deletions

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 6571fbfdb2a1..78cdf6a637fc 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -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]
diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c
index 8e9a41966881..5476279329a6 100644
--- a/arch/alpha/kernel/console.c
+++ b/arch/alpha/kernel/console.c
@@ -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
 };
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h
index 960d9dc4f380..1f0de808d111 100644
--- a/arch/arm/include/asm/pci.h
+++ b/arch/arm/include/asm/pci.h
@@ -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)
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 0cd0aefb3a8f..ed46ca69813d 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -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);
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index e4374a5651ce..448fd41792e4 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -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
         }
 };
 
diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c
index de34adb76157..7b63914d2e58 100644
--- a/arch/mips/mti-malta/malta-setup.c
+++ b/arch/mips/mti-malta/malta-setup.c
@@ -47,31 +47,31 @@ static struct resource standard_io_resources[] = {
                 .name = "dma1",
                 .start = 0x00,
                 .end = 0x1f,
-                .flags = IORESOURCE_BUSY
+                .flags = IORESOURCE_IO | IORESOURCE_BUSY
         },
         {
                 .name = "timer",
                 .start = 0x40,
                 .end = 0x5f,
-                .flags = IORESOURCE_BUSY
+                .flags = IORESOURCE_IO | IORESOURCE_BUSY
         },
         {
                 .name = "keyboard",
                 .start = 0x60,
                 .end = 0x6f,
-                .flags = IORESOURCE_BUSY
+                .flags = IORESOURCE_IO | IORESOURCE_BUSY
         },
         {
                 .name = "dma page reg",
                 .start = 0x80,
                 .end = 0x8f,
-                .flags = IORESOURCE_BUSY
+                .flags = IORESOURCE_IO | IORESOURCE_BUSY
         },
         {
                 .name = "dma2",
                 .start = 0xc0,
                 .end = 0xdf,
-                .flags = IORESOURCE_BUSY
+                .flags = IORESOURCE_IO | IORESOURCE_BUSY
         },
 };
 
diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c
index 81799d70a1ee..cfddc87f81bf 100644
--- a/arch/powerpc/platforms/maple/time.c
+++ b/arch/powerpc/platforms/maple/time.c
@@ -134,7 +134,7 @@ int maple_set_rtc_time(struct rtc_time *tm)
 
 static struct resource rtc_iores = {
         .name = "rtc",
-        .flags = IORESOURCE_BUSY,
+        .flags = IORESOURCE_IO | IORESOURCE_BUSY,
 };
 
 unsigned long __init maple_get_boot_time(void)
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index bafb014e1a7e..cb9a8b71fd0f 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -145,21 +145,21 @@ static struct resource pic1_iores = {
         .name = "8259 (master)",
         .start = 0x20,
         .end = 0x21,
-        .flags = IORESOURCE_BUSY,
+        .flags = IORESOURCE_IO | IORESOURCE_BUSY,
 };
 
 static struct resource pic2_iores = {
         .name = "8259 (slave)",
         .start = 0xa0,
         .end = 0xa1,
-        .flags = IORESOURCE_BUSY,
+        .flags = IORESOURCE_IO | IORESOURCE_BUSY,
 };
 
 static struct resource pic_edgectrl_iores = {
         .name = "8259 edge control",
         .start = 0x4d0,
         .end = 0x4d1,
-        .flags = IORESOURCE_BUSY,
+        .flags = IORESOURCE_IO | IORESOURCE_BUSY,
 };
 
 static int i8259_host_match(struct irq_domain *h, struct device_node *node,
diff --git a/drivers/irqchip/irq-i8259.c b/drivers/irqchip/irq-i8259.c
index 7aafbb091b67..b0d4aab1a58c 100644
--- a/drivers/irqchip/irq-i8259.c
+++ b/drivers/irqchip/irq-i8259.c
@@ -289,14 +289,14 @@ static struct resource pic1_io_resource = {
         .name = "pic1",
         .start = PIC_MASTER_CMD,
         .end = PIC_MASTER_IMR,
-        .flags = IORESOURCE_BUSY
+        .flags = IORESOURCE_IO | IORESOURCE_BUSY
 };
 
 static struct resource pic2_io_resource = {
         .name = "pic2",
         .start = PIC_SLAVE_CMD,
         .end = PIC_SLAVE_IMR,
-        .flags = IORESOURCE_BUSY
+        .flags = IORESOURCE_IO | IORESOURCE_BUSY
 };
 
 static int i8259A_irq_domain_map(struct irq_domain *d, unsigned int virq,
diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c
index 44a47d4f0b8f..c4b891c84703 100644
--- a/drivers/pci/host/pci-host-common.c
+++ b/drivers/pci/host/pci-host-common.c
@@ -142,7 +142,7 @@ int pci_host_common_probe(struct platform_device *pdev,
 
         /* Do not reassign resources if probe only */
         if (!pci_has_flag(PCI_PROBE_ONLY))
-                pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
+                pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
         list_splice_init(&resources, &bridge->windows);
         bridge->dev.parent = dev;
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index f9d3960dc39f..67328a21d0ee 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -2382,7 +2382,6 @@ static int tegra_pcie_probe(struct platform_device *pdev)
 
         tegra_pcie_enable_ports(pcie);
 
-        pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
         host->busnr = pcie->busn.start;
         host->dev.parent = &pdev->dev;
         host->ops = &tegra_pcie_ops;
diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c
index d417acab0ecf..2a2dfcd68e86 100644
--- a/drivers/pci/host/pci-versatile.c
+++ b/drivers/pci/host/pci-versatile.c
@@ -202,7 +202,7 @@ static int versatile_pci_probe(struct platform_device *pdev)
         writel(0, versatile_cfg_base[0] + PCI_INTERRUPT_LINE);
 
         pci_add_flags(PCI_ENABLE_PROC_DOMAINS);
-        pci_add_flags(PCI_REASSIGN_ALL_BUS | PCI_REASSIGN_ALL_RSRC);
+        pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
         list_splice_init(&pci_res, &bridge->windows);
         bridge->dev.parent = dev;
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 52ab3cb0a0bf..2ef5ff9cddf6 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -459,7 +459,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie)
 
         rcar_pcie_setup(&bridge->windows, pcie);
 
-        pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS);
+        pci_add_flags(PCI_REASSIGN_ALL_BUS);
 
         bridge->dev.parent = dev;
         bridge->sysdata = pcie;
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index c7941a0512a5..7b282f4ba8dc 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1216,14 +1216,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
         if (res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start))
                 return -EINVAL;
 
-        if (!pci_mmap_fits(pdev, bar, vma, PCI_MMAP_SYSFS)) {
-                WARN(1, "process \"%s\" tried to map 0x%08lx bytes at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n",
-                        current->comm, vma->vm_end-vma->vm_start, vma->vm_pgoff,
-                        pci_name(pdev), bar,
-                        (u64)pci_resource_start(pdev, bar),
-                        (u64)pci_resource_len(pdev, bar));
+        if (!pci_mmap_fits(pdev, bar, vma, PCI_MMAP_SYSFS))
                 return -EINVAL;
-        }
+
         mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io;
 
         return pci_mmap_resource_range(pdev, bar, vma, mmap_type, write_combine);
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 61f9e8a5ea8b..2f8fcd9ba5c1 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -92,15 +92,15 @@ size_t pci_get_rom_size(struct pci_dev *pdev, void __iomem *rom, size_t size)
                 void __iomem *pds;
                 /* Standard PCI ROMs start out with these bytes 55 AA */
                 if (readw(image) != 0xAA55) {
-                        pci_err(pdev, "Invalid PCI ROM header signature: expecting 0xaa55, got %#06x\n",
-                                readw(image));
+                        pci_info(pdev, "Invalid PCI ROM header signature: expecting 0xaa55, got %#06x\n",
+                                 readw(image));
                         break;
                 }
                 /* get the PCI data structure and check its "PCIR" signature */
                 pds = image + readw(image + 24);
                 if (readl(pds) != 0x52494350) {
-                        pci_err(pdev, "Invalid PCI ROM data signature: expecting 0x52494350, got %#010x\n",
-                                readl(pds));
+                        pci_info(pdev, "Invalid PCI ROM data signature: expecting 0x52494350, got %#010x\n",
+                                 readl(pds));
                         break;
                 }
                 last_image = readb(pds + 21) & 0x80;
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 445b1dc5d441..a17ba1465815 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -422,7 +422,10 @@ static const char *vgacon_startup(void)
                 vga_video_port_val = VGA_CRT_DM;
                 if ((screen_info.orig_video_ega_bx & 0xff) != 0x10) {
                         static struct resource ega_console_resource =
-                            { .name = "ega", .start = 0x3B0, .end = 0x3BF };
+                            { .name     = "ega",
+                              .flags    = IORESOURCE_IO,
+                              .start    = 0x3B0,
+                              .end      = 0x3BF };
                         vga_video_type = VIDEO_TYPE_EGAM;
                         vga_vram_size = 0x8000;
                         display_desc = "EGA+";
@@ -430,9 +433,15 @@ static const char *vgacon_startup(void)
                                          &ega_console_resource);
                 } else {
                         static struct resource mda1_console_resource =
-                            { .name = "mda", .start = 0x3B0, .end = 0x3BB };
+                            { .name     = "mda",
+                              .flags    = IORESOURCE_IO,
+                              .start    = 0x3B0,
+                              .end      = 0x3BB };
                         static struct resource mda2_console_resource =
-                            { .name = "mda", .start = 0x3BF, .end = 0x3BF };
+                            { .name     = "mda",
+                              .flags    = IORESOURCE_IO,
+                              .start    = 0x3BF,
+                              .end      = 0x3BF };
                         vga_video_type = VIDEO_TYPE_MDA;
                         vga_vram_size = 0x2000;
                         display_desc = "*MDA";
@@ -454,15 +463,21 @@ static const char *vgacon_startup(void)
                         vga_vram_size = 0x8000;
 
                         if (!screen_info.orig_video_isVGA) {
-                                static struct resource ega_console_resource
-                                    = { .name = "ega", .start = 0x3C0, .end = 0x3DF };
+                                static struct resource ega_console_resource =
+                                    { .name     = "ega",
+                                      .flags    = IORESOURCE_IO,
+                                      .start    = 0x3C0,
+                                      .end      = 0x3DF };
                                 vga_video_type = VIDEO_TYPE_EGAC;
                                 display_desc = "EGA";
                                 request_resource(&ioport_resource,
                                                  &ega_console_resource);
                         } else {
-                                static struct resource vga_console_resource
-                                    = { .name = "vga+", .start = 0x3C0, .end = 0x3DF };
+                                static struct resource vga_console_resource =
+                                    { .name     = "vga+",
+                                      .flags    = IORESOURCE_IO,
+                                      .start    = 0x3C0,
+                                      .end      = 0x3DF };
                                 vga_video_type = VIDEO_TYPE_VGAC;
                                 display_desc = "VGA+";
                                 request_resource(&ioport_resource,
@@ -494,7 +509,10 @@ static const char *vgacon_startup(void)
                         }
                 } else {
                         static struct resource cga_console_resource =
-                            { .name = "cga", .start = 0x3D4, .end = 0x3D5 };
+                            { .name     = "cga",
+                              .flags    = IORESOURCE_IO,
+                              .start    = 0x3D4,
+                              .end      = 0x3D5 };
                         vga_video_type = VIDEO_TYPE_CGA;
                         vga_vram_size = 0x2000;
                         display_desc = "*CGA";
diff --git a/kernel/resource.c b/kernel/resource.c
index 54ba6de3757c..8c527d83ca76 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1022,6 +1022,7 @@ static void __init __reserve_region_with_split(struct resource *root,
         struct resource *conflict;
         struct resource *res = alloc_resource(GFP_ATOMIC);
         struct resource *next_res = NULL;
+        int type = resource_type(root);
 
         if (!res)
                 return;
@@ -1029,7 +1030,7 @@ static void __init __reserve_region_with_split(struct resource *root,
         res->name = name;
         res->start = start;
         res->end = end;
-        res->flags = IORESOURCE_BUSY;
+        res->flags = type | IORESOURCE_BUSY;
         res->desc = IORES_DESC_NONE;
 
         while (1) {
@@ -1064,7 +1065,7 @@ static void __init __reserve_region_with_split(struct resource *root,
                                 next_res->name = name;
                                 next_res->start = conflict->end + 1;
                                 next_res->end = end;
-                                next_res->flags = IORESOURCE_BUSY;
+                                next_res->flags = type | IORESOURCE_BUSY;
                                 next_res->desc = IORES_DESC_NONE;
                         }
                 } else {
@@ -1478,7 +1479,7 @@ void __devm_release_region(struct device *dev, struct resource *parent,
 EXPORT_SYMBOL(__devm_release_region);
 
 /*
- * Called from init/main.c to reserve IO ports.
+ * Reserve I/O ports or memory based on "reserve=" kernel parameter.
  */
 #define MAXRESERVE 4
 static int __init reserve_setup(char *str)
@@ -1489,26 +1490,38 @@ static int __init reserve_setup(char *str)
         for (;;) {
                 unsigned int io_start, io_num;
                 int x = reserved;
+                struct resource *parent;
 
-                if (get_option (&str, &io_start) != 2)
+                if (get_option(&str, &io_start) != 2)
                         break;
-                if (get_option (&str, &io_num)   == 0)
+                if (get_option(&str, &io_num) == 0)
                         break;
                 if (x < MAXRESERVE) {
                         struct resource *res = reserve + x;
+
+                        /*
+                         * If the region starts below 0x10000, we assume it's
+                         * I/O port space; otherwise assume it's memory.
+                         */
+                        if (io_start < 0x10000) {
+                                res->flags = IORESOURCE_IO;
+                                parent = &ioport_resource;
+                        } else {
+                                res->flags = IORESOURCE_MEM;
+                                parent = &iomem_resource;
+                        }
                         res->name = "reserved";
                         res->start = io_start;
                         res->end = io_start + io_num - 1;
-                        res->flags = IORESOURCE_BUSY;
+                        res->flags |= IORESOURCE_BUSY;
                         res->desc = IORES_DESC_NONE;
                         res->child = NULL;
-                        if (request_resource(res->start >= 0x10000 ? &iomem_resource : &ioport_resource, res) == 0)
+                        if (request_resource(parent, res) == 0)
                                 reserved = x+1;
                 }
         }
         return 1;
 }
-
 __setup("reserve=", reserve_setup);
 
 /*