fmd: fmd21.1 integration

Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com>

- PFC
  Adjustments for PFC configuration constraints and limitations related to
  port prefetch mode

- workaround ucode issues
  Fix the following HW erratas regarding discard/error frames on V3:

    FM_OP_NO_VSP_NO_RELEASE_ERRATA_FMAN_A006675 -
      Description: OP without VSP will cause buffer leaks when instructed to discard a frame.
      Workaround: FW will release the buffers.

    FM_ERROR_VSP_NO_MATCH_SW006 -
      Description: Any port with VSP enabled and multiple VSPs are configured
                   on this port can cause a situation where an error frame will
                   be enqueued to the error queue not with the default VSP.
      Workaround:  FW will replaced the current VSP with the default VSP
                   just before the frame is being enqueued to the error queue.

- Chosen-node new parameter support
  errors-to-discard
      Usage: optional
      Value type: <u32>
      Definition: Specifies which errors should be discarded.
        Errors that are not in the mask, will not be discarded;
        I.e. those errors will be enqueued and sent to the default error queue.

Change-Id: Ib468c67de88376e17d9c39ab5a0c8fc5b33b7b82
Reviewed-on: http://git.am.freescale.net:8181/2605
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Bucur Madalin-Cristian-B32716 <madalin.bucur@freescale.com>
Reviewed-by: Garg Vakul-B16394 <vakul@freescale.com>
Reviewed-by: Radulescu Ruxandra Ioana-B05472 <ruxandra.radulescu@freescale.com>
Reviewed-by: Chereji Marian-Cornel-R27762 <marian.chereji@freescale.com>
Reviewed-by: Wang Haiying-R54964 <Haiying.Wang@freescale.com>
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c
index 60f71d7..a55bb25 100644
--- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c
+++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c
@@ -1064,7 +1064,7 @@ static t_Error UpdateInitCapwapFragmentation(t_Handle       h_FmPort,
             RETURN_ERROR(MAJOR, E_INVALID_STATE, ("in this stage parameters from Port has not be updated"));
         fmPortGetSetCcParams.getCcParams.type = p_Manip->updateParams;
         fmPortGetSetCcParams.setCcParams.type = UPDATE_NIA_PNEN | UPDATE_FMFP_PRC_WITH_ONE_RISC_ONLY;
-        fmPortGetSetCcParams.setCcParams.nia = NIA_FM_CTL_AC_FRAG | NIA_ENG_FM_CTL;
+        fmPortGetSetCcParams.setCcParams.nia = NIA_FM_CTL_AC_POP_TO_N_STEP | NIA_ENG_FM_CTL;
         /* For CAPWAP Rassembly used FMAN_CTRL2 hardcoded - so for fragmentation its better to use FMAN_CTRL1 */
         fmPortGetSetCcParams.setCcParams.orFmanCtrl = FPM_PORT_FM_CTL1;
 
@@ -1091,7 +1091,7 @@ static t_Error UpdateInitCapwapFragmentation(t_Handle       h_FmPort,
             RETURN_ERROR(MAJOR, E_INVALID_STATE, ("in this stage parameters from Port has be updated"));
         fmPortGetSetCcParams.getCcParams.type = p_Manip->shadowUpdateParams;
         fmPortGetSetCcParams.setCcParams.type = UPDATE_NIA_PNEN | UPDATE_FMFP_PRC_WITH_ONE_RISC_ONLY;
-        fmPortGetSetCcParams.setCcParams.nia = NIA_FM_CTL_AC_FRAG | NIA_ENG_FM_CTL;
+        fmPortGetSetCcParams.setCcParams.nia = NIA_FM_CTL_AC_POP_TO_N_STEP | NIA_ENG_FM_CTL;
         err = FmPortGetSetCcParams(h_FmPort, &fmPortGetSetCcParams);
         if (err)
             RETURN_ERROR(MAJOR, err, NO_MSG);
@@ -1163,7 +1163,7 @@ static t_Error UpdateInitCapwapReasm(t_Handle      h_FmPcd,
 
         fmPortGetSetCcParams.getCcParams.type = p_Manip->updateParams;
         fmPortGetSetCcParams.setCcParams.type = UPDATE_NIA_PNEN;
-        fmPortGetSetCcParams.setCcParams.nia = NIA_FM_CTL_AC_FRAG | NIA_ENG_FM_CTL;
+        fmPortGetSetCcParams.setCcParams.nia = NIA_FM_CTL_AC_POP_TO_N_STEP | NIA_ENG_FM_CTL;
 
         err = FmPortGetSetCcParams(h_FmPort, &fmPortGetSetCcParams);
         if (err)
@@ -1192,7 +1192,7 @@ static t_Error UpdateInitCapwapReasm(t_Handle      h_FmPcd,
 
         fmPortGetSetCcParams.getCcParams.type = p_Manip->shadowUpdateParams;
         fmPortGetSetCcParams.setCcParams.type = UPDATE_NIA_PNEN;
-        fmPortGetSetCcParams.setCcParams.nia = NIA_FM_CTL_AC_FRAG | NIA_ENG_FM_CTL;
+        fmPortGetSetCcParams.setCcParams.nia = NIA_FM_CTL_AC_POP_TO_N_STEP | NIA_ENG_FM_CTL;
 
         err = FmPortGetSetCcParams(h_FmPort, &fmPortGetSetCcParams);
         if (err)
@@ -1612,7 +1612,7 @@ static t_Error UpdateInitIpReasm(t_Handle       h_FmPcd,
     t_Error                     err;
     t_FmPortPcdParams           *p_PcdParams = (t_FmPortPcdParams *)h_PcdParams;
 #if (DPAA_VERSION >= 11)
-    uint8_t                     *p_Ptr;
+    t_FmPcdCtrlParamsPage       *p_ParamsPage;
 #endif /* (DPAA_VERSION >= 11) */
 
     SANITY_CHECK_RETURN_ERROR(p_Manip, E_INVALID_HANDLE);
@@ -1718,7 +1718,7 @@ static t_Error UpdateInitIpReasm(t_Handle       h_FmPcd,
 
     if (fmPortGetSetCcParams.getCcParams.revInfo.majorRev >= 6)
     {
-        if ((err = FmPortSetGprFunc(h_FmPort, e_FM_PORT_GPR_MURAM_PAGE, (void**)&p_Ptr)) != E_OK)
+        if ((err = FmPortSetGprFunc(h_FmPort, e_FM_PORT_GPR_MURAM_PAGE, (void**)&p_ParamsPage)) != E_OK)
             RETURN_ERROR(MAJOR, err, NO_MSG);
 
         tmpReg32 = NIA_ENG_KG;
@@ -1727,7 +1727,7 @@ static t_Error UpdateInitIpReasm(t_Handle       h_FmPcd,
             tmpReg32 |= NIA_KG_DIRECT;
             tmpReg32 |= NIA_KG_CC_EN;
             tmpReg32 |= FmPcdKgGetSchemeId(p_Manip->ipReassmParams.h_Ipv4Scheme);
-            WRITE_UINT32(*(uint32_t*)PTR_MOVE(p_Ptr, NIA_IPR_DIRECT_SCHEME_IPV4_OFFSET), tmpReg32);
+            WRITE_UINT32(p_ParamsPage->iprIpv4Nia, tmpReg32);
         }
         if (p_Manip->ipReassmParams.h_Ipv6Scheme)
         {
@@ -1735,7 +1735,7 @@ static t_Error UpdateInitIpReasm(t_Handle       h_FmPcd,
             tmpReg32 |= NIA_KG_DIRECT;
             tmpReg32 |= NIA_KG_CC_EN;
             tmpReg32 |= FmPcdKgGetSchemeId(p_Manip->ipReassmParams.h_Ipv6Scheme);
-            WRITE_UINT32(*(uint32_t*)PTR_MOVE(p_Ptr, NIA_IPR_DIRECT_SCHEME_IPV6_OFFSET), tmpReg32);
+            WRITE_UINT32(p_ParamsPage->iprIpv6Nia, tmpReg32);
         }
     }
 #endif /* (DPAA_VERSION >= 11) */