remoteproc: qcom: Add capability to collect minidumps (8ed8485c) · Commits · 戴 / test

drivers/remoteproc/qcom_common.c

+146 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include <linux/rpmsg/qcom_smd.h>
		#include <linux/slab.h>
		#include <linux/soc/qcom/mdt_loader.h>
		#include <linux/soc/qcom/smem.h>

		#include "remoteproc_internal.h"
		#include "qcom_common.h"
		@@ -25,6 +26,61 @@
		#define to_smd_subdev(d) container_of(d, struct qcom_rproc_subdev, subdev)
		#define to_ssr_subdev(d) container_of(d, struct qcom_rproc_ssr, subdev)

		#define MAX_NUM_OF_SS 10
		#define MAX_REGION_NAME_LENGTH 16
		#define SBL_MINIDUMP_SMEM_ID 602
		#define MD_REGION_VALID ('V' << 24 \| 'A' << 16 \| 'L' << 8 \| 'I' << 0)
		#define MD_SS_ENCR_DONE ('D' << 24 \| 'O' << 16 \| 'N' << 8 \| 'E' << 0)
		#define MD_SS_ENABLED ('E' << 24 \| 'N' << 16 \| 'B' << 8 \| 'L' << 0)

		/**
		* struct minidump_region - Minidump region
		* @name : Name of the region to be dumped
		* @seq_num: : Use to differentiate regions with same name.
		* @valid : This entry to be dumped (if set to 1)
		* @address : Physical address of region to be dumped
		* @size : Size of the region
		*/
		struct minidump_region {
		char name[MAX_REGION_NAME_LENGTH];
		__le32 seq_num;
		__le32 valid;
		__le64 address;
		__le64 size;
		};

		/**
		* struct minidump_subsystem_toc: Subsystem's SMEM Table of content
		* @status : Subsystem toc init status
		* @enabled : if set to 1, this region would be copied during coredump
		* @encryption_status: Encryption status for this subsystem
		* @encryption_required : Decides to encrypt the subsystem regions or not
		* @region_count : Number of regions added in this subsystem toc
		* @regions_baseptr : regions base pointer of the subsystem
		*/
		struct minidump_subsystem {
		__le32 status;
		__le32 enabled;
		__le32 encryption_status;
		__le32 encryption_required;
		__le32 region_count;
		__le64 regions_baseptr;
		};

		/**
		* struct minidump_global_toc: Global Table of Content
		* @status : Global Minidump init status
		* @md_revision : Minidump revision
		* @enabled : Minidump enable status
		* @subsystems : Array of subsystems toc
		*/
		struct minidump_global_toc {
		__le32 status;
		__le32 md_revision;
		__le32 enabled;
		struct minidump_subsystem subsystems[MAX_NUM_OF_SS];
		};

		struct qcom_ssr_subsystem {
		const char *name;
		struct srcu_notifier_head notifier_list;
		@@ -34,6 +90,96 @@ struct qcom_ssr_subsystem {
		static LIST_HEAD(qcom_ssr_subsystem_list);
		static DEFINE_MUTEX(qcom_ssr_subsys_lock);

		static void qcom_minidump_cleanup(struct rproc *rproc)
		{
		struct rproc_dump_segment entry, tmp;

		list_for_each_entry_safe(entry, tmp, &rproc->dump_segments, node) {
		list_del(&entry->node);
		kfree(entry->priv);
		kfree(entry);
		}
		}

		static int qcom_add_minidump_segments(struct rproc rproc, struct minidump_subsystem subsystem)
		{
		struct minidump_region __iomem *ptr;
		struct minidump_region region;
		int seg_cnt, i;
		dma_addr_t da;
		size_t size;
		char *name;

		if (WARN_ON(!list_empty(&rproc->dump_segments))) {
		dev_err(&rproc->dev, "dump segment list already populated\n");
		return -EUCLEAN;
		}

		seg_cnt = le32_to_cpu(subsystem->region_count);
		ptr = ioremap((unsigned long)le64_to_cpu(subsystem->regions_baseptr),
		seg_cnt * sizeof(struct minidump_region));
		if (!ptr)
		return -EFAULT;

		for (i = 0; i < seg_cnt; i++) {
		memcpy_fromio(&region, ptr + i, sizeof(region));
		if (region.valid == MD_REGION_VALID) {
		name = kstrdup(region.name, GFP_KERNEL);
		if (!name) {
		iounmap(ptr);
		return -ENOMEM;
		}
		da = le64_to_cpu(region.address);
		size = le32_to_cpu(region.size);
		rproc_coredump_add_custom_segment(rproc, da, size, NULL, name);
		}
		}

		iounmap(ptr);
		return 0;
		}

		void qcom_minidump(struct rproc *rproc, unsigned int minidump_id)
		{
		int ret;
		struct minidump_subsystem *subsystem;
		struct minidump_global_toc *toc;

		/* Get Global minidump ToC*/
		toc = qcom_smem_get(QCOM_SMEM_HOST_ANY, SBL_MINIDUMP_SMEM_ID, NULL);

		/* check if global table pointer exists and init is set */
		if (IS_ERR(toc) \|\| !toc->status) {
		dev_err(&rproc->dev, "Minidump TOC not found in SMEM\n");
		return;
		}

		/* Get subsystem table of contents using the minidump id */
		subsystem = &toc->subsystems[minidump_id];

		/**
		* Collect minidump if SS ToC is valid and segment table
		* is initialized in memory and encryption status is set.
		*/
		if (subsystem->regions_baseptr == 0 \|\|
		le32_to_cpu(subsystem->status) != 1 \|\|
		le32_to_cpu(subsystem->enabled) != MD_SS_ENABLED \|\|
		le32_to_cpu(subsystem->encryption_status) != MD_SS_ENCR_DONE) {
		dev_err(&rproc->dev, "Minidump not ready, skipping\n");
		return;
		}

		ret = qcom_add_minidump_segments(rproc, subsystem);
		if (ret) {
		dev_err(&rproc->dev, "Failed with error: %d while adding minidump entries\n", ret);
		goto clean_minidump;
		}
		rproc_coredump_using_sections(rproc);
		clean_minidump:
		qcom_minidump_cleanup(rproc);
		}
		EXPORT_SYMBOL_GPL(qcom_minidump);

		static int glink_subdev_start(struct rproc_subdev *subdev)
		{
		struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

drivers/remoteproc/qcom_common.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,8 @@ struct qcom_rproc_ssr {
		struct qcom_ssr_subsystem *info;
		};

		void qcom_minidump(struct rproc *rproc, unsigned int minidump_id);

		void qcom_add_glink_subdev(struct rproc rproc, struct qcom_rproc_glink glink,
		const char *ssr_name);
		void qcom_remove_glink_subdev(struct rproc rproc, struct qcom_rproc_glink glink);

drivers/remoteproc/qcom_q6v5_pas.c

+25 −2

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ struct adsp_data {
		int crash_reason_smem;
		const char *firmware_name;
		int pas_id;
		unsigned int minidump_id;
		bool has_aggre2_clk;
		bool auto_boot;

		@@ -63,6 +64,7 @@ struct qcom_adsp {
		int proxy_pd_count;

		int pas_id;
		unsigned int minidump_id;
		int crash_reason_smem;
		bool has_aggre2_clk;
		const char *info_name;
		@@ -81,6 +83,13 @@ struct qcom_adsp {
		struct qcom_sysmon *sysmon;
		};

		static void adsp_minidump(struct rproc *rproc)
		{
		struct qcom_adsp *adsp = rproc->priv;

		qcom_minidump(rproc, adsp->minidump_id);
		}

		static int adsp_pds_enable(struct qcom_adsp adsp, struct device *pds,
		size_t pd_count)
		{
		@@ -258,6 +267,15 @@ static const struct rproc_ops adsp_ops = {
		.panic = adsp_panic,
		};

		static const struct rproc_ops adsp_minidump_ops = {
		.start = adsp_start,
		.stop = adsp_stop,
		.da_to_va = adsp_da_to_va,
		.load = adsp_load,
		.panic = adsp_panic,
		.coredump = adsp_minidump,
		};

		static int adsp_init_clock(struct qcom_adsp *adsp)
		{
		int ret;
		@@ -383,6 +401,7 @@ static int adsp_probe(struct platform_device *pdev)
		struct qcom_adsp *adsp;
		struct rproc *rproc;
		const char *fw_name;
		const struct rproc_ops *ops = &adsp_ops;
		int ret;

		desc = of_device_get_match_data(&pdev->dev);
		@@ -398,8 +417,11 @@ static int adsp_probe(struct platform_device *pdev)
		if (ret < 0 && ret != -EINVAL)
		return ret;

		rproc = rproc_alloc(&pdev->dev, pdev->name, &adsp_ops,
		fw_name, sizeof(*adsp));
		if (desc->minidump_id)
		ops = &adsp_minidump_ops;

		rproc = rproc_alloc(&pdev->dev, pdev->name, ops, fw_name, sizeof(*adsp));

		if (!rproc) {
		dev_err(&pdev->dev, "unable to allocate remoteproc\n");
		return -ENOMEM;
		@@ -411,6 +433,7 @@ static int adsp_probe(struct platform_device *pdev)
		adsp = (struct qcom_adsp *)rproc->priv;
		adsp->dev = &pdev->dev;
		adsp->rproc = rproc;
		adsp->minidump_id = desc->minidump_id;
		adsp->pas_id = desc->pas_id;
		adsp->has_aggre2_clk = desc->has_aggre2_clk;
		adsp->info_name = desc->sysmon_name;

Admin message