Skip to contentSkip to conversation

pstore/ram: Rework logic for detecting ramoops reserved memory region

PATCH In review Mukesh Ojha 1 participant 2 messages Jun 25, 2021 – Jul 5, 2021 Pstore filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pstore/ram: Rework logic for detecting ramoops reserved memory region

From: "Isaac J. Manjarres" <[email protected]>

The reserved memory region for ramoops is assumed to be at a fixed and known location when read from the devicetree. This is not desirable in environments where it is preferred for the region to be dynamically allocated at runtime, as opposed to it being fixed at compile time.

Change the logic for detecting the start and size of the ramoops memory region by looking up the reserved memory region instead of using platform_get_resource(), which assumes that the location of the memory is known ahead of time.

---
 fs/pstore/ram.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
fs/pstore/ram.c +6 -5
index fefe3d3..5f90455 100644
@@ -21,6 +21,7 @@
 #include <linux/pstore_ram.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_reserved_mem.h>
 #include "internal.h"
 
 #define RAMOOPS_KERNMSG_HDR "===="
@@ -633,21 +634,21 @@ static int ramoops_parse_dt(struct platform_device *pdev,
 {
 	struct device_node *of_node = pdev->dev.of_node;
 	struct device_node *parent_node;
-	struct resource *res;
+	struct reserved_mem *rmem;
 	u32 value;
 	int ret;
 
 	dev_dbg(&pdev->dev, "using Device Tree\n");
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
+	rmem = of_reserved_mem_lookup(of_node);
+	if (!rmem) {
 		dev_err(&pdev->dev,
 			"failed to locate DT /reserved-memory resource\n");
 		return -EINVAL;
 	}
 
-	pdata->mem_size = resource_size(res);
-	pdata->mem_address = res->start;
+	pdata->mem_size = rmem->size;
+	pdata->mem_address = rmem->base;
 	/*
 	 * Setting "unbuffered" is deprecated and will be ignored if
 	 * "mem_type" is also specified.
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center,
Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
#1 lore raw

Hi Kees,

Could  you please review this ?

-Mukesh

Quoted 57 lines · Mukesh Ojha

From: "Isaac J. Manjarres" <[email protected]>

The reserved memory region for ramoops is assumed to be at a fixed and known location when read from the devicetree. This is not desirable in environments where it is preferred for the region to be dynamically allocated at runtime, as opposed to it being fixed at compile time.

Change the logic for detecting the start and size of the ramoops memory region by looking up the reserved memory region instead of using platform_get_resource(), which assumes that the location of the memory is known ahead of time.

---
  fs/pstore/ram.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
fs/pstore/ram.c +6 -5
index fefe3d3..5f90455 100644
@@ -21,6 +21,7 @@
  #include <linux/pstore_ram.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
+#include <linux/of_reserved_mem.h>
  #include "internal.h"
 
  #define RAMOOPS_KERNMSG_HDR "===="
@@ -633,21 +634,21 @@ static int ramoops_parse_dt(struct platform_device *pdev,
  {
  	struct device_node *of_node = pdev->dev.of_node;
  	struct device_node *parent_node;
-	struct resource *res;
+	struct reserved_mem *rmem;
  	u32 value;
  	int ret;
 
  	dev_dbg(&pdev->dev, "using Device Tree\n");
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
+	rmem = of_reserved_mem_lookup(of_node);
+	if (!rmem) {
  		dev_err(&pdev->dev,
  			"failed to locate DT /reserved-memory resource\n");
  		return -EINVAL;
  	}
 
-	pdata->mem_size = resource_size(res);
-	pdata->mem_address = res->start;
+	pdata->mem_size = rmem->size;
+	pdata->mem_address = rmem->base;
  	/*
  	 * Setting "unbuffered" is deprecated and will be ignored if
  	 * "mem_type" is also specified.