| From foo@baz Sat Nov 10 10:48:43 PST 2018 |
| From: Peng Li <lipeng321@huawei.com> |
| Date: Wed, 19 Sep 2018 18:29:53 +0100 |
| Subject: net: hns3: Check hdev state when getting link status |
| |
| From: Peng Li <lipeng321@huawei.com> |
| |
| [ Upstream commit 582d37bbb613b8ad86bf82845d3a74a02a5a0fa1 ] |
| |
| By default, HW link status is up. If hclge_update_link_status is called |
| before net up, driver will print "link up". It is not suitable. hdev |
| state check is needed when getting link status. |
| |
| Fixes: 46a3df9f9718 ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support") |
| Fixes: e2cb1dec9779 ("net: hns3: Add HNS3 VF HCL(Hardware Compatibility Layer) Support") |
| Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com> |
| Signed-off-by: Peng Li <lipeng321@huawei.com> |
| Signed-off-by: Salil Mehta <salil.mehta@huawei.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +++ |
| drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 +++ |
| 2 files changed, 6 insertions(+) |
| |
| --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c |
| +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c |
| @@ -2398,6 +2398,9 @@ static int hclge_get_mac_phy_link(struct |
| int mac_state; |
| int link_stat; |
| |
| + if (test_bit(HCLGE_STATE_DOWN, &hdev->state)) |
| + return 0; |
| + |
| mac_state = hclge_get_mac_link_status(hdev); |
| |
| if (hdev->hw.mac.phydev) { |
| --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c |
| +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c |
| @@ -299,6 +299,9 @@ void hclgevf_update_link_status(struct h |
| |
| client = handle->client; |
| |
| + link_state = |
| + test_bit(HCLGEVF_STATE_DOWN, &hdev->state) ? 0 : link_state; |
| + |
| if (link_state != hdev->hw.mac.link) { |
| client->ops->link_status_change(handle, !!link_state); |
| hdev->hw.mac.link = link_state; |
