From mboxrd@z Thu Jan 1 00:00:00 1970 From: tip-bot for Toshi Kani Subject: [tip:core/resources] ia64: Set System RAM type and descriptor Date: Sat, 30 Jan 2016 01:29:30 -0800 Message-ID: References: <1453841853-11383-6-git-send-email-bp@alien8.de> Reply-To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, dvlasenk@redhat.com, mingo@kernel.org, rusty@rustcorp.com.au, hpa@zytor.com, peterz@infradead.org, fenghua.yu@intel.com, akpm@linux-foundation.org, bp@suse.de, luto@amacapital.net, toshi.kani@hp.com, linux-efi@vger.kernel.org, bp@alien8.de, mcgrof@suse.com, tglx@linutronix.de, tony.luck@intel.com, brgerst@gmail.com, toshi.kani@hpe.com, linux-mm@kvack.org, matt@codeblueprint.co.uk Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <1453841853-11383-6-git-send-email-bp@alien8.de> Content-Disposition: inline Sender: owner-linux-mm@kvack.org To: linux-tip-commits@vger.kernel.org Cc: dvlasenk@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, rusty@rustcorp.com.au, peterz@infradead.org, hpa@zytor.com, fenghua.yu@intel.com, akpm@linux-foundation.org, bp@suse.de, toshi.kani@hp.com, luto@amacapital.net, tglx@linutronix.de, tony.luck@intel.com, linux-efi@vger.kernel.org, mcgrof@suse.com, bp@alien8.de, brgerst@gmail.com, linux-mm@kvack.org, matt@codeblueprint.co.uk, toshi.kani@hpe.com List-Id: linux-efi@vger.kernel.org Commit-ID: 03cb525eb25018cf5f3da01d0f1391fc8b37805a Gitweb: http://git.kernel.org/tip/03cb525eb25018cf5f3da01d0f1391fc8b3= 7805a Author: Toshi Kani AuthorDate: Tue, 26 Jan 2016 21:57:21 +0100 Committer: Ingo Molnar CommitDate: Sat, 30 Jan 2016 09:49:57 +0100 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: Toshi Kani Signed-off-by: Borislav Petkov Acked-by: Tony Luck Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Luis R. Rodriguez Cc: Matt Fleming Cc: Peter Zijlstra Cc: Rusty Russell Cc: Thomas Gleixner Cc: Toshi Kani Cc: linux-arch@vger.kernel.org Cc: linux-efi Cc: linux-ia64@vger.kernel.org Cc: linux-mm Link: http://lkml.kernel.org/r/1453841853-11383-6-git-send-email-bp@alien= 8.de Signed-off-by: Ingo Molnar --- arch/ia64/kernel/efi.c | 13 ++++++++++--- arch/ia64/kernel/setup.c | 6 +++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index caae3f4..300dac3 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -1178,7 +1178,7 @@ efi_initialize_iomem_resources(struct resource *cod= e_resource, efi_memory_desc_t *md; u64 efi_desc_size; char *name; - unsigned long flags; + unsigned long flags, desc; =20 efi_map_start =3D __va(ia64_boot_param->efi_memmap); efi_map_end =3D efi_map_start + ia64_boot_param->efi_memmap_size; @@ -1193,6 +1193,8 @@ efi_initialize_iomem_resources(struct resource *cod= e_resource, continue; =20 flags =3D IORESOURCE_MEM | IORESOURCE_BUSY; + desc =3D IORES_DESC_NONE; + switch (md->type) { =20 case EFI_MEMORY_MAPPED_IO: @@ -1207,14 +1209,17 @@ efi_initialize_iomem_resources(struct resource *c= ode_resource, if (md->attribute & EFI_MEMORY_WP) { name =3D "System ROM"; flags |=3D IORESOURCE_READONLY; - } else if (md->attribute =3D=3D EFI_MEMORY_UC) + } else if (md->attribute =3D=3D EFI_MEMORY_UC) { name =3D "Uncached RAM"; - else + } else { name =3D "System RAM"; + flags |=3D IORESOURCE_SYSRAM; + } break; =20 case EFI_ACPI_MEMORY_NVS: name =3D "ACPI Non-volatile Storage"; + desc =3D IORES_DESC_ACPI_NV_STORAGE; break; =20 case EFI_UNUSABLE_MEMORY: @@ -1224,6 +1229,7 @@ efi_initialize_iomem_resources(struct resource *cod= e_resource, =20 case EFI_PERSISTENT_MEMORY: name =3D "Persistent Memory"; + desc =3D IORES_DESC_PERSISTENT_MEMORY; break; =20 case EFI_RESERVED_TYPE: @@ -1246,6 +1252,7 @@ efi_initialize_iomem_resources(struct resource *cod= e_resource, res->start =3D md->phys_addr; res->end =3D md->phys_addr + efi_md_size(md) - 1; res->flags =3D flags; + res->desc =3D desc; =20 if (insert_resource(&iomem_resource, res) < 0) kfree(res); diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 4f118b0..2029a38 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -80,17 +80,17 @@ unsigned long vga_console_membase; =20 static struct resource data_resource =3D { .name =3D "Kernel data", - .flags =3D IORESOURCE_BUSY | IORESOURCE_MEM + .flags =3D IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM }; =20 static struct resource code_resource =3D { .name =3D "Kernel code", - .flags =3D IORESOURCE_BUSY | IORESOURCE_MEM + .flags =3D IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM }; =20 static struct resource bss_resource =3D { .name =3D "Kernel bss", - .flags =3D IORESOURCE_BUSY | IORESOURCE_MEM + .flags =3D IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM }; =20 unsigned long ia64_max_cacheline_size; -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org