Skip to contentSkip to conversation

media: Use of_reserved_mem_region_to_resource() for "memory-region"

PATCH In review Rob Herring (Arm) 3 participants 3 messages Jul 3, 2025 – Jul 7, 2025

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: Use of_reserved_mem_region_to_resource() for "memory-region"

Use the newly added of_reserved_mem_region_to_resource() function to handle "memory-region" properties.

---
 drivers/media/platform/amphion/vpu_core.c     | 40 +++++--------------
 .../media/platform/qcom/iris/iris_firmware.c  | 18 +++------
 drivers/media/platform/qcom/venus/firmware.c  | 19 +++------
 3 files changed, 21 insertions(+), 56 deletions(-)
drivers/media/platform/amphion/vpu_core.c +10 -30
index da00f5fc0e5d..168f0514851e 100644
@@ -10,7 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_address.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/types.h>
@@ -542,47 +542,30 @@ const struct vpu_core_resources *vpu_get_resource(struct vpu_inst *inst)
 
 static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np)
 {
-	struct device_node *node;
 	struct resource res;
 	int ret;
 
-	if (of_count_phandle_with_args(np, "memory-region", NULL) < 2) {
-		dev_err(core->dev, "need 2 memory-region for boot and rpc\n");
-		return -ENODEV;
+	ret = of_reserved_mem_region_to_resource(np, 0, &res);
+	if (ret) {
+		dev_err(core->dev, "Cannot get boot-region\n");
+		return ret;
 	}
 
-	node = of_parse_phandle(np, "memory-region", 0);
-	if (!node) {
-		dev_err(core->dev, "boot-region of_parse_phandle error\n");
-		return -ENODEV;
-	}
-	if (of_address_to_resource(node, 0, &res)) {
-		dev_err(core->dev, "boot-region of_address_to_resource error\n");
-		of_node_put(node);
-		return -EINVAL;
-	}
 	core->fw.phys = res.start;
 	core->fw.length = resource_size(&res);
 
-	of_node_put(node);
-
-	node = of_parse_phandle(np, "memory-region", 1);
-	if (!node) {
-		dev_err(core->dev, "rpc-region of_parse_phandle error\n");
-		return -ENODEV;
-	}
-	if (of_address_to_resource(node, 0, &res)) {
-		dev_err(core->dev, "rpc-region of_address_to_resource error\n");
-		of_node_put(node);
-		return -EINVAL;
+	ret = of_reserved_mem_region_to_resource(np, 1, &res);
+	if (ret) {
+		dev_err(core->dev, "Cannot get rpc-region\n");
+		return ret;
 	}
+
 	core->rpc.phys = res.start;
 	core->rpc.length = resource_size(&res);
 
 	if (core->rpc.length < core->res->rpc_size + core->res->fwlog_size) {
 		dev_err(core->dev, "the rpc-region <%pad, 0x%x> is not enough\n",
 			&core->rpc.phys, core->rpc.length);
-		of_node_put(node);
 		return -EINVAL;
 	}
 
@@ -594,7 +577,6 @@ static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np)
 	if (ret != VPU_CORE_MEMORY_UNCACHED) {
 		dev_err(core->dev, "rpc region<%pad, 0x%x> isn't uncached\n",
 			&core->rpc.phys, core->rpc.length);
-		of_node_put(node);
 		return -EINVAL;
 	}
 
@@ -606,8 +588,6 @@ static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np)
 	core->act.length = core->rpc.length - core->res->rpc_size - core->log.length;
 	core->rpc.length = core->res->rpc_size;
 
-	of_node_put(node);
-
 	return 0;
 }
 
drivers/media/platform/qcom/iris/iris_firmware.c +6 -12
index f1b5cd56db32..40448429ba97 100644
@@ -19,8 +19,7 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
 	u32 pas_id = core->iris_platform_data->pas_id;
 	const struct firmware *firmware = NULL;
 	struct device *dev = core->dev;
-	struct reserved_mem *rmem;
-	struct device_node *node;
+	struct resource res;
 	phys_addr_t mem_phys;
 	size_t res_size;
 	ssize_t fw_size;
@@ -30,17 +29,12 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
 	if (strlen(fw_name) >= MAX_FIRMWARE_NAME_SIZE - 4)
 		return -EINVAL;
 
-	node = of_parse_phandle(dev->of_node, "memory-region", 0);
-	if (!node)
-		return -EINVAL;
-
-	rmem = of_reserved_mem_lookup(node);
-	of_node_put(node);
-	if (!rmem)
-		return -EINVAL;
+	ret = of_reserved_mem_region_to_resource(dev->of_node, 0, &res);
+	if (ret)
+		return ret;
 
-	mem_phys = rmem->base;
-	res_size = rmem->size;
+	mem_phys = res.start;
+	res_size = resource_size(&res);
 
 	ret = request_firmware(&firmware, fw_name, dev);
 	if (ret)
