arch: Set IORESOURCE_SYSTEM_RAM flag for System RAM

Set IORESOURCE_SYSTEM_RAM in flags of resource ranges with
"System RAM", "Kernel code", "Kernel data", and "Kernel bss".

Note that:

 - IORESOURCE_SYSRAM (i.e. modifier bit) is set in flags when
   IORESOURCE_MEM is already set. IORESOURCE_SYSTEM_RAM is defined
   as (IORESOURCE_MEM|IORESOURCE_SYSRAM).

 - Some archs do not set 'flags' for children nodes, such as
   "Kernel code".  This patch does not change 'flags' in this
   case.

Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Cc: linux-mm <linux-mm@kvack.org>
Cc: linux-parisc@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: sparclinux@vger.kernel.org
Link: http://lkml.kernel.org/r/1453841853-11383-7-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>

13 files changed, 45 insertions, 38 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 7d0cba6f1cc5..139791ed473d 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -176,13 +176,13 @@ static struct resource mem_res[] = {
                 .name = "Kernel code",
                 .start = 0,
                 .end = 0,
-                .flags = IORESOURCE_MEM
+                .flags = IORESOURCE_SYSTEM_RAM
         },
         {
                 .name = "Kernel data",
                 .start = 0,
                 .end = 0,
-                .flags = IORESOURCE_MEM
+                .flags = IORESOURCE_SYSTEM_RAM
         }
 };
 
@@ -851,7 +851,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc)
                 res->name  = "System RAM";
                 res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region));
                 res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1;
-                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
 
                 request_resource(&iomem_resource, res);
 
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 8119479147db..450987d99b9b 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -73,13 +73,13 @@ static struct resource mem_res[] = {
                 .name = "Kernel code",
                 .start = 0,
                 .end = 0,
-                .flags = IORESOURCE_MEM
+                .flags = IORESOURCE_SYSTEM_RAM
         },
         {
                 .name = "Kernel data",
                 .start = 0,
                 .end = 0,
-                .flags = IORESOURCE_MEM
+                .flags = IORESOURCE_SYSTEM_RAM
         }
 };
 
@@ -210,7 +210,7 @@ static void __init request_standard_resources(void)
                 res->name  = "System RAM";
                 res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region));
                 res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1;
-                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
 
                 request_resource(&iomem_resource, res);
 
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index 209ae5ad3495..e6928896da2a 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -49,13 +49,13 @@ static struct resource __initdata kernel_data = {
         .name   = "Kernel data",
         .start  = 0,
         .end    = 0,
-        .flags  = IORESOURCE_MEM,
+        .flags  = IORESOURCE_SYSTEM_RAM,
 };
 static struct resource __initdata kernel_code = {
         .name   = "Kernel code",
         .start  = 0,
         .end    = 0,
-        .flags  = IORESOURCE_MEM,
+        .flags  = IORESOURCE_SYSTEM_RAM,
         .sibling = &kernel_data,
 };
 
@@ -134,7 +134,7 @@ add_physical_memory(resource_size_t start, resource_size_t end)
         new->start = start;
         new->end = end;
         new->name = "System RAM";
-        new->flags = IORESOURCE_MEM;
+        new->flags = IORESOURCE_SYSTEM_RAM;
 
         *pprev = new;
 }
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index a5ecef7188ba..136c69f1fb8a 100644
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -70,14 +70,14 @@ static struct resource data_resource = {
         .name   = "Kernel data",
         .start  = 0,
         .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
 };
 
 static struct resource code_resource = {
         .name   = "Kernel code",
         .start  = 0,
         .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
 };
 
 unsigned long memory_start;
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 569a7d5242dd..c745f0ea2577 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -732,21 +732,23 @@ static void __init resource_init(void)
                         end = HIGHMEM_START - 1;
 
                 res = alloc_bootmem(sizeof(struct resource));
+
+                res->start = start;
+                res->end = end;
+                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+
                 switch (boot_mem_map.map[i].type) {
                 case BOOT_MEM_RAM:
                 case BOOT_MEM_INIT_RAM:
                 case BOOT_MEM_ROM_DATA:
                         res->name = "System RAM";
+                        res->flags |= IORESOURCE_SYSRAM;
                         break;
                 case BOOT_MEM_RESERVED:
                 default:
                         res->name = "reserved";
                 }
 
