From patchwork Fri Apr 26 00:49:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Jun X-Patchwork-Id: 162908 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp486526jan; Fri, 26 Apr 2019 01:49:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqy9b/epmIIz4IduLmI5iHgDYgFqpzlKPpGcsIt8R91iLPp88xqCwISgArd+O9peM0kBBuAB X-Received: by 2002:a17:902:e091:: with SMTP id cb17mr43938459plb.222.1556268596838; Fri, 26 Apr 2019 01:49:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556268596; cv=none; d=google.com; s=arc-20160816; b=EWay0o/ZlnDnsn09nP+82QBESlTajjHDVPUXKfMlQpjA3I+P9Trc03OUgfZD0ENz/9 p+BuiXsRs4sSoOK8Xdn/h4dAYCQPPw/SGLgW2pAsu7AR27/yXqlQbfmzUr90lo+hAXgk SaZpij0WFJB+Z65PtTtcf5terHzeGJmSp6An0Ua3Ee0CULr1jw6a/uPdd+7FRpWWiWWX Pj7pBWx95eZjZXMPGhF3vjeHwommtCuozDEw3D2LaG0DgCJTFPZNlM3eHXqjYVBM/b9S DLl0hi+SquqBBDYDXLNKvBkMmQVwjdIqOYOeXbloSf1V5wIUacXfyv2/6xsPewfakqnV hcMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=bjX01T+niKDn4WZe4RZ8cYpL1260P/qVmCxI46c4TAY=; b=S/d5JjaHOZURWGAdp7RBolIxfZXVTns8BuRXzEStrke+o7pLTowjFkQmbKvFpkcaQv 3FxhcNuy+Utw/UBnYIiPTbsegHGGCeCWtBNX1LOzres0AjmLkxZ0U1GLfBmc0fR7vZtE LhFKGCnWaQBe2wF3/e+bVcF9o7IBmKw+wj/sTjA0O0GtMT8NDtSQJIOJESfMjxcEwL4x PQH8CRVyOW+zUQfK9o5XSRAsco8wpCz8ExoI1GXMqJcfSXaom4WeYqqAoIlRM1Hz9kHH dLsY0RGp3z3wxusespOMwiA2FHojh/fqSgiF7+qYEgmpnymxeGwROFuRmZHD1j3eqU0g oP/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s79si25497678pfa.69.2019.04.26.01.49.56; Fri, 26 Apr 2019 01:49:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726006AbfDZItz (ORCPT + 9 others); Fri, 26 Apr 2019 04:49:55 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:7692 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725901AbfDZItz (ORCPT ); Fri, 26 Apr 2019 04:49:55 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 0236C7D3CBE19AD85C54; Fri, 26 Apr 2019 16:49:53 +0800 (CST) Received: from localhost.localdomain.localdomain (10.90.31.46) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.439.0; Fri, 26 Apr 2019 16:49:46 +0800 From: To: CC: , , , , , Subject: [PATCH] [stable 4.19.y] net: hns: Fix WARNING when hns modules installed Date: Fri, 26 Apr 2019 08:49:34 +0800 Message-ID: <1556239774-2127-1-git-send-email-xiaojun2@hisilicon.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.90.31.46] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jun Xiao Commit dfdf26babc98 upstream this patch need merge to 4.19.y stable kernel,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. the code conflict already fixed in this patch. we have already verified this patch on kunpeng916 platform, and it works well. Signed-off-by: Yonglong Liu Signed-off-by: Jun Xiao --- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) -- 1.8.3.1 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; }