octeontx2-af: Don't reset previous pfc config

Current implementation is such that driver first resets the
existing PFC config before applying new pfc configuration.
This creates a problem like once PF or VFs requests PFC config
previous pfc config by other PFVfs is getting reset.

This patch fixes the problem by removing unnecessary resetting
of PFC config. Also configure Pause quanta value to smaller as
current value is too high.

Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
index 25491edc35ce75484e61772818e91770fec0cd3b..931a1a7ebf765f7022a77129c547390d1d4f034e 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
@@ -847,6 +847,11 @@ static void cgx_lmac_pause_frm_config(void *cgxd, int lmac_id, bool enable)
        cfg |= CGX_CMR_RX_OVR_BP_EN(lmac_id);
        cfg &= ~CGX_CMR_RX_OVR_BP_BP(lmac_id);
        cgx_write(cgx, 0, CGXX_CMR_RX_OVR_BP, cfg);
+
+       /* Disable all PFC classes by default */
+       cfg = cgx_read(cgx, lmac_id, CGXX_SMUX_CBFC_CTL);
+       cfg = FIELD_SET(CGX_PFC_CLASS_MASK, 0, cfg);
+       cgx_write(cgx, lmac_id, CGXX_SMUX_CBFC_CTL, cfg);
 }
 
 int verify_lmac_fc_cfg(void *cgxd, int lmac_id, u8 tx_pause, u8 rx_pause,
@@ -899,6 +904,7 @@ int cgx_lmac_pfc_config(void *cgxd, int lmac_id, u8 tx_pause,
                return 0;
 
        cfg = cgx_read(cgx, lmac_id, CGXX_SMUX_CBFC_CTL);
+       pfc_en |= FIELD_GET(CGX_PFC_CLASS_MASK, cfg);
 
        if (rx_pause) {
                cfg |= (CGXX_SMUX_CBFC_CTL_RX_EN |
@@ -910,12 +916,13 @@ int cgx_lmac_pfc_config(void *cgxd, int lmac_id, u8 tx_pause,
                        CGXX_SMUX_CBFC_CTL_DRP_EN);
        }
 
-       if (tx_pause)
+       if (tx_pause) {
                cfg |= CGXX_SMUX_CBFC_CTL_TX_EN;
-       else
+               cfg = FIELD_SET(CGX_PFC_CLASS_MASK, pfc_en, cfg);
+       } else {
                cfg &= ~CGXX_SMUX_CBFC_CTL_TX_EN;
-
-       cfg = FIELD_SET(CGX_PFC_CLASS_MASK, pfc_en, cfg);
+               cfg = FIELD_SET(CGX_PFC_CLASS_MASK, 0, cfg);
+       }
 
        cgx_write(cgx, lmac_id, CGXX_SMUX_CBFC_CTL, cfg);
 

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rpm.c b/drivers/net/ethernet/marvell/octeontx2/af/rpm.c
index 47e83d7a580412320b0a2ed4141bf0a607e51314..05666922a45b5d14ab4256d6e669da26a57f3e8d 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rpm.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rpm.c
@@ -276,6 +276,11 @@ void rpm_lmac_pause_frm_config(void *rpmd, int lmac_id, bool enable)
        cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);
        cfg |= RPMX_MTI_MAC100X_COMMAND_CONFIG_TX_P_DISABLE;
        rpm_write(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG, cfg);
+
+       /* Disable all PFC classes */
+       cfg = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+       cfg = FIELD_SET(RPM_PFC_CLASS_MASK, 0, cfg);
+       rpm_write(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL, cfg);
 }
 
 int rpm_get_rx_stats(void *rpmd, int lmac_id, int idx, u64 *rx_stat)
@@ -387,15 +392,14 @@ void rpm_lmac_ptp_config(void *rpmd, int lmac_id, bool enable)
 int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 pfc_en)
 {
        rpm_t *rpm = rpmd;
-       u64 cfg;
+       u64 cfg, class_en;
 
        if (!is_lmac_valid(rpm, lmac_id))
                return -ENODEV;
 
-       /* reset PFC class quanta and threshold */
-       rpm_cfg_pfc_quanta_thresh(rpm, lmac_id, 0xffff, false);
-
        cfg = rpm_read(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG);
+       class_en = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
+       pfc_en |= FIELD_GET(RPM_PFC_CLASS_MASK, class_en);
 
        if (rx_pause) {
                cfg &= ~(RPMX_MTI_MAC100X_COMMAND_CONFIG_RX_P_DISABLE |
@@ -410,9 +414,11 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p
        if (tx_pause) {
                rpm_cfg_pfc_quanta_thresh(rpm, lmac_id, pfc_en, true);
                cfg &= ~RPMX_MTI_MAC100X_COMMAND_CONFIG_TX_P_DISABLE;
+               class_en = FIELD_SET(RPM_PFC_CLASS_MASK, pfc_en, class_en);
        } else {
                rpm_cfg_pfc_quanta_thresh(rpm, lmac_id, 0xfff, false);
                cfg |= RPMX_MTI_MAC100X_COMMAND_CONFIG_TX_P_DISABLE;
+               class_en = FIELD_SET(RPM_PFC_CLASS_MASK, 0, class_en);
        }
 
        if (!rx_pause && !tx_pause)
@@ -422,9 +428,7 @@ int rpm_lmac_pfc_config(void *rpmd, int lmac_id, u8 tx_pause, u8 rx_pause, u16 p
 
        rpm_write(rpm, lmac_id, RPMX_MTI_MAC100X_COMMAND_CONFIG, cfg);
 
-       cfg = rpm_read(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL);
-       cfg = FIELD_SET(RPM_PFC_CLASS_MASK, pfc_en, cfg);
-       rpm_write(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL, cfg);
+       rpm_write(rpm, lmac_id, RPMX_CMRX_PRT_CBFC_CTL, class_en);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rpm.h b/drivers/net/ethernet/marvell/octeontx2/af/rpm.h
index 9ab8d49dd1800c273270da1edeff72274d35d507..8205f2626f6191256eeb6cf402ebbbb11eceb50a 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rpm.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rpm.h
@@ -48,7 +48,6 @@
 #define RPMX_MTI_MAC100X_CL1011_QUANTA_THRESH          0x8130
 #define RPMX_MTI_MAC100X_CL1213_QUANTA_THRESH          0x8138
 #define RPMX_MTI_MAC100X_CL1415_QUANTA_THRESH          0x8140
-#define RPM_DEFAULT_PAUSE_TIME                 0xFFFF
 #define RPMX_CMR_RX_OVR_BP             0x4120
 #define RPMX_CMR_RX_OVR_BP_EN(x)       BIT_ULL((x) + 8)
 #define RPMX_CMR_RX_OVR_BP_BP(x)       BIT_ULL((x) + 4)
@@ -70,7 +69,7 @@
 #define RPMX_MTI_MAC100X_COMMAND_CONFIG_PAUSE_FWD              BIT_ULL(7)
 #define RPMX_MTI_MAC100X_CL01_PAUSE_QUANTA              0x80A8
 #define RPMX_MTI_MAC100X_CL89_PAUSE_QUANTA             0x8108
-#define RPM_DEFAULT_PAUSE_TIME                          0xFFFF
+#define RPM_DEFAULT_PAUSE_TIME                          0x7FF
 
 /* Function Declarations */
 int rpm_get_nr_lmacs(void *rpmd);