-                res->start = start;
-                res->end = end;
-
-                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
                 request_resource(&iomem_resource, res);
 
                 /*
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 1b366c477687..3c07d6b96877 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -55,12 +55,12 @@ signed char pfnnid_map[PFNNID_MAP_MAX] __read_mostly;
 
 static struct resource data_resource = {
         .name   = "Kernel data",
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
 };
 
 static struct resource code_resource = {
         .name   = "Kernel code",
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
 };
 
 static struct resource pdcdata_resource = {
@@ -201,7 +201,7 @@ static void __init setup_bootmem(void)
                 res->name = "System RAM";
                 res->start = pmem_ranges[i].start_pfn << PAGE_SHIFT;
                 res->end = res->start + (pmem_ranges[i].pages << PAGE_SHIFT)-1;
-                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
                 request_resource(&iomem_resource, res);
         }
 
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index d0f0a514b04e..f078a1f94fc2 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -541,7 +541,7 @@ static int __init add_system_ram_resources(void)
                         res->name = "System RAM";
                         res->start = base;
                         res->end = base + size - 1;
-                        res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                        res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
                         WARN_ON(request_resource(&iomem_resource, res) < 0);
                 }
         }
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 9220db5c996a..cedb0198675f 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -374,17 +374,17 @@ static void __init setup_lowcore(void)
 
 static struct resource code_resource = {
         .name  = "Kernel code",
-        .flags = IORESOURCE_BUSY | IORESOURCE_MEM,
+        .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
 };
 
 static struct resource data_resource = {
         .name = "Kernel data",
-        .flags = IORESOURCE_BUSY | IORESOURCE_MEM,
+        .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
 };
 
 static struct resource bss_resource = {
         .name = "Kernel bss",
-        .flags = IORESOURCE_BUSY | IORESOURCE_MEM,
+        .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
 };
 
 static struct resource __initdata *standard_resources[] = {
@@ -408,7 +408,7 @@ static void __init setup_resources(void)
 
         for_each_memblock(memory, reg) {
                 res = alloc_bootmem_low(sizeof(*res));
-                res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
+                res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM;
 
                 res->name = "System RAM";
                 res->start = reg->base;
diff --git a/arch/score/kernel/setup.c b/arch/score/kernel/setup.c
index b48459afefdd..f3a0649ab521 100644
--- a/arch/score/kernel/setup.c
+++ b/arch/score/kernel/setup.c
@@ -101,7 +101,7 @@ static void __init resource_init(void)
         res->name = "System RAM";
         res->start = MEMORY_START;
         res->end = MEMORY_START + MEMORY_SIZE - 1;
-        res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+        res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
         request_resource(&iomem_resource, res);
 
         request_resource(res, &code_resource);
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index de19cfa768f2..3f1c18b28e8a 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -78,17 +78,17 @@ static char __initdata command_line[COMMAND_LINE_SIZE] = { 0, };
 
 static struct resource code_resource = {
         .name = "Kernel code",
-        .flags = IORESOURCE_BUSY | IORESOURCE_MEM,
+        .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
 };
 
 static struct resource data_resource = {
         .name = "Kernel data",
-        .flags = IORESOURCE_BUSY | IORESOURCE_MEM,
+        .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
 };
 
 static struct resource bss_resource = {
         .name   = "Kernel bss",
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM,
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
 };
 
 unsigned long memory_start;
@@ -202,7 +202,7 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
         res->name = "System RAM";
         res->start = start;
         res->end = end - 1;
-        res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+        res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
 
         if (request_resource(&iomem_resource, res)) {
                 pr_err("unable to request memory_resource 0x%lx 0x%lx\n",
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 6f216853f272..1cfe6aab7a11 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2863,17 +2863,17 @@ void hugetlb_setup(struct pt_regs *regs)
 
 static struct resource code_resource = {
         .name   = "Kernel code",
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
 };
 
 static struct resource data_resource = {
         .name   = "Kernel data",
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
 };
 
 static struct resource bss_resource = {
         .name   = "Kernel bss",
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
 };
 
 static inline resource_size_t compute_kern_paddr(void *addr)
@@ -2909,7 +2909,7 @@ static int __init report_memory(void)
                 res->name = "System RAM";
                 res->start = pavail[i].phys_addr;
                 res->end = pavail[i].phys_addr + pavail[i].reg_size - 1;
-                res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
+                res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM;
 
                 if (insert_resource(&iomem_resource, res) < 0) {
                         pr_warn("Resource insertion failed.\n");
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index bbb855de6569..a992238e9b58 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -1632,14 +1632,14 @@ static struct resource data_resource = {
         .name   = "Kernel data",
         .start  = 0,
         .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
 };
 
 static struct resource code_resource = {
         .name   = "Kernel code",
         .start  = 0,
         .end    = 0,
-        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+        .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
 };
 
 /*
@@ -1673,10 +1673,15 @@ insert_ram_resource(u64 start_pfn, u64 end_pfn, bool reserved)
                 kzalloc(sizeof(struct resource), GFP_ATOMIC);
         if (!res)
                 return NULL;
-        res->name = reserved ? "Reserved" : "System RAM";
         res->start = start_pfn << PAGE_SHIFT;
         res->end = (end_pfn << PAGE_SHIFT) - 1;
         res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
+        if (reserved) {
+                res->name = "Reserved";
+        } else {
+                res->name = "System RAM";
+                res->flags |= IORESOURCE_SYSRAM;
+        }
         if (insert_resource(&iomem_resource, res)) {
                 kfree(res);
                 return NULL;
diff --git a/arch/unicore32/kernel/setup.c b/arch/unicore32/kernel/setup.c
index 3fa317f96122..c2bffa5614a4 100644
--- a/arch/unicore32/kernel/setup.c
+++ b/arch/unicore32/kernel/setup.c
@@ -72,13 +72,13 @@ static struct resource mem_res[] = {
                 .name = "Kernel code",
                 .start = 0,
                 .end = 0,
-                .flags = IORESOURCE_MEM
+                .flags = IORESOURCE_SYSTEM_RAM
         },
         {
                 .name = "Kernel data",
                 .start = 0,
                 .end = 0,
-                .flags = IORESOURCE_MEM
+                .flags = IORESOURCE_SYSTEM_RAM
         }
 };
 
@@ -211,7 +211,7 @@ request_standard_resources(struct meminfo *mi)
                 res->name  = "System RAM";
                 res->start = mi->bank[i].start;
                 res->end   = mi->bank[i].start + mi->bank[i].size - 1;
-                res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
 
                 request_resource(&iomem_resource, res);