From b6871448bf070c61e1d9c60ad2722387279d8269 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 4 Jul 2010 16:34:35 +0300 Subject: [PATCH 279/524] staging: ti dspbridge: deh: remove err_info We only use it to pass the MMU fault address. Signed-off-by: Felipe Contreras Signed-off-by: Greg Kroah-Hartman --- drivers/staging/tidspbridge/core/_deh.h | 2 +- drivers/staging/tidspbridge/core/mmu_fault.c | 11 +----- drivers/staging/tidspbridge/core/mmu_fault.h | 2 - drivers/staging/tidspbridge/core/ue_deh.c | 34 +++----------------- .../staging/tidspbridge/include/dspbridge/dbdefs.h | 1 - 5 files changed, 8 insertions(+), 42 deletions(-) diff --git a/drivers/staging/tidspbridge/core/_deh.h b/drivers/staging/tidspbridge/core/_deh.h index 8da2212..32b84f3 100644 --- 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 42fe23f..dadfbf5 100644 --- 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 74db489..537e6e7 100644 --- 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 a4940a8..904b837 100644 --- 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 aba8a86..9462a96 100644 --- 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; }; /* -- 1.7.1