* [PATCH NET 2/2] net: hns: Use phy_driver to setup Phy loopback
@ 2017-06-22 8:53 Lin Yun Sheng
2017-06-23 3:20 ` Andrew Lunn
0 siblings, 1 reply; 4+ messages in thread
From: Lin Yun Sheng @ 2017-06-22 8:53 UTC (permalink / raw)
To: davem, andrew, f.fainelli
Cc: huangdaode, xuwei5, liguozhu, Yisen.Zhuang, gabriele.paoloni,
john.garry, linuxarm, yisen.zhuang, salil.mehta, lipeng321,
tremyfr, netdev, linux-kernel
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/hns_ethtool.c | 64 ++++--------------------
1 file changed, 10 insertions(+), 54 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index e95795b..660b51e 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -259,66 +259,22 @@ 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 */
+ if (phy_dev->is_c45 || !phy_dev->drv)
+ return -ENOTSUPP;
+
+ if (!phy_dev->drv->resume || !phy_dev->drv->suspend ||
+ !phy_dev->drv->set_loopback)
return -ENOTSUPP;
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);
+ phy_dev->drv->resume(phy_dev);
+ phy_dev->drv->set_loopback(phy_dev, 1);
} else {
- phy_write(phy_dev, HNS_PHY_PAGE_REG, 0xFA);
- phy_write(phy_dev, 1, 0x400);
- phy_write(phy_dev, 7, 0x200);
-
- 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);
-
- phy_write(phy_dev, HNS_PHY_PAGE_REG, 0);
- phy_write(phy_dev, 9, 0xF00);
-
- val = phy_read(phy_dev, COPPER_CONTROL_REG);
- val &= ~PHY_LOOP_BACK;
- val |= PHY_POWER_DOWN;
- phy_write(phy_dev, COPPER_CONTROL_REG, val);
+ phy_dev->drv->set_loopback(phy_dev, 0);
+ phy_dev->drv->suspend(phy_dev);
}
+
return 0;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH NET 2/2] net: hns: Use phy_driver to setup Phy loopback
2017-06-22 8:53 [PATCH NET 2/2] net: hns: Use phy_driver to setup Phy loopback Lin Yun Sheng
@ 2017-06-23 3:20 ` Andrew Lunn
2017-06-23 3:48 ` Yunsheng Lin
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Lunn @ 2017-06-23 3:20 UTC (permalink / raw)
To: Lin Yun Sheng
Cc: davem, f.fainelli, huangdaode, xuwei5, liguozhu, Yisen.Zhuang,
gabriele.paoloni, john.garry, linuxarm, salil.mehta, lipeng321,
tremyfr, netdev, linux-kernel
On Thu, Jun 22, 2017 at 04:53:33PM +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/hns_ethtool.c | 64 ++++--------------------
> 1 file changed, 10 insertions(+), 54 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> index e95795b..660b51e 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> @@ -259,66 +259,22 @@ 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 */
> + if (phy_dev->is_c45 || !phy_dev->drv)
> + return -ENOTSUPP;
> +
> + if (!phy_dev->drv->resume || !phy_dev->drv->suspend ||
> + !phy_dev->drv->set_loopback)
> return -ENOTSUPP;
No, i said to have a function is phy.c which does this check. The phy
core needs to keep track of if loopback is already enabled, and return
an error if it is attempted to turn it on twice, or disable it when it
is not enabled.
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH NET 2/2] net: hns: Use phy_driver to setup Phy loopback
2017-06-23 3:20 ` Andrew Lunn
@ 2017-06-23 3:48 ` Yunsheng Lin
2017-06-23 4:05 ` Andrew Lunn
0 siblings, 1 reply; 4+ messages in thread
From: Yunsheng Lin @ 2017-06-23 3:48 UTC (permalink / raw)
To: Andrew Lunn
Cc: davem, f.fainelli, huangdaode, xuwei5, liguozhu, Yisen.Zhuang,
gabriele.paoloni, john.garry, linuxarm, salil.mehta, lipeng321,
tremyfr, netdev, linux-kernel
hi, Andrew
On 2017/6/23 11:20, Andrew Lunn wrote:
> On Thu, Jun 22, 2017 at 04:53:33PM +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/hns_ethtool.c | 64 ++++--------------------
>> 1 file changed, 10 insertions(+), 54 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
>> index e95795b..660b51e 100644
>> --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
>> +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
>> @@ -259,66 +259,22 @@ 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 */
>> + if (phy_dev->is_c45 || !phy_dev->drv)
>> + return -ENOTSUPP;
>> +
>> + if (!phy_dev->drv->resume || !phy_dev->drv->suspend ||
>> + !phy_dev->drv->set_loopback)
>> return -ENOTSUPP;
>
> No, i said to have a function is phy.c which does this check. The phy
> core needs to keep track of if loopback is already enabled, and return
> an error if it is attempted to turn it on twice, or disable it when it
> is not enabled.
what should the Mac driver do when it receive the error? I assume that it
will return it to userspace. because the rtnl_lock ensure only one ethtool
is executing, if the function return error, it means some bug in the mac
driver, am I right?
will add the function in phy.c next version.
Best Regards
Yunsheng Lin
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH NET 2/2] net: hns: Use phy_driver to setup Phy loopback
2017-06-23 3:48 ` Yunsheng Lin
@ 2017-06-23 4:05 ` Andrew Lunn
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2017-06-23 4:05 UTC (permalink / raw)
To: Yunsheng Lin
Cc: davem, f.fainelli, huangdaode, xuwei5, liguozhu, Yisen.Zhuang,
gabriele.paoloni, john.garry, linuxarm, salil.mehta, lipeng321,
tremyfr, netdev, linux-kernel
> what should the Mac driver do when it receive the error? I assume that it
> will return it to userspace. because the rtnl_lock ensure only one ethtool
> is executing, if the function return error, it means some bug in the mac
> driver, am I right?
Yes, return it. It could be there are other use cases of loopback,
which are not protected by the rtnl_lock.
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-23 4:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-22 8:53 [PATCH NET 2/2] net: hns: Use phy_driver to setup Phy loopback Lin Yun Sheng
2017-06-23 3:20 ` Andrew Lunn
2017-06-23 3:48 ` Yunsheng Lin
2017-06-23 4:05 ` Andrew Lunn
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).