Skip to content

Commit 5b04080

Browse files
Jijie Shaokuba-moo
authored andcommitted
net: hibmcge: fix incorrect pause frame statistics issue
The driver supports pause frames, but does not pass pause frames based on rx pause enable configuration, resulting in incorrect pause frame statistics. like this: mz eno3 '01 80 c2 00 00 01 00 18 2d 04 00 9c 88 08 00 01 ff ff' \ -p 64 -c 100 ethtool -S enp132s0f2 | grep -v ": 0" NIC statistics: rx_octets_total_filt_cnt: 6800 rx_filt_pkt_cnt: 100 The rx pause frames are filtered by the MAC hardware. This patch configures pass pause frames based on the rx puase enable status to ensure that rx pause frames are not filtered. mz eno3 '01 80 c2 00 00 01 00 18 2d 04 00 9c 88 08 00 01 ff ff' \ -p 64 -c 100 ethtool --include-statistics -a enp132s0f2 Pause parameters for enp132s0f2: Autonegotiate: on RX: on TX: on RX negotiated: on TX negotiated: on Statistics: tx_pause_frames: 0 rx_pause_frames: 100 Fixes: 3a03763 ("net: hibmcge: Add pauseparam supported in this module") Signed-off-by: Jijie Shao <[email protected]> Reviewed-by: Michal Swiatkowski <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent f7a11cb commit 5b04080

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@ void hbg_hw_set_pause_enable(struct hbg_priv *priv, u32 tx_en, u32 rx_en)
242242
HBG_REG_PAUSE_ENABLE_TX_B, tx_en);
243243
hbg_reg_write_field(priv, HBG_REG_PAUSE_ENABLE_ADDR,
244244
HBG_REG_PAUSE_ENABLE_RX_B, rx_en);
245+
246+
hbg_reg_write_field(priv, HBG_REG_REC_FILT_CTRL_ADDR,
247+
HBG_REG_REC_FILT_CTRL_PAUSE_FRM_PASS_B, rx_en);
245248
}
246249

247250
void hbg_hw_get_pause_enable(struct hbg_priv *priv, u32 *tx_en, u32 *rx_en)

drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
#define HBG_REG_TRANSMIT_CTRL_AN_EN_B BIT(5)
6969
#define HBG_REG_REC_FILT_CTRL_ADDR (HBG_REG_SGMII_BASE + 0x0064)
7070
#define HBG_REG_REC_FILT_CTRL_UC_MATCH_EN_B BIT(0)
71+
#define HBG_REG_REC_FILT_CTRL_PAUSE_FRM_PASS_B BIT(4)
7172
#define HBG_REG_RX_OCTETS_TOTAL_OK_ADDR (HBG_REG_SGMII_BASE + 0x0080)
7273
#define HBG_REG_RX_OCTETS_BAD_ADDR (HBG_REG_SGMII_BASE + 0x0084)
7374
#define HBG_REG_RX_UC_PKTS_ADDR (HBG_REG_SGMII_BASE + 0x0088)

0 commit comments

Comments
 (0)