From bd2ca0ba5b9ccf3aa846d0f08a06c193e5a388f4 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Fri, 25 Jun 2021 16:47:18 +0530 Subject: [PATCH] FROMLIST: pstore/ram: Rework logic for detecting ramoops reserved memory region 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. Bug: 191636717 Link: https://lore.kernel.org/patchwork/patch/1451704/ Change-Id: I24066de9f4fe1f1575cb1bbb1687c37a2b1938a4 Signed-off-by: Isaac J. Manjarres Signed-off-by: Mukesh Ojha Signed-off-by: Prasad Sodagudi --- fs/pstore/ram.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index fefe3d391d3a..5f904558e9db 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -21,6 +21,7 @@ #include #include #include +#include #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.