Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1298134

[PATCH v2 07/16] kexec: Set IORESOURCE_SYSTEM_RAM to System RAM

From Toshi Kani <toshi.kani@hpe.com>
Newsgroups linux.kernel
Subject [PATCH v2 07/16] kexec: Set IORESOURCE_SYSTEM_RAM to System RAM
Date 2015-12-25 23:20 +0100
Message-ID <qJISm-Rm-31@gated-at.bofh.it> (permalink)
References <qJISl-Rm-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Set IORESOURCE_SYSTEM_RAM to 'flags' and IORES_DESC_CRASH_KERNEL
to 'desc' of "Crash kernel" resource ranges, which are child
nodes of System RAM.

Change crash_shrink_memory() to set IORESOURCE_SYSTEM_RAM for
a System RAM range.

Change kexec_add_buffer() to call walk_iomem_res() with
IORESOURCE_SYSTEM_RAM type for "Crash kernel".

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Young <dyoung@redhat.com>
Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
---
 kernel/kexec_core.c |    8 +++++---
 kernel/kexec_file.c |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 11b64a6..80bff05 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -66,13 +66,15 @@ struct resource crashk_res = {
 	.name  = "Crash kernel",
 	.start = 0,
 	.end   = 0,
-	.flags = IORESOURCE_BUSY | IORESOURCE_MEM
+	.flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
+	.desc  = IORES_DESC_CRASH_KERNEL
 };
 struct resource crashk_low_res = {
 	.name  = "Crash kernel",
 	.start = 0,
 	.end   = 0,
-	.flags = IORESOURCE_BUSY | IORESOURCE_MEM
+	.flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM,
+	.desc  = IORES_DESC_CRASH_KERNEL
 };
 
 int kexec_should_crash(struct task_struct *p)
@@ -934,7 +936,7 @@ int crash_shrink_memory(unsigned long new_size)
 
 	ram_res->start = end;
 	ram_res->end = crashk_res.end;
-	ram_res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
+	ram_res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM;
 	ram_res->name = "System RAM";
 
 	crashk_res.end = end - 1;
diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index b70ada0..c245085 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -523,7 +523,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",
-				     IORESOURCE_MEM | IORESOURCE_BUSY,
+				     IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY,
 				     crashk_res.start, crashk_res.end, kbuf,
 				     locate_mem_hole_callback);
 	else
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 01/16] resource: Add System RAM resource type Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 02/16] resource: make resource flags handled properly Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 13/16] resource: Add walk_iomem_res_desc() Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 10/16] resource: Change walk_system_ram to use System RAM type Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 09/16] drivers: Initialize resource entry to zero Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
    Re: [PATCH v2 09/16] drivers: Initialize resource entry to zero Simon Horman <horms@verge.net.au> - 2015-12-28 22:40 +0100
  [PATCH v2 11/16] arm/samsung: Change s3c_pm_run_res() to use System RAM type Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 07/16] kexec: Set IORESOURCE_SYSTEM_RAM to System RAM Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 03/16] resource: Add I/O resource descriptor Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 06/16] arch: Set IORESOURCE_SYSTEM_RAM to System RAM Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 08/16] xen, mm: Set IORESOURCE_SYSTEM_RAM to System RAM Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for iomem search Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
    Re: [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for  iomem search Borislav Petkov <bp@alien8.de> - 2015-12-26 11:40 +0100
      Re: [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for  iomem search Toshi Kani <toshi.kani@hpe.com> - 2015-12-27 01:40 +0100
        Re: [PATCH v2 14/16] x86, nvdimm, kexec: Use walk_iomem_res_desc()  for iomem search Minfei Huang <mhuang@redhat.com> - 2015-12-27 03:20 +0100
          Re: [PATCH v2 14/16] x86, nvdimm, kexec: Use walk_iomem_res_desc()  for iomem search Borislav Petkov <bp@alien8.de> - 2015-12-27 11:30 +0100
    Re: [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for  iomem search Minfei Huang <mhuang@redhat.com> - 2015-12-26 17:10 +0100
      Re: [PATCH v2 14/16] x86,nvdimm,kexec: Use walk_iomem_res_desc() for  iomem search Toshi Kani <toshi.kani@hpe.com> - 2015-12-27 01:40 +0100
  [PATCH v2 16/16] ACPI/EINJ: Allow memory error injection to NVDIMM Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100
  [PATCH v2 12/16] memremap: Change region_intersects() to take @flags and @desc Toshi Kani <toshi.kani@hpe.com> - 2015-12-25 23:20 +0100

csiph-web