* [PATCH] [PATCH net, stable 4.19.y, 1/1] net: hns: Fix WARNING when hns modules installed
@ 2019-04-22 16:48 xiaojun2
2019-04-25 7:17 ` Graeme Gregory
0 siblings, 1 reply; 2+ messages in thread
From: xiaojun2 @ 2019-04-22 16:48 UTC (permalink / raw)
To: davem
Cc: netdev, marcin.juszkiewicz, graeme.gregory, xiaojun2,
z.liuxinliang, liuyonglong
From: Jun Xiao <xiaojun2@hisilicon.com>
Commit dfdf26babc98 upstream
this patch need merge to 4.19.y stable kernel
Fix Conflict:already fixed the confilct dfdf26babc98 with Yonglong Liu
stable candidate:user cannot connect to the internet via hns dev
by default setting without this patch
we have already verified this patch on kunpeng916 platform,
and it works well.
Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
Signed-off-by: Jun Xiao <xiaojun2@hisilicon.com>
---
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 6242249..283291b 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -1169,6 +1169,12 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h)
if (!h->phy_dev)
return 0;
+ phy_dev->supported &= h->if_support;
+ phy_dev->advertising = phy_dev->supported;
+
+ if (h->phy_if == PHY_INTERFACE_MODE_XGMII)
+ phy_dev->autoneg = false;
+
if (h->phy_if != PHY_INTERFACE_MODE_XGMII) {
phy_dev->dev_flags = 0;
@@ -1180,15 +1186,6 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h)
if (unlikely(ret))
return -ENODEV;
- phy_dev->supported &= h->if_support;
- phy_dev->advertising = phy_dev->supported;
-
- if (h->phy_if == PHY_INTERFACE_MODE_XGMII)
- phy_dev->autoneg = false;
-
- if (h->phy_if == PHY_INTERFACE_MODE_SGMII)
- phy_stop(phy_dev);
-
return 0;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [PATCH net, stable 4.19.y, 1/1] net: hns: Fix WARNING when hns modules installed
2019-04-22 16:48 [PATCH] [PATCH net, stable 4.19.y, 1/1] net: hns: Fix WARNING when hns modules installed xiaojun2
@ 2019-04-25 7:17 ` Graeme Gregory
0 siblings, 0 replies; 2+ messages in thread
From: Graeme Gregory @ 2019-04-25 7:17 UTC (permalink / raw)
To: xiaojun2; +Cc: davem, netdev, marcin.juszkiewicz, z.liuxinliang, liuyonglong
On Tue, Apr 23, 2019 at 12:48:57AM +0800, xiaojun2@hisilicon.com wrote:
> From: Jun Xiao <xiaojun2@hisilicon.com>
>
> Commit dfdf26babc98 upstream
>
> this patch need merge to 4.19.y stable kernel
>
> Fix Conflict:already fixed the confilct dfdf26babc98 with Yonglong Liu
>
> stable candidate:user cannot connect to the internet via hns dev
> by default setting without this patch
>
> we have already verified this patch on kunpeng916 platform,
> and it works well.
>
> Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
> Signed-off-by: Jun Xiao <xiaojun2@hisilicon.com>
You might want to make it clear in the description that without this patch the
D05/Kunpeng916 machine oopses about 50% of the time on boot.
The rest of the time the networking on the machine is totally non functional.
Graeme
> ---
> drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> index 6242249..283291b 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
> @@ -1169,6 +1169,12 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h)
> if (!h->phy_dev)
> return 0;
>
> + phy_dev->supported &= h->if_support;
> + phy_dev->advertising = phy_dev->supported;
> +
> + if (h->phy_if == PHY_INTERFACE_MODE_XGMII)
> + phy_dev->autoneg = false;
> +
> if (h->phy_if != PHY_INTERFACE_MODE_XGMII) {
> phy_dev->dev_flags = 0;
>
> @@ -1180,15 +1186,6 @@ int hns_nic_init_phy(struct net_device *ndev, struct hnae_handle *h)
> if (unlikely(ret))
> return -ENODEV;
>
> - phy_dev->supported &= h->if_support;
> - phy_dev->advertising = phy_dev->supported;
> -
> - if (h->phy_if == PHY_INTERFACE_MODE_XGMII)
> - phy_dev->autoneg = false;
> -
> - if (h->phy_if == PHY_INTERFACE_MODE_SGMII)
> - phy_stop(phy_dev);
> -
> return 0;
> }
>
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-25 7:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-22 16:48 [PATCH] [PATCH net, stable 4.19.y, 1/1] net: hns: Fix WARNING when hns modules installed xiaojun2
2019-04-25 7:17 ` Graeme Gregory
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.