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

Commit 03cb525e authored by Toshi Kani's avatar Toshi Kani Committed by Ingo Molnar
Browse files

ia64: Set System RAM type and descriptor 



Change efi_initialize_iomem_resources() to set 'flags' and
'desc' for EFI memory types. IORESOURCE_SYSRAM, a modifier bit,
is set for System RAM as IORESOURCE_MEM is already set.
IORESOURCE_SYSTEM_RAM is defined as
(IORESOURCE_MEM|IORESOURCE_SYSRAM). I/O resource descriptor is
set for "ACPI Non-volatile Storage" and "Persistent Memory".

Also set IORESOURCE_SYSTEM_RAM for "Kernel code", "Kernel data",
and "Kernel bss".

Signed-off-by: default avatarToshi Kani <toshi.kani@hpe.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
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: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-efi <linux-efi@vger.kernel.org>
Cc: linux-ia64@vger.kernel.org
Cc: linux-mm <linux-mm@kvack.org>
Link: http://lkml.kernel.org/r/1453841853-11383-6-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f33b14a4

arch/ia64/kernel/efi.c

+10 −3
Original line number Original line Diff line number Diff line
@@ -1178,7 +1178,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, 
	efi_memory_desc_t *md;

	efi_memory_desc_t *md;

	u64 efi_desc_size;

	u64 efi_desc_size;

	char *name;

	char *name;

	unsigned long flags;

	unsigned long flags, desc;





	efi_map_start = __va(ia64_boot_param->efi_memmap);

	efi_map_start = __va(ia64_boot_param->efi_memmap);

	efi_map_end   = efi_map_start + ia64_boot_param->efi_memmap_size;

	efi_map_end   = efi_map_start + ia64_boot_param->efi_memmap_size;
@@ -1193,6 +1193,8 @@ efi_initialize_iomem_resources(struct resource *code_resource, 
			continue;

			continue;





		flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		desc = IORES_DESC_NONE;



		switch (md->type) {

		switch (md->type) {





			case EFI_MEMORY_MAPPED_IO:

			case EFI_MEMORY_MAPPED_IO:
@@ -1207,14 +1209,17 @@ efi_initialize_iomem_resources(struct resource *code_resource, 
				if (md->attribute & EFI_MEMORY_WP) {

				if (md->attribute & EFI_MEMORY_WP) {

					name = "System ROM";

					name = "System ROM";

					flags |= IORESOURCE_READONLY;

					flags |= IORESOURCE_READONLY;

				} else if (md->attribute == EFI_MEMORY_UC)

				} else if (md->attribute == EFI_MEMORY_UC) {

					name = "Uncached RAM";

					name = "Uncached RAM";

				else

				} else {

					name = "System RAM";

					name = "System RAM";

					flags |= IORESOURCE_SYSRAM;

				}

				break;

				break;





			case EFI_ACPI_MEMORY_NVS:

			case EFI_ACPI_MEMORY_NVS:

				name = "ACPI Non-volatile Storage";

				name = "ACPI Non-volatile Storage";

				desc = IORES_DESC_ACPI_NV_STORAGE;

				break;

				break;





			case EFI_UNUSABLE_MEMORY:

			case EFI_UNUSABLE_MEMORY:
@@ -1224,6 +1229,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, 




			case EFI_PERSISTENT_MEMORY:

			case EFI_PERSISTENT_MEMORY:

				name = "Persistent Memory";

				name = "Persistent Memory";

				desc = IORES_DESC_PERSISTENT_MEMORY;

				break;

				break;





			case EFI_RESERVED_TYPE:

			case EFI_RESERVED_TYPE:
@@ -1246,6 +1252,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, 
		res->start = md->phys_addr;

		res->start = md->phys_addr;

		res->end = md->phys_addr + efi_md_size(md) - 1;

		res->end = md->phys_addr + efi_md_size(md) - 1;

		res->flags = flags;

		res->flags = flags;

		res->desc = desc;





		if (insert_resource(&iomem_resource, res) < 0)

		if (insert_resource(&iomem_resource, res) < 0)

			kfree(res);

			kfree(res);

arch/ia64/kernel/setup.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -80,17 +80,17 @@ unsigned long vga_console_membase; 




static struct resource data_resource = {

static struct resource data_resource = {

	.name	= "Kernel data",

	.name	= "Kernel data",

	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

	.flags	= IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM

};

};





static struct resource code_resource = {

static struct resource code_resource = {

	.name	= "Kernel code",

	.name	= "Kernel code",

	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

	.flags	= IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM

};

};





static struct resource bss_resource = {

static struct resource bss_resource = {

	.name	= "Kernel bss",

	.name	= "Kernel bss",

	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

	.flags	= IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM

};

};





unsigned long ia64_max_cacheline_size;

unsigned long ia64_max_cacheline_size;