From patchwork Wed Apr 13 11:59:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangweidong X-Patchwork-Id: 609985 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qlMtK17kKz9t0t for ; Wed, 13 Apr 2016 22:04:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031192AbcDMMEY (ORCPT ); Wed, 13 Apr 2016 08:04:24 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:52968 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932870AbcDMMEV (ORCPT ); Wed, 13 Apr 2016 08:04:21 -0400 Received: from 172.24.1.49 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.49]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DIP76612; Wed, 13 Apr 2016 19:59:13 +0800 (CST) Received: from [127.0.0.1] (10.177.21.100) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Wed, 13 Apr 2016 19:59:07 +0800 Message-ID: <570E3488.9060403@huawei.com> Date: Wed, 13 Apr 2016 19:59:04 +0800 From: Weidong Wang User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: David Miller , CC: , Subject: [RESEND PATCH net-next] phy: keep the BCMR_LOOPBACK bit while setup forced mode X-Originating-IP: [10.177.21.100] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown, refid=x_failed, ip=unknown, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32, mode=multiengine Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When tested the PHY SGMII Loopback,: 1.set the LOOPBACK bit, 2.set the autoneg to AUTONEG_DISABLE, it calls the genphy_setup_forced which will clear the bit. So just keep the LOOPBACK bit while setup forced mode. Signed-off-by: Weidong Wang --- drivers/net/phy/phy_device.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.0 diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index e551f3a..8da4b80 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1124,7 +1124,9 @@ static int genphy_config_advert(struct phy_device *phydev) int genphy_setup_forced(struct phy_device *phydev) { int ctl = 0; + int val = phy_read(phydev, MII_BMCR); + ctl |= val & BMCR_LOOPBACK; phydev->pause = 0; phydev->asym_pause = 0;