remoteproc: qcom: Add full coredump fallback mechanism

If a remoteproc's firmware does not support minidump but the driver
adds an ID, the minidump driver does not collect any coredumps when
the remoteproc crashes. This hinders the purpose of coredump
collection. This change adds a fallback mechanism in the event of a
crash.

Signed-off-by: Siddharth Gupta <sidgup@codeaurora.org>
Signed-off-by: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
Link: https://lore.kernel.org/r/20230224211707.30916-3-quic_gokukris@quicinc.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
index a0d4238492e90c20bcb57f22f8666c7db1916951..4bbb47dda05ecff5ccfb4efaf06b1e24c3c3b5f5 100644 (file)
--- a/drivers/remoteproc/qcom_common.c
+++ b/drivers/remoteproc/qcom_common.c
@@ -168,12 +168,21 @@ void qcom_minidump(struct rproc *rproc, unsigned int minidump_id,
         */
        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) {
+           le32_to_cpu(subsystem->enabled) != MD_SS_ENABLED) {
+               return rproc_coredump(rproc);
+       }
+
+       if (le32_to_cpu(subsystem->encryption_status) != MD_SS_ENCR_DONE) {
                dev_err(&rproc->dev, "Minidump not ready, skipping\n");
                return;
        }
 
+       /**
+        * Clear out the dump segments populated by parse_fw before
+        * re-populating them with minidump segments.
+        */
+       rproc_coredump_cleanup(rproc);
+
        ret = qcom_add_minidump_segments(rproc, subsystem, rproc_dumpfn_t);
        if (ret) {
                dev_err(&rproc->dev, "Failed with error: %d while adding minidump entries\n", ret);

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 0caedb09054796188792d71f500b14666b30ec50..d5b62066743fe13bb58a5ebbb346c87adabdd1ca 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -426,6 +426,7 @@ static const struct rproc_ops adsp_minidump_ops = {
        .start = adsp_start,
        .stop = adsp_stop,
        .da_to_va = adsp_da_to_va,
+       .parse_fw = qcom_register_dump_segments,
        .load = adsp_load,
        .panic = adsp_panic,
        .coredump = adsp_minidump,