staging: ti dspbridge: deh: remove err_info

We only use it to pass the MMU fault address.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/tidspbridge/core/_deh.h b/drivers/staging/tidspbridge/core/_deh.h
index 8da2212e40834a6523277cb12824f53f0874e3c1..32b84f30b09ffcb28de567b7ceb784a2bd8289ba 100644 (file)
--- a/drivers/staging/tidspbridge/core/_deh.h
+++ b/drivers/staging/tidspbridge/core/_deh.h
@@ -26,7 +26,7 @@
 struct deh_mgr {
        struct bridge_dev_context *hbridge_context;     /* Bridge context. */
        struct ntfy_object *ntfy_obj;   /* NTFY object */
-       struct dsp_errorinfo err_info;  /* DSP exception info. */
+       u32 fault_addr;
 
        /* MMU Fault DPC */
        struct tasklet_struct dpc_tasklet;

diff --git a/drivers/staging/tidspbridge/core/mmu_fault.c b/drivers/staging/tidspbridge/core/mmu_fault.c
index 42fe23f13eb76933978ccefbf9b9a2ff76bb03cd..dadfbf5c5ab691b16e05b50e2bb00a79eef9bbf1 100644 (file)
--- a/drivers/staging/tidspbridge/core/mmu_fault.c
+++ b/drivers/staging/tidspbridge/core/mmu_fault.c
@@ -40,8 +40,6 @@
 #include "_tiomap.h"
 #include "mmu_fault.h"
 
-u32 fault_addr;
-
 /*
  *  ======== mmu_fault_dpc ========
  *      Deferred procedure call to handle DSP MMU fault.
@@ -78,9 +76,9 @@ irqreturn_t mmu_fault_isr(int irq, IN void *pRefData)
 
        hw_mmu_event_status(resources->dw_dmmu_base, &dmmu_event_mask);
        if (dmmu_event_mask == HW_MMU_TRANSLATION_FAULT) {
-               hw_mmu_fault_addr_read(resources->dw_dmmu_base, &fault_addr);
+               hw_mmu_fault_addr_read(resources->dw_dmmu_base, &deh_mgr_obj->fault_addr);
                dev_info(bridge, "%s: status=0x%x, fault_addr=0x%x\n", __func__,
-                               dmmu_event_mask, fault_addr);
+                               dmmu_event_mask, deh_mgr_obj->fault_addr);
                /*
                 * Schedule a DPC directly. In the future, it may be
                 * necessary to check if DSP MMU fault is intended for
@@ -88,11 +86,6 @@ irqreturn_t mmu_fault_isr(int irq, IN void *pRefData)
                 */
                tasklet_schedule(&deh_mgr_obj->dpc_tasklet);
 
-               /* Reset err_info structure before use. */
-               deh_mgr_obj->err_info.dw_err_mask = DSP_MMUFAULT;
-               deh_mgr_obj->err_info.dw_val1 = fault_addr >> 16;
-               deh_mgr_obj->err_info.dw_val2 = fault_addr & 0xFFFF;
-               deh_mgr_obj->err_info.dw_val3 = 0L;
                /* Disable the MMU events, else once we clear it will
                 * start to raise INTs again */
                hw_mmu_event_disable(resources->dw_dmmu_base,

diff --git a/drivers/staging/tidspbridge/core/mmu_fault.h b/drivers/staging/tidspbridge/core/mmu_fault.h
index 74db4893a82245f1ab715cc167cbd56e794910ec..537e6e7d8b1ffa09599748b308237f94458c4ed6 100644 (file)
--- a/drivers/staging/tidspbridge/core/mmu_fault.h
+++ b/drivers/staging/tidspbridge/core/mmu_fault.h
@@ -19,8 +19,6 @@
 #ifndef MMU_FAULT_
 #define MMU_FAULT_
 
-extern u32 fault_addr;
-
 /*
  *  ======== mmu_fault_dpc ========
  *      Deferred procedure call to handle DSP MMU fault.

diff --git a/drivers/staging/tidspbridge/core/ue_deh.c b/drivers/staging/tidspbridge/core/ue_deh.c
index a4940a8e8af5568d41cb9a3c9be45a4c128a0356..904b837208b53545232a51c48234e2141ceed208 100644 (file)
--- a/drivers/staging/tidspbridge/core/ue_deh.c
+++ b/drivers/staging/tidspbridge/core/ue_deh.c
@@ -84,10 +84,6 @@ int bridge_deh_create(struct deh_mgr **ret_deh_mgr,
 
        /* Fill in context structure */
        deh_mgr->hbridge_context = hbridge_context;
-       deh_mgr->err_info.dw_err_mask = 0L;
-       deh_mgr->err_info.dw_val1 = 0L;
-       deh_mgr->err_info.dw_val2 = 0L;
-       deh_mgr->err_info.dw_val3 = 0L;
 
        /* Install ISR function for DSP MMU fault */
        status = request_irq(INT_DSP_MMU_IRQ, mmu_fault_isr, 0,
@@ -140,7 +136,8 @@ int bridge_deh_register_notify(struct deh_mgr *deh_mgr, u32 event_mask,
                return ntfy_unregister(deh_mgr->ntfy_obj, hnotification);
 }
 
-static void mmu_fault_print_stack(struct bridge_dev_context *dev_context)
+static void mmu_fault_print_stack(struct bridge_dev_context *dev_context,
+               u32 fault_addr)
 {
        struct cfg_hostres *resources;
        struct hw_mmu_map_attrs_t map_attrs = {
@@ -192,50 +189,29 @@ void bridge_deh_notify(struct deh_mgr *deh_mgr, u32 ulEventMask, u32 dwErrInfo)
 
        switch (ulEventMask) {
        case DSP_SYSERROR:
-               /* reset err_info structure before use */
-               deh_mgr->err_info.dw_err_mask = DSP_SYSERROR;
-               deh_mgr->err_info.dw_val1 = 0L;
-               deh_mgr->err_info.dw_val2 = 0L;
-               deh_mgr->err_info.dw_val3 = 0L;
-               deh_mgr->err_info.dw_val1 = dwErrInfo;
                dev_err(bridge, "%s: %s, err_info = 0x%x\n",
                                __func__, "DSP_SYSERROR", dwErrInfo);
                dump_dl_modules(dev_context);
                dump_dsp_stack(dev_context);
                break;
        case DSP_MMUFAULT:
-               /* MMU fault routine should have set err info structure. */
-               deh_mgr->err_info.dw_err_mask = DSP_MMUFAULT;
                dev_err(bridge, "%s: %s, err_info = 0x%x\n",
                                __func__, "DSP_MMUFAULT", dwErrInfo);
-               dev_info(bridge, "%s: %s, high=0x%x, low=0x%x, "
-                       "fault=0x%x\n", __func__, "DSP_MMUFAULT",
-                       (unsigned int) deh_mgr->err_info.dw_val1,
-                       (unsigned int) deh_mgr->err_info.dw_val2,
-                       (unsigned int) fault_addr);
+               dev_info(bridge, "%s: %s, fault=0x%x\n", __func__, "DSP_MMUFAULT",
+                               deh_mgr->fault_addr);
 
                print_dsp_trace_buffer(dev_context);
                dump_dl_modules(dev_context);
 
-               mmu_fault_print_stack(dev_context);
+               mmu_fault_print_stack(dev_context, deh_mgr->fault_addr);
                break;
 #ifdef CONFIG_BRIDGE_NTFY_PWRERR
        case DSP_PWRERROR:
-               /* reset err_info structure before use */
-               deh_mgr->err_info.dw_err_mask = DSP_PWRERROR;
-               deh_mgr->err_info.dw_val1 = 0L;
-               deh_mgr->err_info.dw_val2 = 0L;
-               deh_mgr->err_info.dw_val3 = 0L;
-               deh_mgr->err_info.dw_val1 = dwErrInfo;
                dev_err(bridge, "%s: %s, err_info = 0x%x\n",
                                __func__, "DSP_PWRERROR", dwErrInfo);
                break;
 #endif /* CONFIG_BRIDGE_NTFY_PWRERR */
        case DSP_WDTOVERFLOW:
-               deh_mgr->err_info.dw_err_mask = DSP_WDTOVERFLOW;
-               deh_mgr->err_info.dw_val1 = 0L;
-               deh_mgr->err_info.dw_val2 = 0L;
-               deh_mgr->err_info.dw_val3 = 0L;
                dev_err(bridge, "%s: DSP_WDTOVERFLOW\n", __func__);
                break;
        default:

diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
index aba8a8640d3085da7f247e9074e1a2c76ffd94fa..9462a966ab849c1e622cc5d65ab883a6fa5ec7f6 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
@@ -428,7 +428,6 @@ struct dsp_errorinfo {
 struct dsp_processorstate {
        u32 cb_struct;
        enum dsp_procstate proc_state;
-       struct dsp_errorinfo err_info;
 };
 
 /*