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

Commit 1770a7a3 authored by Peng Li's avatar Peng Li Committed by David S. Miller
Browse files

net: hns3: add support to update flow control settings after autoneg 



When auto-negotiation is enabled, the MAC flow control settings is
based on the flow control negotiation result. And it should be configured
after a valid link has been established. This patch adds support to update
flow control settings after auto-negotiation has completed.

Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarFuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61387774

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+36 −0
Original line number Diff line number Diff line
@@ -4707,6 +4707,42 @@ static int hclge_cfg_pauseparam(struct hclge_dev *hdev, u32 rx_en, u32 tx_en) 
	return 0;

}



int hclge_cfg_flowctrl(struct hclge_dev *hdev)

{

	struct phy_device *phydev = hdev->hw.mac.phydev;

	u16 remote_advertising = 0;

	u16 local_advertising = 0;

	u32 rx_pause, tx_pause;

	u8 flowctl;



	if (!phydev->link || !phydev->autoneg)

		return 0;



	if (phydev->advertising & ADVERTISED_Pause)

		local_advertising = ADVERTISE_PAUSE_CAP;



	if (phydev->advertising & ADVERTISED_Asym_Pause)

		local_advertising |= ADVERTISE_PAUSE_ASYM;



	if (phydev->pause)

		remote_advertising = LPA_PAUSE_CAP;



	if (phydev->asym_pause)

		remote_advertising |= LPA_PAUSE_ASYM;



	flowctl = mii_resolve_flowctrl_fdx(local_advertising,

					   remote_advertising);

	tx_pause = flowctl & FLOW_CTRL_TX;

	rx_pause = flowctl & FLOW_CTRL_RX;



	if (phydev->duplex == HCLGE_MAC_HALF) {

		tx_pause = 0;

		rx_pause = 0;

	}



	return hclge_cfg_pauseparam(hdev, rx_pause, tx_pause);

}



static void hclge_get_pauseparam(struct hnae3_handle *handle, u32 *auto_neg,

				 u32 *rx_en, u32 *tx_en)

{

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h

+1 −0
Original line number Diff line number Diff line
@@ -602,4 +602,5 @@ int hclge_rss_init_hw(struct hclge_dev *hdev); 


void hclge_mbx_handler(struct hclge_dev *hdev);

void hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id);

int hclge_cfg_flowctrl(struct hclge_dev *hdev);

#endif

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c

+4 −0
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ static void hclge_mac_adjust_link(struct net_device *netdev) 
	ret = hclge_cfg_mac_speed_dup(hdev, speed, duplex);

	if (ret)

		netdev_err(netdev, "failed to adjust link.\n");



	ret = hclge_cfg_flowctrl(hdev);

	if (ret)

		netdev_err(netdev, "failed to configure flow control.\n");

}



int hclge_mac_start_phy(struct hclge_dev *hdev)