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

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

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: default avatarToshi Kani <toshi.kani@hpe.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarDave 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: default avatarIngo Molnar <mingo@kernel.org>
parent 3f33647c

arch/x86/kernel/crash.c

+2 −2
Original line number Diff line number Diff line
@@ -599,12 +599,12 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params) 
	/* Add ACPI tables */

	cmd.type = E820_ACPI;

	flags = IORESOURCE_MEM | IORESOURCE_BUSY;

	walk_iomem_res("ACPI Tables", flags, 0, -1, &cmd,

	walk_iomem_res_desc(IORES_DESC_ACPI_TABLES, flags, 0, -1, &cmd,

		       memmap_entry_callback);



	/* Add ACPI Non-volatile Storage */

	cmd.type = E820_NVS;

	walk_iomem_res("ACPI Non-volatile Storage", flags, 0, -1, &cmd,

	walk_iomem_res_desc(IORES_DESC_ACPI_NV_STORAGE, flags, 0, -1, &cmd,

			memmap_entry_callback);



	/* Add crashk_low_res region */

arch/x86/kernel/pmem.c

+2 −2
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ static int found(u64 start, u64 end, void *data) 


static __init int register_e820_pmem(void)

{

	char *pmem = "Persistent Memory (legacy)";

	struct platform_device *pdev;

	int rc;



	rc = walk_iomem_res(pmem, IORESOURCE_MEM, 0, -1, NULL, found);

	rc = walk_iomem_res_desc(IORES_DESC_PERSISTENT_MEMORY_LEGACY,

				 IORESOURCE_MEM, 0, -1, NULL, found);

	if (rc <= 0)

		return 0;

drivers/nvdimm/e820.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int e820_pmem_probe(struct platform_device *pdev) 
	for (p = iomem_resource.child; p ; p = p->sibling) {

		struct nd_region_desc ndr_desc;



		if (strncmp(p->name, "Persistent Memory (legacy)", 26) != 0)

		if (p->desc != IORES_DESC_PERSISTENT_MEMORY_LEGACY)

			continue;



		memset(&ndr_desc, 0, sizeof(ndr_desc));

kernel/kexec_file.c

+4 −4
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, 


	/* Walk the RAM ranges and allocate a suitable range for the buffer */

	if (image->type == KEXEC_TYPE_CRASH)

		ret = walk_iomem_res("Crash kernel",

		ret = walk_iomem_res_desc(crashk_res.desc,

				IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY,

				crashk_res.start, crashk_res.end, kbuf,

				locate_mem_hole_callback);