diff options
author | Rich Schmitt <B43082@freescale.com> | 2014-10-31 15:03:32 (GMT) |
---|---|---|
committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:39:21 (GMT) |
commit | 0b18afe44faef1516f66168bbf782ebad4040006 (patch) | |
tree | 1c0fd882a9dd5476a835b410109ca9ebbd95278e /drivers/net/ethernet/freescale/fman/Peripherals/FM/inc | |
parent | 23fd3e4bab3478f2b620732c0a4e07b3567b9f1c (diff) | |
parent | bbadd4637d89b404a1b6a539ea72b37d4a748001 (diff) | |
download | linux-fsl-qoriq-0b18afe44faef1516f66168bbf782ebad4040006.tar.xz |
Integrate t1024 patches
Merge remote-tracking branch 't1024-linux/master'
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/Peripherals/FM/inc')
-rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h | 19 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_hc.h | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h b/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h index 7343d6f..b736dcc 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_common.h @@ -51,6 +51,10 @@ #define CLS_PLAN_NUM_PER_GRP 8 #define IP_OFFLOAD_PACKAGE_NUMBER 106 +#define CAPWAP_OFFLOAD_PACKAGE_NUMBER 108 +#define IS_OFFLOAD_PACKAGE(num) ((num == IP_OFFLOAD_PACKAGE_NUMBER) || (num == CAPWAP_OFFLOAD_PACKAGE_NUMBER)) + + /**************************************************************************//** @@ -165,7 +169,9 @@ typedef _Packed struct t_FmPcdCtrlParamsPage { volatile uint32_t misc; volatile uint32_t errorsDiscardMask; volatile uint32_t discardMask; - volatile uint8_t reserved3[180]; + volatile uint8_t reserved3[4]; + volatile uint32_t postBmiFetchNia; + volatile uint8_t reserved4[172]; } _PackedType t_FmPcdCtrlParamsPage; @@ -188,11 +194,11 @@ typedef struct t_FmPcdCcFragScratchPoolCmdParams { uint8_t bufferPoolId; } t_FmPcdCcFragScratchPoolCmdParams; -typedef struct t_FmPcdCcIpReassmTimeoutParams { +typedef struct t_FmPcdCcReassmTimeoutParams { bool activate; uint8_t tsbs; uint32_t iprcpt; -} t_FmPcdCcIpReassmTimeoutParams; +} t_FmPcdCcReassmTimeoutParams; typedef struct { uint8_t baseEntry; @@ -251,6 +257,7 @@ typedef struct { uint32_t nia; t_FmFmanCtrl orFmanCtrl; bool overwrite; + uint8_t ofpDpde; } t_SetCcParams; typedef struct { @@ -326,6 +333,7 @@ static __inline__ bool TRY_LOCK(t_Handle h_Spinlock, volatile bool *p_Flag) #define UPDATE_PSO 0x40000000 #define UPDATE_NIA_PNDN 0x20000000 #define UPDATE_FMFP_PRC_WITH_ONE_RISC_ONLY 0x10000000 +#define UPDATE_OFP_DPTE 0x08000000 #define UPDATE_NIA_FENE 0x04000000 #define UPDATE_NIA_CMNE 0x02000000 #define UPDATE_NIA_FPNE 0x01000000 @@ -341,7 +349,7 @@ static __inline__ bool TRY_LOCK(t_Handle h_Spinlock, volatile bool *p_Flag) #define UPDATE_KG_NIA_CC_WA 0x10000000 #define UPDATE_KG_OPT_MODE 0x08000000 #define UPDATE_KG_NIA 0x04000000 -#define UPDATE_CC_SHADOW_CLEAR 0x02000000 +#define UPDATE_CC_SHADOW_CLEAR 0x02000000 /* @} */ #define UPDATE_FPM_BRKC_SLP 0x80000000 @@ -772,7 +780,8 @@ t_Error FmPcdCcModifyNextEngineParamTree(t_Handle h_FmPcd, t_Handle h_FmPcdC uint32_t FmPcdCcGetNodeAddrOffsetFromNodeInfo(t_Handle h_FmPcd, t_Handle h_Pointer); t_Handle FmPcdCcTreeGetSavedManipParams(t_Handle h_FmTree); void FmPcdCcTreeSetSavedManipParams(t_Handle h_FmTree, t_Handle h_SavedManipParams); -t_Error FmPcdCcTreeAddIPR(t_Handle h_FmPcd, t_Handle h_FmTree, t_Handle h_NetEnv, t_Handle h_IpReassemblyManip, bool schemes); +t_Error FmPcdCcTreeAddIPR(t_Handle h_FmPcd, t_Handle h_FmTree, t_Handle h_NetEnv, t_Handle h_ReassemblyManip, bool schemes); +t_Error FmPcdCcTreeAddCPR(t_Handle h_FmPcd, t_Handle h_FmTree, t_Handle h_NetEnv, t_Handle h_ReassemblyManip, bool schemes); t_Error FmPcdCcBindTree(t_Handle h_FmPcd, t_Handle h_PcdParams, t_Handle h_CcTree, uint32_t *p_Offset,t_Handle h_FmPort); t_Error FmPcdCcUnbindTree(t_Handle h_FmPcd, t_Handle h_CcTree); diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_hc.h b/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_hc.h index 099a238..492aa8a 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_hc.h +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/inc/fm_hc.h @@ -63,7 +63,7 @@ t_Error FmHcPcdKgSetScheme(t_Handle h_FmHc, t_Error FmHcPcdKgDeleteScheme(t_Handle h_FmHc, t_Handle h_Scheme); t_Error FmHcPcdCcCapwapTimeoutReassm(t_Handle h_FmHc, t_FmPcdCcCapwapReassmTimeoutParams *p_CcCapwapReassmTimeoutParams ); t_Error FmHcPcdCcIpFragScratchPollCmd(t_Handle h_FmHc, bool fill, t_FmPcdCcFragScratchPoolCmdParams *p_FmPcdCcFragScratchPoolCmdParams); -t_Error FmHcPcdCcIpTimeoutReassm(t_Handle h_FmHc, t_FmPcdCcIpReassmTimeoutParams *p_CcIpReassmTimeoutParams, uint8_t *p_Result); +t_Error FmHcPcdCcTimeoutReassm(t_Handle h_FmHc, t_FmPcdCcReassmTimeoutParams *p_CcReassmTimeoutParams, uint8_t *p_Result); t_Error FmHcPcdKgSetClsPlan(t_Handle h_FmHc, t_FmPcdKgInterModuleClsPlanSet *p_Set); t_Error FmHcPcdKgDeleteClsPlan(t_Handle h_FmHc, uint8_t clsPlanGrpId); |