Commit 71eb8d1e authored by Jijie Shao's avatar Jijie Shao Committed by Jakub Kicinski
Browse files

net: hibmcge: remove unnecessary check for np_link_fail in scenarios without phy. 



hibmcge driver uses fixed_phy to configure scenarios without PHY,
where the driver is always in a linked state. However,
there might be no link in hardware, so the np_link error
is detected in hbg_hw_adjust_link(), which can cause abnormal logs.

Therefore, in scenarios without a PHY, the driver no longer
checks the np_link status.

Fixes: 1d7cd7a9 ("net: hibmcge: support scenario without PHY")
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Link: https://patch.msgid.link/20251025014642.265259-3-shaojijie@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 12d2303d

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

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define HBG_PCU_CACHE_LINE_SIZE		32

#define HBG_TX_TIMEOUT_BUF_LEN		1024

#define HBG_RX_DESCR			0x01

#define HBG_NO_PHY			0xFF



#define HBG_PACKET_HEAD_SIZE	((HBG_RX_SKIP1 + HBG_RX_SKIP2 + \

				  HBG_RX_DESCR) * HBG_PCU_CACHE_LINE_SIZE)

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

+3 −0
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ void hbg_hw_adjust_link(struct hbg_priv *priv, u32 speed, u32 duplex) 


	hbg_hw_mac_enable(priv, HBG_STATUS_ENABLE);



	if (priv->mac.phy_addr == HBG_NO_PHY)

		return;



	/* wait MAC link up */

	ret = readl_poll_timeout(priv->io_base + HBG_REG_AN_NEG_STATE_ADDR,

				 link_status,

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

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#define HBG_MDIO_OP_INTERVAL_US		(5 * 1000)



#define HBG_NP_LINK_FAIL_RETRY_TIMES	5

#define HBG_NO_PHY			0xFF



static void hbg_mdio_set_command(struct hbg_mac *mac, u32 cmd)

{