drivers/media/platform/qcom/venus/firmware.c +5 -14
index 66a18830e66d..37c0fd52333e 100644
@@ -9,7 +9,6 @@
 #include <linux/iommu.h>
 #include <linux/io.h>
 #include <linux/of.h>
-#include <linux/of_address.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
@@ -83,8 +82,7 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
 			 phys_addr_t *mem_phys, size_t *mem_size)
 {
 	const struct firmware *mdt;
-	struct reserved_mem *rmem;
-	struct device_node *node;
+	struct resource res;
 	struct device *dev;
 	ssize_t fw_size;
 	void *mem_va;
@@ -94,15 +92,8 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
 	*mem_size = 0;
 
 	dev = core->dev;
-	node = of_parse_phandle(dev->of_node, "memory-region", 0);
-	if (!node) {
-		dev_err(dev, "no memory-region specified\n");
-		return -EINVAL;
-	}
-
-	rmem = of_reserved_mem_lookup(node);
-	of_node_put(node);
-	if (!rmem) {
+	ret = of_reserved_mem_region_to_resource(dev->of_node, 0, &res);
+	if (ret) {
 		dev_err(dev, "failed to lookup reserved memory-region\n");
 		return -EINVAL;
 	}
@@ -117,8 +108,8 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
 		goto err_release_fw;
 	}
 
-	*mem_phys = rmem->base;
-	*mem_size = rmem->size;
+	*mem_phys = res.start;
+	*mem_size = resource_size(&res);
 
 	if (*mem_size < fw_size || fw_size > VENUS_FW_MEM_SIZE) {
 		ret = -EINVAL;
Signature · 1 line
2.47.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Rob Herring (Arm)

Use the newly added of_reserved_mem_region_to_resource() function to handle "memory-region" properties.

---
 drivers/media/platform/amphion/vpu_core.c     | 40 +++++--------------
 .../media/platform/qcom/iris/iris_firmware.c  | 18 +++------
 drivers/media/platform/qcom/venus/firmware.c  | 19 +++------
 3 files changed, 21 insertions(+), 56 deletions(-)

[snip]

Quoted 79 lines
drivers/media/platform/qcom/iris/iris_firmware.c +6 -12
index f1b5cd56db32..40448429ba97 100644
@@ -19,8 +19,7 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
 	u32 pas_id = core->iris_platform_data->pas_id;
 	const struct firmware *firmware = NULL;
 	struct device *dev = core->dev;
-	struct reserved_mem *rmem;
-	struct device_node *node;
+	struct resource res;
 	phys_addr_t mem_phys;
 	size_t res_size;
 	ssize_t fw_size;
@@ -30,17 +29,12 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
 	if (strlen(fw_name) >= MAX_FIRMWARE_NAME_SIZE - 4)
 		return -EINVAL;
 
-	node = of_parse_phandle(dev->of_node, "memory-region", 0);
-	if (!node)
-		return -EINVAL;
-
-	rmem = of_reserved_mem_lookup(node);
-	of_node_put(node);
-	if (!rmem)
-		return -EINVAL;
+	ret = of_reserved_mem_region_to_resource(dev->of_node, 0, &res);
+	if (ret)
+		return ret;
 
-	mem_phys = rmem->base;
-	res_size = rmem->size;
+	mem_phys = res.start;
+	res_size = resource_size(&res);
 
 	ret = request_firmware(&firmware, fw_name, dev);
 	if (ret)
drivers/media/platform/qcom/venus/firmware.c +3 -12
index 66a18830e66d..37c0fd52333e 100644
@@ -9,7 +9,6 @@
 #include <linux/iommu.h>
 #include <linux/io.h>
 #include <linux/of.h>
-#include <linux/of_address.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
@@ -83,8 +82,7 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
 			 phys_addr_t *mem_phys, size_t *mem_size)
 {
 	const struct firmware *mdt;
-	struct reserved_mem *rmem;
-	struct device_node *node;
+	struct resource res;
 	struct device *dev;
 	ssize_t fw_size;
 	void *mem_va;
@@ -94,15 +92,8 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
 	*mem_size = 0;
 
 	dev = core->dev;
-	node = of_parse_phandle(dev->of_node, "memory-region", 0);
-	if (!node) {
-		dev_err(dev, "no memory-region specified\n");
-		return -EINVAL;
-	}
-
-	rmem = of_reserved_mem_lookup(node);
-	of_node_put(node);
-	if (!rmem) {
+	ret = of_reserved_mem_region_to_resource(dev->of_node, 0, &res);
+	if (ret) {
 		dev_err(dev, "failed to lookup reserved memory-region\n");
 		return -EINVAL;
 	}

drivers/media/platform/qcom/venus/firmware.c static int venus_load_fw(struct venus_core *core, const char *fwname, · line 115

Quoted 10 lines
drivers/media/platform/qcom/venus/firmware.c +2 -2
@@ -117,8 +108,8 @@ static int venus_load_fw(struct venus_core *core, const char *fwname,
 		goto err_release_fw;
 	}
 
-	*mem_phys = rmem->base;
-	*mem_size = rmem->size;
+	*mem_phys = res.start;
+	*mem_size = resource_size(&res);
 
 	if (*mem_size < fw_size || fw_size > VENUS_FW_MEM_SIZE) {
 		ret = -EINVAL;

Thanks,
Dikshita

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Rob Herring (Arm)
Quoted 117 lines

-----Original Message-----
From: Rob Herring (Arm) <[email protected]>
Sent: Friday, July 4, 2025 2:35 AM
To: Ming Qian <[email protected]>; Eagle Zhou <[email protected]>; Mauro Carvalho Chehab <[email protected]>; Vikash Garodia <[email protected]>; Dikshita Agarwal <[email protected]>; Abhinav Kumar <[email protected]>; Bryan O'Donoghue <[email protected]>
Cc: [email protected]; [email protected]; linux-arm- [email protected]
Subject: [EXT] [PATCH] media: Use of_reserved_mem_region_to_resource() for "memory-region"

Caution: This is an external email. Please take care when clicking links or opening attachments. When in doubt, report the message using the 'Report this email' button

Use the newly added of_reserved_mem_region_to_resource() function to handle "memory-region" properties.

---

drivers/media/platform/amphion/vpu_core.c     | 40 +++++--------------
.../media/platform/qcom/iris/iris_firmware.c  | 18 +++------
drivers/media/platform/qcom/venus/firmware.c  | 19 +++------
3 files changed, 21 insertions(+), 56 deletions(-)
drivers/media/platform/amphion/vpu_core.c +10 -30
index da00f5fc0e5d..168f0514851e 100644
@@ -10,7 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_address.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/types.h>
@@ -542,47 +542,30 @@ const struct vpu_core_resources
 *vpu_get_resource(struct vpu_inst *inst)
 
 static int vpu_core_parse_dt(struct vpu_core *core, struct device_node *np)  {
-       struct device_node *node;
       struct resource res;
       int ret;
 
-       if (of_count_phandle_with_args(np, "memory-region", NULL) < 2) {
-               dev_err(core->dev, "need 2 memory-region for boot and rpc\n");
-               return -ENODEV;
+       ret = of_reserved_mem_region_to_resource(np, 0, &res);
+       if (ret) {
+               dev_err(core->dev, "Cannot get boot-region\n");
+               return ret;
       }
 
-       node = of_parse_phandle(np, "memory-region", 0);
-       if (!node) {
-               dev_err(core->dev, "boot-region of_parse_phandle error\n");
-               return -ENODEV;
-       }
-       if (of_address_to_resource(node, 0, &res)) {
-               dev_err(core->dev, "boot-region of_address_to_resource error\n");
-               of_node_put(node);
-               return -EINVAL;
-       }
       core->fw.phys = res.start;
       core->fw.length = resource_size(&res);
 
-       of_node_put(node);
-
-       node = of_parse_phandle(np, "memory-region", 1);
-       if (!node) {
-               dev_err(core->dev, "rpc-region of_parse_phandle error\n");
-               return -ENODEV;
-       }
-       if (of_address_to_resource(node, 0, &res)) {
-               dev_err(core->dev, "rpc-region of_address_to_resource error\n");
-               of_node_put(node);
-               return -EINVAL;
+       ret = of_reserved_mem_region_to_resource(np, 1, &res);
+       if (ret) {
+               dev_err(core->dev, "Cannot get rpc-region\n");
+               return ret;
       }
+
       core->rpc.phys = res.start;
       core->rpc.length = resource_size(&res);
 
       if (core->rpc.length < core->res->rpc_size + core->res->fwlog_size) {
               dev_err(core->dev, "the rpc-region <%pad, 0x%x> is not enough\n",
                       &core->rpc.phys, core->rpc.length);
-               of_node_put(node);
               return -EINVAL;
       }
 
@@ -594,7 +577,6 @@ static int vpu_core_parse_dt(struct vpu_core *core,
 struct device_node *np)
       if (ret != VPU_CORE_MEMORY_UNCACHED) {
               dev_err(core->dev, "rpc region<%pad, 0x%x> isn't uncached\n",
                       &core->rpc.phys, core->rpc.length);
-               of_node_put(node);
               return -EINVAL;
       }
@@ -606,8 +588,6 @@ static int vpu_core_parse_dt(struct vpu_core *core,
 struct device_node *np)
       core->act.length = core->rpc.length - core->res->rpc_size - core-
 >log.length;
       core->rpc.length = core->res->rpc_size;
 
-       of_node_put(node);
-
       return 0;
Quoted 1 line

}

Regards,
Ming

[snip]