Thanks Sunil, will fix this in next version Thanks, Satha
From: Goutham, Sunil Sent: Wednesday, December 21, 2016 1:20 AM To: Koteshwar Rao, Satha; linux-ker...@vger.kernel.org Cc: r...@kernel.org; da...@davemloft.net; Daney, David; Vatsavayi, Raghu; Chickles, Derek; Romanov, Philip; netdev@vger.kernel.org; linux-arm-ker...@lists.infradead.org Subject: Re: [RFC PATCH 3/7] Enable pause frame support >>+#define BGX_SMUX_CBFC_CTL 0x20218 These macros are already defined. if you check 'net-next ' branch pause frame support has already been added. You should send patch on top it if you have further changes to the existing. Thanks, Sunil. ________________________________________ From: Koteshwar Rao, Satha Sent: Wednesday, December 21, 2016 2:16 PM To: linux-ker...@vger.kernel.org Cc: Goutham, Sunil; r...@kernel.org; da...@davemloft.net; Daney, David; Vatsavayi, Raghu; Chickles, Derek; Koteshwar Rao, Satha; Romanov, Philip; netdev@vger.kernel.org; linux-arm-ker...@lists.infradead.org Subject: [RFC PATCH 3/7] Enable pause frame support --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 25 +++++++++++++++++++++++ drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 7 +++++++ 2 files changed, 32 insertions(+) diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index 050e21f..92d7e04 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -121,6 +121,31 @@ static int bgx_poll_reg(struct bgx *bgx, u8 lmac, u64 reg, u64 mask, bool zero) return 1; } +void enable_pause_frames(int node, int bgx_idx, int lmac) +{ + u64 reg_value = 0; + struct bgx *bgx = bgx_vnic[(node * MAX_BGX_PER_NODE) + bgx_idx]; + + reg_value = bgx_reg_read(bgx, lmac, BGX_SMUX_TX_CTL); + /* Enable BGX()_SMU()_TX_CTL */ + if (!(reg_value & L2P_BP_CONV)) + bgx_reg_write(bgx, lmac, BGX_SMUX_TX_CTL, + (reg_value | (L2P_BP_CONV))); + + reg_value = bgx_reg_read(bgx, lmac, BGX_SMUX_HG2_CTL); + /* Clear if BGX()_SMU()_HG2_CONTROL[HG2TX_EN] is set */ + if (reg_value & SMUX_HG2_CTL_HG2TX_EN) + bgx_reg_write(bgx, lmac, BGX_SMUX_HG2_CTL, + (reg_value & (~SMUX_HG2_CTL_HG2TX_EN))); + + reg_value = bgx_reg_read(bgx, lmac, BGX_SMUX_CBFC_CTL); + /* Clear if BGX()_SMU()_CBFC_CTL[TX_EN] is set */ + if (reg_value & CBFC_CTL_TX_EN) + bgx_reg_write(bgx, lmac, BGX_SMUX_CBFC_CTL, + (reg_value & (~CBFC_CTL_TX_EN))); +} +EXPORT_SYMBOL(enable_pause_frames); + /* Return number of BGX present in HW */ unsigned bgx_get_map(int node) { diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h index 01cc7c8..5b57bd1 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h @@ -131,6 +131,11 @@ #define BGX_SMUX_TX_CTL 0x20178 #define SMU_TX_CTL_DIC_EN BIT_ULL(0) #define SMU_TX_CTL_UNI_EN BIT_ULL(1) +#define L2P_BP_CONV BIT_ULL(7) +#define BGX_SMUX_CBFC_CTL 0x20218 +#define CBFC_CTL_TX_EN BIT_ULL(1) +#define BGX_SMUX_HG2_CTL 0x20210 +#define SMUX_HG2_CTL_HG2TX_EN BIT_ULL(18) #define SMU_TX_CTL_LNK_STATUS (3ull << 4) #define BGX_SMUX_TX_THRESH 0x20180 #define BGX_SMUX_CTL 0x20200 @@ -212,6 +217,8 @@ void bgx_lmac_internal_loopback(int node, int bgx_idx, u64 bgx_get_rx_stats(int node, int bgx_idx, int lmac, int idx); u64 bgx_get_tx_stats(int node, int bgx_idx, int lmac, int idx); +void enable_pause_frames(int node, int bgx_idx, int lmac); + #define BGX_RX_STATS_COUNT 11 #define BGX_TX_STATS_COUNT 18 -- 1.8.3.1