Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, kexec, nvdimm: Use walk_iomem_res_desc() for iomem search

Change the callers of walk_iomem_res() scanning for the
following resources by name to use walk_iomem_res_desc()
instead.

"ACPI Tables"
"ACPI Non-volatile Storage"
"Persistent Memory (legacy)"
"Crash kernel"

Note, the caller of walk_iomem_res() with "GART" will be removed
in a later patch.

Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Dave Young <dyoung@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Chun-Yi <joeyli.kernel@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Lee, Chun-Yi <joeyli.kernel@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Minfei Huang <mnfhuang@gmail.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Takao Indoh <indou.takao@jp.fujitsu.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Toshi Kani <toshi.kani@hp.com>
Cc: kexec@lists.infradead.org
Cc: linux-arch@vger.kernel.org
Cc: linux-mm <linux-mm@kvack.org>
Cc: linux-nvdimm@lists.01.org
Link: http://lkml.kernel.org/r/1453841853-11383-15-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Toshi Kani and committed by
Ingo Molnar
f0f4711a 3f33647c

+9 -9
+2 -2
arch/x86/kernel/crash.c
··· 599 599 /* Add ACPI tables */ 600 600 cmd.type = E820_ACPI; 601 601 flags = IORESOURCE_MEM | IORESOURCE_BUSY; 602 - walk_iomem_res("ACPI Tables", flags, 0, -1, &cmd, 602 + walk_iomem_res_desc(IORES_DESC_ACPI_TABLES, flags, 0, -1, &cmd, 603 603 memmap_entry_callback); 604 604 605 605 /* Add ACPI Non-volatile Storage */ 606 606 cmd.type = E820_NVS; 607 - walk_iomem_res("ACPI Non-volatile Storage", flags, 0, -1, &cmd, 607 + walk_iomem_res_desc(IORES_DESC_ACPI_NV_STORAGE, flags, 0, -1, &cmd, 608 608 memmap_entry_callback); 609 609 610 610 /* Add crashk_low_res region */
+2 -2
arch/x86/kernel/pmem.c
··· 13 13 14 14 static __init int register_e820_pmem(void) 15 15 { 16 - char *pmem = "Persistent Memory (legacy)"; 17 16 struct platform_device *pdev; 18 17 int rc; 19 18 20 - rc = walk_iomem_res(pmem, IORESOURCE_MEM, 0, -1, NULL, found); 19 + rc = walk_iomem_res_desc(IORES_DESC_PERSISTENT_MEMORY_LEGACY, 20 + IORESOURCE_MEM, 0, -1, NULL, found); 21 21 if (rc <= 0) 22 22 return 0; 23 23
+1 -1
drivers/nvdimm/e820.c
··· 55 55 for (p = iomem_resource.child; p ; p = p->sibling) { 56 56 struct nd_region_desc ndr_desc; 57 57 58 - if (strncmp(p->name, "Persistent Memory (legacy)", 26) != 0) 58 + if (p->desc != IORES_DESC_PERSISTENT_MEMORY_LEGACY) 59 59 continue; 60 60 61 61 memset(&ndr_desc, 0, sizeof(ndr_desc));
+4 -4
kernel/kexec_file.c
··· 524 524 525 525 /* Walk the RAM ranges and allocate a suitable range for the buffer */ 526 526 if (image->type == KEXEC_TYPE_CRASH) 527 - ret = walk_iomem_res("Crash kernel", 528 - IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, 529 - crashk_res.start, crashk_res.end, kbuf, 530 - locate_mem_hole_callback); 527 + ret = walk_iomem_res_desc(crashk_res.desc, 528 + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, 529 + crashk_res.start, crashk_res.end, kbuf, 530 + locate_mem_hole_callback); 531 531 else 532 532 ret = walk_system_ram_res(0, -1, kbuf, 533 533 locate_mem_hole_callback);