Skip to contentSkip to conversation

venus: core: add support to dump FW region

PATCH Superseded Dikshita Agarwal 3 participants 3 messages Nov 30, 2020 – Dec 3, 2020

Subsystems (4)

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 venus: core: add support to dump FW region

Add support to dump video FW region during FW crash using devcoredump helpers.

---
 drivers/media/platform/qcom/venus/core.c | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
drivers/media/platform/qcom/venus/core.c +47 -0
index 6103aaf..01a0cfe 100644
@@ -7,8 +7,10 @@
 #include <linux/interconnect.h>
 #include <linux/ioctl.h>
 #include <linux/delay.h>
+#include <linux/devcoredump.h>
 #include <linux/list.h>
 #include <linux/module.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -22,6 +24,48 @@
 #include "firmware.h"
 #include "pm_helpers.h"
 
+static int subsystem_dump(struct venus_core *core)
+{
+	struct device_node *node;
+	struct device *dev;
+	struct resource r;
+	void *mem_va;
+	size_t mem_size;
+	void *data;
+	int ret;
+
+	dev = core->dev;
+	node = of_parse_phandle(dev->of_node, "memory-region", 0);
+	if (!node)
+		return -EINVAL;
+
+	ret = of_address_to_resource(node, 0, &r);
+	if (ret)
+		goto err_put_node;
+
+	mem_size = resource_size(&r);
+
+	mem_va = memremap(r.start, mem_size, MEMREMAP_WC);
+	if (!mem_va) {
+		ret = -ENOMEM;
+		goto err_put_node;
+	}
+
+	data = vmalloc(mem_size);
+	if (!data) {
+		ret = -EINVAL;
+		goto err_unmap;
+	}
+
+	memcpy(data, mem_va, mem_size);
+
+	dev_coredumpv(dev, data, mem_size, GFP_KERNEL);
+err_unmap:
+	memunmap(mem_va);
+err_put_node:
+	of_node_put(node);
+	return ret;
+}
 static void venus_event_notify(struct venus_core *core, u32 event)
 {
 	struct venus_inst *inst;
@@ -67,6 +111,9 @@ static void venus_sys_error_handler(struct work_struct *work)
 
 	venus_shutdown(core);
 
+	dev_warn(core->dev, "dumping FW region!\n");
+	subsystem_dump(core);
+
 	pm_runtime_put_sync(core->dev);
 
 	while (core->pmdomains[0] && pm_runtime_active(core->pmdomains[0]))
Signature · 1 line
2.7.4
#1 lore raw
Quoted 24 lines · Dikshita Agarwal

Add support to dump video FW region during FW crash using devcoredump helpers.

---
 drivers/media/platform/qcom/venus/core.c | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
drivers/media/platform/qcom/venus/core.c +2 -0
index 6103aaf..01a0cfe 100644
@@ -7,8 +7,10 @@
 #include <linux/interconnect.h>
 #include <linux/ioctl.h>
 #include <linux/delay.h>
+#include <linux/devcoredump.h>
 #include <linux/list.h>
 #include <linux/module.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>

drivers/media/platform/qcom/venus/core.c line 27

Quoted 4 lines
drivers/media/platform/qcom/venus/core.c +1 -0
@@ -22,6 +24,48 @@
 #include "firmware.h"
 #include "pm_helpers.h"
 
+static int subsystem_dump(struct venus_core *core)

this function could return void because we don't handle the error in venus_sys_error_handler().

Quoted 9 lines
drivers/media/platform/qcom/venus/core.c +9 -0
+{
+	struct device_node *node;
+	struct device *dev;
+	struct resource r;
+	void *mem_va;
+	size_t mem_size;
+	void *data;
+	int ret;
+

drivers/media/platform/qcom/venus/core.c line 46

Quoted 10 lines
drivers/media/platform/qcom/venus/core.c +10 -0
+	dev = core->dev;
+	node = of_parse_phandle(dev->of_node, "memory-region", 0);
+	if (!node)
+		return -EINVAL;
+
+	ret = of_address_to_resource(node, 0, &r);
+	if (ret)
+		goto err_put_node;
+
+	mem_size = resource_size(&r);

could you reuse the resource from venus_load_fw by adding r.sart and resource size in venus_core->fw{} structure.

Quoted 26 lines
drivers/media/platform/qcom/venus/core.c +22 -0
+
+	mem_va = memremap(r.start, mem_size, MEMREMAP_WC);
+	if (!mem_va) {
+		ret = -ENOMEM;
+		goto err_put_node;
+	}
+
+	data = vmalloc(mem_size);
+	if (!data) {
+		ret = -EINVAL;
+		goto err_unmap;
+	}
+
+	memcpy(data, mem_va, mem_size);
+
+	dev_coredumpv(dev, data, mem_size, GFP_KERNEL);
+err_unmap:
+	memunmap(mem_va);
+err_put_node:
+	of_node_put(node);
+	return ret;
+}
 static void venus_event_notify(struct venus_core *core, u32 event)
 {
 	struct venus_inst *inst;

drivers/media/platform/qcom/venus/core.c static void venus_sys_error_handler(struct work_struct *work) · line 114

Quoted 4 lines
drivers/media/platform/qcom/venus/core.c +1 -0
@@ -67,6 +111,9 @@ static void venus_sys_error_handler(struct work_struct *work)
 
 	venus_shutdown(core);
 
+	dev_warn(core->dev, "dumping FW region!\n");

this warn is not needed, please drop it.

drivers/media/platform/qcom/venus/core.c static void venus_sys_error_handler(struct work_struct *work) · line 115

Quoted 1 line
drivers/media/platform/qcom/venus/core.c +1 -0
+	subsystem_dump(core);

Are we sure that the dump is always required?

Quoted 5 lines
drivers/media/platform/qcom/venus/core.c +1 -0
+
 	pm_runtime_put_sync(core->dev);
 
 	while (core->pmdomains[0] && pm_runtime_active(core->pmdomains[0]))
Signature · 2 lines
regards,
Stan
#2 lore raw
In reply to Dikshita Agarwal

Quoting Dikshita Agarwal (2020-11-29 21:36:12)

Quoted 10 lines
drivers/media/platform/qcom/venus/core.c +2 -0
index 6103aaf..01a0cfe 100644
@@ -22,6 +24,48 @@
 #include "firmware.h"
 #include "pm_helpers.h"
 
+static int subsystem_dump(struct venus_core *core)
+{

drivers/media/platform/qcom/venus/core.c line 38

Quoted 10 lines
drivers/media/platform/qcom/venus/core.c +10 -0
+       struct device_node *node;
+       struct device *dev;
+       struct resource r;
+       void *mem_va;
+       size_t mem_size;
+       void *data;
+       int ret;
+
+       dev = core->dev;
+       node = of_parse_phandle(dev->of_node, "memory-region", 0);

Any chance this could be done at probe time and saved away as some sort of pointer?

drivers/media/platform/qcom/venus/core.c line 42

Quoted 4 lines
drivers/media/platform/qcom/venus/core.c +4 -0
+       if (!node)
+               return -EINVAL;
+
+       ret = of_address_to_resource(node, 0, &r);

of_node_put(node);

drivers/media/platform/qcom/venus/core.c line 44

Quoted 2 lines
drivers/media/platform/qcom/venus/core.c +2 -0
+       if (ret)
+               goto err_put_node;

And then just return ret;

drivers/media/platform/qcom/venus/core.c line 51

Quoted 7 lines
drivers/media/platform/qcom/venus/core.c +7 -0
+
+       mem_size = resource_size(&r);
+
+       mem_va = memremap(r.start, mem_size, MEMREMAP_WC);
+       if (!mem_va) {
+               ret = -ENOMEM;
+               goto err_put_node;

And return -ENOMEM;

Quoted 21 lines
drivers/media/platform/qcom/venus/core.c +17 -0
+       }
+
+       data = vmalloc(mem_size);
+       if (!data) {
+               ret = -EINVAL;
+               goto err_unmap;
+       }
+
+       memcpy(data, mem_va, mem_size);
+
+       dev_coredumpv(dev, data, mem_size, GFP_KERNEL);
+err_unmap:
+       memunmap(mem_va);
+err_put_node:
+       of_node_put(node);
+       return ret;
+}
 static void venus_event_notify(struct venus_core *core, u32 event)
 {
        struct venus_inst *inst;

drivers/media/platform/qcom/venus/core.c static void venus_sys_error_handler(struct work_struct *work) · line 114

Quoted 4 lines
drivers/media/platform/qcom/venus/core.c +1 -0
@@ -67,6 +111,9 @@ static void venus_sys_error_handler(struct work_struct *work)
 
        venus_shutdown(core);
 
+       dev_warn(core->dev, "dumping FW region!\n");

Do we need this warning?

drivers/media/platform/qcom/venus/core.c static void venus_sys_error_handler(struct work_struct *work) · line 115

Quoted 1 line
drivers/media/platform/qcom/venus/core.c +1 -0
+       subsystem_dump(core);

Maybe call it venus_do_coredump() so it isn't so generic.

Quoted 4 lines
drivers/media/platform/qcom/venus/core.c +1 -0
+
        pm_runtime_put_sync(core->dev);
 
        while (core->pmdomains[0] && pm_runtime_active(core->pmdomains[0]))