Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f89e4e8 authored by Yonglong Liu's avatar Yonglong Liu Committed by Greg Kroah-Hartman
Browse files

net: hns: Add mac pcs config when enable|disable mac 



[ Upstream commit 726ae5c9e5f0c18eca8ea5296b526242c3e89822 ]

In some case, when mac enable|disable and adjust link, may cause hard to
link(or abnormal) between mac and phy. This patch adds the code for rx PCS
to avoid this bug.

Disable the rx PCS when driver disable the gmac, and enable the rx PCS
when driver enable the mac.

Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b686b8c0

drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c

+10 −4
Original line number Diff line number Diff line
@@ -67,24 +67,30 @@ static void hns_gmac_enable(void *mac_drv, enum mac_commom_mode mode) 
	struct mac_driver *drv = (struct mac_driver *)mac_drv;



	/*enable GE rX/tX */

	if ((mode == MAC_COMM_MODE_TX) || (mode == MAC_COMM_MODE_RX_AND_TX))

	if (mode == MAC_COMM_MODE_TX || mode == MAC_COMM_MODE_RX_AND_TX)

		dsaf_set_dev_bit(drv, GMAC_PORT_EN_REG, GMAC_PORT_TX_EN_B, 1);



	if ((mode == MAC_COMM_MODE_RX) || (mode == MAC_COMM_MODE_RX_AND_TX))

	if (mode == MAC_COMM_MODE_RX || mode == MAC_COMM_MODE_RX_AND_TX) {

		/* enable rx pcs */

		dsaf_set_dev_bit(drv, GMAC_PCS_RX_EN_REG, 0, 0);

		dsaf_set_dev_bit(drv, GMAC_PORT_EN_REG, GMAC_PORT_RX_EN_B, 1);

	}

}



static void hns_gmac_disable(void *mac_drv, enum mac_commom_mode mode)

{

	struct mac_driver *drv = (struct mac_driver *)mac_drv;



	/*disable GE rX/tX */

	if ((mode == MAC_COMM_MODE_TX) || (mode == MAC_COMM_MODE_RX_AND_TX))

	if (mode == MAC_COMM_MODE_TX || mode == MAC_COMM_MODE_RX_AND_TX)

		dsaf_set_dev_bit(drv, GMAC_PORT_EN_REG, GMAC_PORT_TX_EN_B, 0);



	if ((mode == MAC_COMM_MODE_RX) || (mode == MAC_COMM_MODE_RX_AND_TX))

	if (mode == MAC_COMM_MODE_RX || mode == MAC_COMM_MODE_RX_AND_TX) {

		/* disable rx pcs */

		dsaf_set_dev_bit(drv, GMAC_PCS_RX_EN_REG, 0, 1);

		dsaf_set_dev_bit(drv, GMAC_PORT_EN_REG, GMAC_PORT_RX_EN_B, 0);

	}

}



/* hns_gmac_get_en - get port enable

 * @mac_drv:mac device

drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ 
#define GMAC_LD_LINK_COUNTER_REG		0x01D0UL

#define GMAC_LOOP_REG				0x01DCUL

#define GMAC_RECV_CONTROL_REG			0x01E0UL

#define GMAC_PCS_RX_EN_REG			0x01E4UL

#define GMAC_VLAN_CODE_REG			0x01E8UL

#define GMAC_RX_OVERRUN_CNT_REG			0x01ECUL

#define GMAC_RX_LENGTHFIELD_ERR_CNT_REG		0x01F4UL