Commit 35d98e93 authored by Toshi Kani's avatar Toshi Kani Committed by Ingo Molnar
Browse files

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: default avatarToshi Kani <toshi.kani@hpe.com>
Signed-off-by: default avatarBorislav 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: default avatarIngo Molnar <mingo@kernel.org>
parent 03cb525e

arch/arm/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

arch/arm64/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

arch/avr32/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

arch/m32r/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/mips/kernel/setup.c

+6 −4
Original line number Diff line number Diff line
@@ -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);



		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE