diff options
| author | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-11-14 13:35:54 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:40:41 (GMT) |
| commit | 731a7f815cc8d300d51b96eeacc058295dc61402 (patch) | |
| tree | a8d02c4fc62ae5c01039215d1ef60db2c8090e2f /drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h | |
| parent | 6337363a3c85f8da8a524a56c32829dbd7ae3433 (diff) | |
| download | linux-fsl-qoriq-731a7f815cc8d300d51b96eeacc058295dc61402.tar.xz | |
Revert "fmd: fix static analysis issues"
This reverts commit 5e921ed07acbc6f05536aac89b9edc2578663840.
Change-Id: Ic4d1166b5ad6419f369e3be278f41ea5764ff6fc
Reviewed-on: http://git.am.freescale.net:8181/23784
Reviewed-by: Matthew Weigel <Matthew.Weigel@freescale.com>
Tested-by: Matthew Weigel <Matthew.Weigel@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h | 50 |
1 files changed, 43 insertions, 7 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h b/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h index 817b70e..ad391c8 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h @@ -157,6 +157,44 @@ switch (exception){ \ break; \ } +#define FMAN_EXCEPTION_TRANS(fsl_exception, _exception) \ + switch (_exception) {\ + case e_FM_EX_DMA_BUS_ERROR: \ + fsl_exception = E_FMAN_EX_DMA_BUS_ERROR; break; \ + case e_FM_EX_DMA_READ_ECC: \ + fsl_exception = E_FMAN_EX_DMA_READ_ECC; break; \ + case e_FM_EX_DMA_SYSTEM_WRITE_ECC: \ + fsl_exception = E_FMAN_EX_DMA_SYSTEM_WRITE_ECC; break; \ + case e_FM_EX_DMA_FM_WRITE_ECC: \ + fsl_exception = E_FMAN_EX_DMA_FM_WRITE_ECC; break; \ + case e_FM_EX_FPM_STALL_ON_TASKS: \ + fsl_exception = E_FMAN_EX_FPM_STALL_ON_TASKS; break; \ + case e_FM_EX_FPM_SINGLE_ECC: \ + fsl_exception = E_FMAN_EX_FPM_SINGLE_ECC; break; \ + case e_FM_EX_FPM_DOUBLE_ECC: \ + fsl_exception = E_FMAN_EX_FPM_DOUBLE_ECC; break; \ + case e_FM_EX_QMI_SINGLE_ECC: \ + fsl_exception = E_FMAN_EX_QMI_SINGLE_ECC; break; \ + case e_FM_EX_QMI_DOUBLE_ECC: \ + fsl_exception = E_FMAN_EX_QMI_DOUBLE_ECC; break; \ + case e_FM_EX_QMI_DEQ_FROM_UNKNOWN_PORTID: \ + fsl_exception = E_FMAN_EX_QMI_DEQ_FROM_UNKNOWN_PORTID; break; \ + case e_FM_EX_BMI_LIST_RAM_ECC: \ + fsl_exception = E_FMAN_EX_BMI_LIST_RAM_ECC; break; \ + case e_FM_EX_BMI_STORAGE_PROFILE_ECC: \ + fsl_exception = E_FMAN_EX_BMI_STORAGE_PROFILE_ECC; break; \ + case e_FM_EX_BMI_STATISTICS_RAM_ECC: \ + fsl_exception = E_FMAN_EX_BMI_STATISTICS_RAM_ECC; break; \ + case e_FM_EX_BMI_DISPATCH_RAM_ECC: \ + fsl_exception = E_FMAN_EX_BMI_DISPATCH_RAM_ECC; break; \ + case e_FM_EX_IRAM_ECC: \ + fsl_exception = E_FMAN_EX_IRAM_ECC; break; \ + case e_FM_EX_MURAM_ECC: \ + fsl_exception = E_FMAN_EX_MURAM_ECC; break; \ + default: \ + fsl_exception = E_FMAN_EX_DMA_BUS_ERROR; break; \ + } + #define FMAN_CACHE_OVERRIDE_TRANS(fsl_cache_override, _cache_override) \ switch (_cache_override){ \ case e_FM_DMA_NO_CACHE_OR: \ @@ -433,19 +471,18 @@ switch (exception){ \ #if defined(__MWERKS__) && !defined(__GNUC__) #pragma pack(push,1) #endif /* defined(__MWERKS__) && ... */ - -typedef struct +typedef _Packed struct { volatile uint32_t iadd; /**< FM IRAM instruction address register */ volatile uint32_t idata; /**< FM IRAM instruction data register */ volatile uint32_t itcfg; /**< FM IRAM timing config register */ volatile uint32_t iready; /**< FM IRAM ready register */ - volatile uint32_t res[0x1FFFC]; -} t_FMIramRegs; + volatile uint8_t res[0x80000-0x10]; +} _PackedType t_FMIramRegs; /* Trace buffer registers - each FM Controller has its own trace buffer residing at FM_MM_TRB(fmCtrlIndex) offset */ -typedef struct t_FmTrbRegs +typedef _Packed struct t_FmTrbRegs { volatile uint32_t tcrh; volatile uint32_t tcrl; @@ -472,12 +509,11 @@ typedef struct t_FmTrbRegs volatile uint32_t tsnum2; volatile uint32_t tsnum3; volatile uint32_t tsnum4; -} t_FmTrbRegs; +} _PackedType t_FmTrbRegs; #if defined(__MWERKS__) && !defined(__GNUC__) #pragma pack(pop) #endif /* defined(__MWERKS__) && ... */ - /**************************************************************************//** @Description General defines *//***************************************************************************/ |