remoteproc: add rproc_report_crash function to notify rproc crashes

Allow low-level remoteproc drivers to report rproc crashes by exporting
a new rproc_report_crash() function (invoking this from non-rproc drivers
is probably wrong, and should be carefully scrutinized if ever needed).

rproc_report_crash() can be called from any context; it offloads the
tasks of handling the crash to a separate thread.

Handling the crash from a separate thread is helpful because:
- Ability to call invoke rproc_report_crash() from atomic context, due to
  the fact that many crashes trigger an interrupt, so this function can be
  called directly from ISR context.
- Avoiding deadlocks which could happen if rproc_report_crash() is called
  from a function which indirectly holds the rproc lock.

Handling the crash might involve:
- Remoteproc register dump
- Remoteproc stack dump
- Remoteproc core dump
- Saving Remoteproc traces so they can be read after the crash
- Reseting the remoteproc in order to make it functional again (hard recovery)

Right now, we only print the crash type which was detected, and only the
mmufault type is supported. Remoteproc low-level drivers can add more types
when needed.

Signed-off-by: Fernando Guzman Lugo <fernando.lugo@ti.com>
[ohad: some commentary, white space and commit log changes]
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>

diff --git a/Documentation/remoteproc.txt b/Documentation/remoteproc.txt
index 23a09b884bc76398a6a82bb68933dcba84b4231a..e6469fdcf89a0344b017f90c821019750d8e9039 100644 (file)
--- a/Documentation/remoteproc.txt
+++ b/Documentation/remoteproc.txt
@@ -129,6 +129,13 @@ int dummy_rproc_example(struct rproc *my_rproc)
 
       Returns 0 on success and -EINVAL if @rproc isn't valid.
 
+  void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type)
+    - Report a crash in a remoteproc
+      This function must be called every time a crash is detected by the
+      platform specific rproc implementation. This should not be called from a
+      non-remoteproc driver. This function can be called from atomic/interrupt
+      context.
+
 5. Implementation callbacks
 
 These callbacks should be provided by platform-specific remoteproc

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index d5c2dbfc7443c0ca4ced101fc0ab5447b0bf1e8f..93e2b3526543ddaa88d14ede936bec2aef24b9b4 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -50,6 +50,18 @@ typedef int (*rproc_handle_resource_t)(struct rproc *rproc, void *, int avail);
 /* Unique indices for remoteproc devices */
 static DEFINE_IDA(rproc_dev_index);
 
+static const char * const rproc_crash_names[] = {
+       [RPROC_MMUFAULT]        = "mmufault",
+};
+
+/* translate rproc_crash_type to string */
+static const char *rproc_crash_to_string(enum rproc_crash_type type)
+{
+       if (type < ARRAY_SIZE(rproc_crash_names))
+               return rproc_crash_names[type];
+       return "unkown";
+}
+
 /*
  * This is the IOMMU fault handler we register with the IOMMU API
  * (when relevant; not all remote processors access memory through
@@ -57,18 +69,19 @@ static DEFINE_IDA(rproc_dev_index);
  *
  * IOMMU core will invoke this handler whenever the remote processor
  * will try to access an unmapped device address.
- *
- * Currently this is mostly a stub, but it will be later used to trigger
- * the recovery of the remote processor.
  */
 static int rproc_iommu_fault(struct iommu_domain *domain, struct device *dev,
                unsigned long iova, int flags, void *token)
 {
+       struct rproc *rproc = token;
+
        dev_err(dev, "iommu fault: da 0x%lx flags 0x%x\n", iova, flags);
 
+       rproc_report_crash(rproc, RPROC_MMUFAULT);
+
        /*
         * Let the iommu core know we're not really handling this fault;
-        * we just plan to use this as a recovery trigger.
+        * we just used it as a recovery trigger.
         */
        return -ENOSYS;
 }
@@ -871,6 +884,36 @@ out:
        complete_all(&rproc->firmware_loading_complete);
 }
 
