diff options
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/Peripherals')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.c | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.c b/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.c index db4609f..3b28099 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.c +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.c @@ -3401,7 +3401,10 @@ t_Handle FM_Config(t_FmParams *p_FmParam) #endif /* FM_QMI_NO_DEQ_OPTIONS_SUPPORT */ p_Fm->p_FmStateStruct->totalFifoSize = 0; - p_Fm->p_FmStateStruct->totalNumOfTasks = DEFAULT_totalNumOfTasks; + p_Fm->p_FmStateStruct->totalNumOfTasks = + DEFAULT_totalNumOfTasks(p_Fm->p_FmStateStruct->revInfo.majorRev, + p_Fm->p_FmStateStruct->revInfo.minorRev); + #ifdef FM_HAS_TOTAL_DMAS p_Fm->p_FmStateStruct->maxNumOfOpenDmas = BMI_MAX_NUM_OF_DMAS; #endif /* FM_HAS_TOTAL_DMAS */ diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h b/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h index 4c1897b..ea103db 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/fm.h @@ -306,7 +306,8 @@ switch (exception){ \ (((major == 2) || (major == 5)) ? \ (100*KILOBYTE) : ((major == 4) ? \ (49*KILOBYTE) : (122*KILOBYTE))) -#define DEFAULT_totalNumOfTasks BMI_MAX_NUM_OF_TASKS +#define DEFAULT_totalNumOfTasks(major, minor) \ + BMI_MAX_NUM_OF_TASKS #define DEFAULT_dmaCommQLow ((DMA_THRESH_MAX_COMMQ+1)/2) #define DEFAULT_dmaCommQHigh ((DMA_THRESH_MAX_COMMQ+1)*3/4) @@ -335,7 +336,9 @@ switch (exception){ \ (((major == 6) && ((minor == 1) || (minor == 4))) ? \ (156*KILOBYTE) : (295*KILOBYTE)) -#define DEFAULT_totalNumOfTasks 124 +/* According to the default value of FMBM_CFG2[TNTSKS] */ +#define DEFAULT_totalNumOfTasks(major, minor) \ + (((major == 6) && ((minor == 1) || (minor == 4))) ? 59 : 124) #define DEFAULT_dmaCommQLow 0x2A #define DEFAULT_dmaCommQHigh 0x3F |