From: Andrew Lunn <andrew@lunn.ch>
To: Lin Yun Sheng <linyunsheng@huawei.com>
Cc: davem@davemloft.net, f.fainelli@gmail.com,
huangdaode@hisilicon.com, xuwei5@hisilicon.com,
liguozhu@hisilicon.com, Yisen.Zhuang@huawei.com,
gabriele.paoloni@huawei.com, john.garry@huawei.com,
linuxarm@huawei.com, salil.mehta@huawei.com,
lipeng321@huawei.com, tremyfr@gmail.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH NET V5 2/2] net: hns: Use phy_driver to setup Phy loopback
Date: Mon, 26 Jun 2017 15:42:35 +0200 [thread overview]
Message-ID: <20170626134235.GC2623@lunn.ch> (raw)
In-Reply-To: <1498443039-134503-3-git-send-email-linyunsheng@huawei.com>
On Mon, Jun 26, 2017 at 10:10:39AM +0800, Lin Yun Sheng wrote:
> Use function set_loopback in phy_driver to setup phy loopback
> when doing ethtool self test.
>
> Signed-off-by: Lin Yun Sheng <linyunsheng@huawei.com>
> ---
> drivers/net/ethernet/hisilicon/hns/hnae.h | 1 +
> drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 92 +++++++-----------------
> 2 files changed, 26 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.h b/drivers/net/ethernet/hisilicon/hns/hnae.h
> index 04211ac..7ba653a 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hnae.h
> +++ b/drivers/net/ethernet/hisilicon/hns/hnae.h
> @@ -360,6 +360,7 @@ enum hnae_loop {
> MAC_INTERNALLOOP_MAC = 0,
> MAC_INTERNALLOOP_SERDES,
> MAC_INTERNALLOOP_PHY,
> + MAC_LOOP_PHY_NONE,
> MAC_LOOP_NONE,
> };
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> index e95795b..10d82df 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> @@ -259,67 +259,24 @@ static int hns_nic_set_link_ksettings(struct net_device *net_dev,
>
> static int hns_nic_config_phy_loopback(struct phy_device *phy_dev, u8 en)
> {
> -#define COPPER_CONTROL_REG 0
> -#define PHY_POWER_DOWN BIT(11)
> -#define PHY_LOOP_BACK BIT(14)
> - u16 val = 0;
> -
> - if (phy_dev->is_c45) /* c45 branch adding for XGE PHY */
> - return -ENOTSUPP;
> + int err;
>
> if (en) {
> - /* speed : 1000M */
> - phy_write(phy_dev, HNS_PHY_PAGE_REG, 2);
> - phy_write(phy_dev, 21, 0x1046);
> -
> - phy_write(phy_dev, HNS_PHY_PAGE_REG, 0);
> - /* Force Master */
> - phy_write(phy_dev, 9, 0x1F00);
> -
> - /* Soft-reset */
> - phy_write(phy_dev, 0, 0x9140);
> - /* If autoneg disabled,two soft-reset operations */
> - phy_write(phy_dev, 0, 0x9140);
> -
> - phy_write(phy_dev, HNS_PHY_PAGE_REG, 0xFA);
> -
> - /* Default is 0x0400 */
> - phy_write(phy_dev, 1, 0x418);
> -
> - /* Force 1000M Link, Default is 0x0200 */
> - phy_write(phy_dev, 7, 0x20C);
> -
> - /* Powerup Fiber */
> - phy_write(phy_dev, HNS_PHY_PAGE_REG, 1);
> - val = phy_read(phy_dev, COPPER_CONTROL_REG);
> - val &= ~PHY_POWER_DOWN;
> - phy_write(phy_dev, COPPER_CONTROL_REG, val);
> -
> - /* Enable Phy Loopback */
> - phy_write(phy_dev, HNS_PHY_PAGE_REG, 0);
> - val = phy_read(phy_dev, COPPER_CONTROL_REG);
> - val |= PHY_LOOP_BACK;
> - val &= ~PHY_POWER_DOWN;
> - phy_write(phy_dev, COPPER_CONTROL_REG, val);
> + err = phy_resume(phy_dev);
Maybe this was discussed with an earlier version of these patches. Why
are using phy_resume() and phy_suspend()?
> static int __lb_setup(struct net_device *ndev,
> @@ -332,10 +289,8 @@ static int __lb_setup(struct net_device *ndev,
>
> switch (loop) {
> case MAC_INTERNALLOOP_PHY:
> - if ((phy_dev) && (!phy_dev->is_c45)) {
> - ret = hns_nic_config_phy_loopback(phy_dev, 0x1);
> - ret |= h->dev->ops->set_loopback(h, loop, 0x1);
> - }
> + ret = hns_nic_config_phy_loopback(phy_dev, 0x1);
> + ret |= h->dev->ops->set_loopback(h, loop, 0x1);
Or'ing together two errno values does not make much sense:
> + if (loop == MAC_INTERNALLOOP_PHY)
> + ret = __lb_setup(ndev, MAC_LOOP_PHY_NONE);
> + else
> + ret = __lb_setup(ndev, MAC_LOOP_NONE);
> if (ret)
> netdev_err(ndev, "%s: __lb_setup return error(%d)!\n",
> __func__,
And it looks like you even print the OR'ed version here!
Andrew
next prev parent reply other threads:[~2017-06-26 13:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 2:10 [PATCH NET V5 0/2] Add loopback support in phy_driver and hns ethtool fix Lin Yun Sheng
2017-06-26 2:10 ` [PATCH NET V5 1/2] net: phy: Add phy loopback support in net phy framework Lin Yun Sheng
2017-06-26 13:43 ` Andrew Lunn
2017-06-26 16:45 ` Florian Fainelli
2017-06-26 2:10 ` [PATCH NET V5 2/2] net: hns: Use phy_driver to setup Phy loopback Lin Yun Sheng
2017-06-26 13:42 ` Andrew Lunn [this message]
2017-06-27 3:25 ` Yunsheng Lin
2017-06-27 13:29 ` Andrew Lunn
2017-06-28 0:59 ` Yunsheng Lin
2017-06-28 20:28 ` Andrew Lunn
2017-06-29 2:35 ` Yunsheng Lin
2017-06-29 13:56 ` Andrew Lunn
2017-06-30 9:14 ` Yunsheng Lin
2017-06-30 13:39 ` Andrew Lunn
2017-07-01 15:17 ` Andrew Lunn
2017-07-03 9:57 ` Yunsheng Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170626134235.GC2623@lunn.ch \
--to=andrew@lunn.ch \
--cc=Yisen.Zhuang@huawei.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=gabriele.paoloni@huawei.com \
--cc=huangdaode@hisilicon.com \
--cc=john.garry@huawei.com \
--cc=liguozhu@hisilicon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=linyunsheng@huawei.com \
--cc=lipeng321@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
--cc=tremyfr@gmail.com \
--cc=xuwei5@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).