+/**
+ * rproc_crash_handler_work() - handle a crash
+ *
+ * This function needs to handle everything related to a crash, like cpu
+ * registers and stack dump, information to help to debug the fatal error, etc.
+ */
+static void rproc_crash_handler_work(struct work_struct *work)
+{
+       struct rproc *rproc = container_of(work, struct rproc, crash_handler);
+       struct device *dev = &rproc->dev;
+
+       dev_dbg(dev, "enter %s\n", __func__);
+
+       mutex_lock(&rproc->lock);
+
+       if (rproc->state == RPROC_CRASHED || rproc->state == RPROC_OFFLINE) {
+               /* handle only the first crash detected */
+               mutex_unlock(&rproc->lock);
+               return;
+       }
+
+       rproc->state = RPROC_CRASHED;
+       dev_err(dev, "handling crash #%u in %s\n", ++rproc->crash_cnt,
+               rproc->name);
+
+       mutex_unlock(&rproc->lock);
+
+       /* TODO: handle crash */
+}
+
 /**
  * rproc_boot() - boot a remote processor
  * @rproc: handle of a remote processor
@@ -1165,6 +1208,8 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
        INIT_LIST_HEAD(&rproc->traces);
        INIT_LIST_HEAD(&rproc->rvdevs);
 
+       INIT_WORK(&rproc->crash_handler, rproc_crash_handler_work);
+
        rproc->state = RPROC_OFFLINE;
 
        return rproc;
@@ -1221,6 +1266,32 @@ int rproc_del(struct rproc *rproc)
 }
 EXPORT_SYMBOL(rproc_del);
 
+/**
+ * rproc_report_crash() - rproc crash reporter function
+ * @rproc: remote processor
+ * @type: crash type
+ *
+ * This function must be called every time a crash is detected by the low-level
+ * drivers implementing a specific remoteproc. This should not be called from a
+ * non-remoteproc driver.
+ *
+ * This function can be called from atomic/interrupt context.
+ */
+void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type)
+{
+       if (!rproc) {
+               pr_err("NULL rproc pointer\n");
+               return;
+       }
+
+       dev_err(&rproc->dev, "crash detected in %s: type %s\n",
+               rproc->name, rproc_crash_to_string(type));
+
+       /* create a new task to handle the error */
+       schedule_work(&rproc->crash_handler);
+}
+EXPORT_SYMBOL(rproc_report_crash);
+
 static int __init remoteproc_init(void)
 {
        rproc_init_debugfs();

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 131b53957b9f24d2127936ac86c5d0f7e34f766a..a46ed2723803d6c66437e6286f777c1295470050 100644 (file)
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -360,6 +360,19 @@ enum rproc_state {
        RPROC_LAST      = 4,
 };
 
+/**
+ * enum rproc_crash_type - remote processor crash types
+ * @RPROC_MMUFAULT:    iommu fault
+ *
+ * Each element of the enum is used as an array index. So that, the value of
+ * the elements should be always something sane.
+ *
+ * Feel free to add more types when needed.
+ */
+enum rproc_crash_type {
+       RPROC_MMUFAULT,
+};
+
 /**
  * struct rproc - represents a physical remote processor device
  * @node: klist node of this rproc object
@@ -383,6 +396,8 @@ enum rproc_state {
  * @rvdevs: list of remote virtio devices
  * @notifyids: idr for dynamically assigning rproc-wide unique notify ids
  * @index: index of this rproc device
+ * @crash_handler: workqueue for handling a crash
+ * @crash_cnt: crash counter
  */
 struct rproc {
        struct klist_node node;
@@ -406,6 +421,8 @@ struct rproc {
        struct list_head rvdevs;
        struct idr notifyids;
        int index;
+       struct work_struct crash_handler;
+       unsigned crash_cnt;
 };
 
 /* we currently support only two vrings per rvdev */
@@ -460,6 +477,7 @@ int rproc_del(struct rproc *rproc);
 
 int rproc_boot(struct rproc *rproc);
 void rproc_shutdown(struct rproc *rproc);
+void rproc_report_crash(struct rproc *rproc, enum rproc_crash_type type);
 
 static inline struct rproc_vdev *vdev_to_rvdev(struct virtio_device *vdev)
 {