2016-04-13 12:04:24

by Wang Weidong

Subject: [RESEND PATCH net-next] phy: keep the BCMR_LOOPBACK bit while setup forced mode

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 <[email protected]>
---
drivers/net/phy/phy_device.c | 2 ++
1 file changed, 2 insertions(+)

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;

-- 2.7.0

2016-04-13 14:20:01

by Sergei Shtylyov

Subject: Re: [RESEND PATCH net-next] phy: keep the BCMR_LOOPBACK bit while setup forced mode

Hello.

On 4/13/2016 2:59 PM, Weidong Wang wrote:

> 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 <[email protected]>
> ---
> drivers/net/phy/phy_device.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> 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);

Please place this declaration first, DaveM prefers declarations to be
sorted from longest to shortest.

>
> + ctl |= val & BMCR_LOOPBACK;

Just =, removing the 'ctl' initializer, please.

[...]

MBR, Sergei

2016-04-13 18:44:00

by Florian Fainelli

Subject: Re: [RESEND PATCH net-next] phy: keep the BCMR_LOOPBACK bit while setup forced mode

On 13/04/16 04:59, Weidong Wang wrote:
> 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.

Humm, it makes sense why we want this one, but maybe we want other bits
to be preserved too, like MII_ISOLATE for instance?

Or maybe we should have a separate way to put the PHY into loopback mode
which is deterministic and takes care of forcing the link at the same time?

>
> Signed-off-by: Weidong Wang <[email protected]>
> ---
> drivers/net/phy/phy_device.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> 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;
>
> -- 2.7.0
>


--
Florian

2016-04-14 02:18:43

by Wang Weidong

Subject: Re: [RESEND PATCH net-next] phy: keep the BCMR_LOOPBACK bit while setup forced mode

On 2016/4/13 22:19, Sergei Shtylyov wrote:
> Hello.
>
> On 4/13/2016 2:59 PM, Weidong Wang wrote:
>
>> 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 <[email protected]>
>> ---
>> drivers/net/phy/phy_device.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> 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);
>
> Please place this declaration first, DaveM prefers declarations to be sorted from longest to shortest.
>
>>
>> + ctl |= val & BMCR_LOOPBACK;
>
> Just =, removing the 'ctl' initializer, please.
>
> [...]
>
> MBR, Sergei
>
Got it.

Regards,
Weidong
>
>

2016-04-14 03:45:52

by Wang Weidong

Subject: Re: [RESEND PATCH net-next] phy: keep the BCMR_LOOPBACK bit while setup forced mode

On 2016/4/14 2:41, Florian Fainelli wrote:
> On 13/04/16 04:59, Weidong Wang wrote:
>> 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.
>
> Humm, it makes sense why we want this one, but maybe we want other bits
> to be preserved too, like MII_ISOLATE for instance?
>

I will add the MII_ISOLATE as well.

> Or maybe we should have a separate way to put the PHY into loopback mode
> which is deterministic and takes care of forcing the link at the same time?
>

I test with the loopback mode, and the link status is undeterminable.

>>
>> Signed-off-by: Weidong Wang <[email protected]>
>> ---
>> drivers/net/phy/phy_device.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> 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;
>>
>> -- 2.7.0
>>
>
>

2016-04-14 07:50:11

by Wang Weidong

Subject: [PATCH net-next] phy: make some bits preserved while setup forced mode

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.

The BMCR_LOOPBACK bit should be preserved.

As Florian pointed out that other bits should be preserved too.
So I make the BMCR_ISOLATE and BMCR_PDOWN as well.

Signed-off-by: Weidong Wang <[email protected]>
---
the patch is evoluted from "phy: keep the BCMR_LOOPBACK bit
while setup forced mode".

---
drivers/net/phy/phy_device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index d551df6..9b24d7e 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -818,8 +818,9 @@ static int genphy_config_advert(struct phy_device *phydev)
*/
int genphy_setup_forced(struct phy_device *phydev)
{
- int ctl = 0;
+ int ctl = phy_read(phydev, MII_BMCR);

+ ctl &= BMCR_LOOPBACK | BMCR_ISOLATE | BMCR_PDOWN;
phydev->pause = 0;
phydev->asym_pause = 0;

--
2.7.0

2016-04-16 00:13:50

by David Miller

Subject: Re: [PATCH net-next] phy: make some bits preserved while setup forced mode

From: Weidong Wang <[email protected]>
Date: Thu, 14 Apr 2016 15:43:52 +0800

> 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.
>
> The BMCR_LOOPBACK bit should be preserved.
>
> As Florian pointed out that other bits should be preserved too.
> So I make the BMCR_ISOLATE and BMCR_PDOWN as well.
>
> Signed-off-by: Weidong Wang <[email protected]>

Applied, thank you.