2019-01-25 12:37:24

by Carlo Caione

Subject: [PATCH] net: phy: at803x: Use helpers to access MMD PHY registers

Libphy provides a standard set of helpers to access the MMD PHY
registers. Use those instead of relying on custom driver-specific
functions.

Signed-off-by: Carlo Caione <[email protected]>
---
drivers/net/phy/at803x.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index f9432d053a22..23ba76f8d950 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -39,9 +39,6 @@
#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
#define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
#define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
-#define AT803X_MMD_ACCESS_CONTROL 0x0D
-#define AT803X_MMD_ACCESS_CONTROL_DATA 0x0E
-#define AT803X_FUNC_DATA 0x4003
#define AT803X_REG_CHIP_CONFIG 0x1f
#define AT803X_BT_BX_REG_SEL 0x8000

@@ -168,16 +165,9 @@ static int at803x_set_wol(struct phy_device *phydev,
if (!is_valid_ether_addr(mac))
return -EINVAL;

- for (i = 0; i < 3; i++) {
- phy_write(phydev, AT803X_MMD_ACCESS_CONTROL,
- AT803X_DEVICE_ADDR);
- phy_write(phydev, AT803X_MMD_ACCESS_CONTROL_DATA,
- offsets[i]);
- phy_write(phydev, AT803X_MMD_ACCESS_CONTROL,
- AT803X_FUNC_DATA);
- phy_write(phydev, AT803X_MMD_ACCESS_CONTROL_DATA,
- mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
- }
+ for (i = 0; i < 3; i++)
+ phy_write_mmd(phydev, AT803X_DEVICE_ADDR, offsets[i],
+ mac[(i * 2) + 1] | (mac[(i * 2)] << 8));

value = phy_read(phydev, AT803X_INTR_ENABLE);
value |= AT803X_INTR_ENABLE_WOL;
--
2.19.1

2019-01-25 15:00:44

by Andrew Lunn

Subject: Re: [PATCH] net: phy: at803x: Use helpers to access MMD PHY registers

On Fri, Jan 25, 2019 at 12:35:10PM +0000, Carlo Caione wrote:
> Libphy provides a standard set of helpers to access the MMD PHY
> registers. Use those instead of relying on custom driver-specific
> functions.

Hi Carlo

Maybe deja vu, but i thought a similar patch went by recently?

Anyway,

Reviewed-by: Andrew Lunn <[email protected]>

Andrew

>
> Signed-off-by: Carlo Caione <[email protected]>
> ---
> drivers/net/phy/at803x.c | 16 +++-------------
> 1 file changed, 3 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
> index f9432d053a22..23ba76f8d950 100644
> --- a/drivers/net/phy/at803x.c
> +++ b/drivers/net/phy/at803x.c
> @@ -39,9 +39,6 @@
> #define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
> #define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
> #define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
> -#define AT803X_MMD_ACCESS_CONTROL 0x0D
> -#define AT803X_MMD_ACCESS_CONTROL_DATA 0x0E
> -#define AT803X_FUNC_DATA 0x4003
> #define AT803X_REG_CHIP_CONFIG 0x1f
> #define AT803X_BT_BX_REG_SEL 0x8000
>
> @@ -168,16 +165,9 @@ static int at803x_set_wol(struct phy_device *phydev,
> if (!is_valid_ether_addr(mac))
> return -EINVAL;
>
> - for (i = 0; i < 3; i++) {
> - phy_write(phydev, AT803X_MMD_ACCESS_CONTROL,
> - AT803X_DEVICE_ADDR);
> - phy_write(phydev, AT803X_MMD_ACCESS_CONTROL_DATA,
> - offsets[i]);
> - phy_write(phydev, AT803X_MMD_ACCESS_CONTROL,
> - AT803X_FUNC_DATA);
> - phy_write(phydev, AT803X_MMD_ACCESS_CONTROL_DATA,
> - mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
> - }
> + for (i = 0; i < 3; i++)
> + phy_write_mmd(phydev, AT803X_DEVICE_ADDR, offsets[i],
> + mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
>
> value = phy_read(phydev, AT803X_INTR_ENABLE);
> value |= AT803X_INTR_ENABLE_WOL;
> --
> 2.19.1
>

2019-01-25 15:05:21

by Carlo Caione

Subject: Re: [PATCH] net: phy: at803x: Use helpers to access MMD PHY registers

On 25/01/2019 15:00, Andrew Lunn wrote:
> On Fri, Jan 25, 2019 at 12:35:10PM +0000, Carlo Caione wrote:
>> Libphy provides a standard set of helpers to access the MMD PHY
>> registers. Use those instead of relying on custom driver-specific
>> functions.
>
> Hi Carlo

Hey Andrew,

> Maybe deja vu, but i thought a similar patch went by recently?

uhm, not from me for sure. There is a discussion going on about similar
stuff on the U-Boot ml, maybe you saw that?

Anyway, feel free to drop this if someone already fixed this.

Thanks,

--
Carlo Caione

2019-01-25 18:13:11

by Heiner Kallweit

Subject: Re: [PATCH] net: phy: at803x: Use helpers to access MMD PHY registers

On 25.01.2019 16:00, Andrew Lunn wrote:
> On Fri, Jan 25, 2019 at 12:35:10PM +0000, Carlo Caione wrote:
>> Libphy provides a standard set of helpers to access the MMD PHY
>> registers. Use those instead of relying on custom driver-specific
>> functions.
>
> Hi Carlo
>
> Maybe deja vu, but i thought a similar patch went by recently?
>
Andrew, maybe you mean this one?

9b420eff9fcf ("net: phy: micrel: use phy_read_mmd and phy_write_mmd")

> Anyway,
>
> Reviewed-by: Andrew Lunn <[email protected]>
>
> Andrew
>
>>
>> Signed-off-by: Carlo Caione <[email protected]>
>> ---
>> drivers/net/phy/at803x.c | 16 +++-------------
>> 1 file changed, 3 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
>> index f9432d053a22..23ba76f8d950 100644
>> --- a/drivers/net/phy/at803x.c
>> +++ b/drivers/net/phy/at803x.c
>> @@ -39,9 +39,6 @@
>> #define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
>> #define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
>> #define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
>> -#define AT803X_MMD_ACCESS_CONTROL 0x0D
>> -#define AT803X_MMD_ACCESS_CONTROL_DATA 0x0E
>> -#define AT803X_FUNC_DATA 0x4003
>> #define AT803X_REG_CHIP_CONFIG 0x1f
>> #define AT803X_BT_BX_REG_SEL 0x8000
>>
>> @@ -168,16 +165,9 @@ static int at803x_set_wol(struct phy_device *phydev,
>> if (!is_valid_ether_addr(mac))
>> return -EINVAL;
>>
>> - for (i = 0; i < 3; i++) {
>> - phy_write(phydev, AT803X_MMD_ACCESS_CONTROL,
>> - AT803X_DEVICE_ADDR);
>> - phy_write(phydev, AT803X_MMD_ACCESS_CONTROL_DATA,
>> - offsets[i]);
>> - phy_write(phydev, AT803X_MMD_ACCESS_CONTROL,
>> - AT803X_FUNC_DATA);
>> - phy_write(phydev, AT803X_MMD_ACCESS_CONTROL_DATA,
>> - mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
>> - }
>> + for (i = 0; i < 3; i++)
>> + phy_write_mmd(phydev, AT803X_DEVICE_ADDR, offsets[i],
>> + mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
>>
>> value = phy_read(phydev, AT803X_INTR_ENABLE);
>> value |= AT803X_INTR_ENABLE_WOL;
>> --
>> 2.19.1
>>
> .
>

2019-01-25 18:40:51

by Florian Fainelli

Subject: Re: [PATCH] net: phy: at803x: Use helpers to access MMD PHY registers

On 1/25/19 4:35 AM, Carlo Caione wrote:
> Libphy provides a standard set of helpers to access the MMD PHY
> registers. Use those instead of relying on custom driver-specific
> functions.
>
> Signed-off-by: Carlo Caione <[email protected]>

Reviewed-by: Florian Fainelli <[email protected]>
--
Florian

2019-01-25 18:53:42

by Andrew Lunn

Subject: Re: [PATCH] net: phy: at803x: Use helpers to access MMD PHY registers

On Fri, Jan 25, 2019 at 07:11:28PM +0100, Heiner Kallweit wrote:
> On 25.01.2019 16:00, Andrew Lunn wrote:
> > On Fri, Jan 25, 2019 at 12:35:10PM +0000, Carlo Caione wrote:
> >> Libphy provides a standard set of helpers to access the MMD PHY
> >> registers. Use those instead of relying on custom driver-specific
> >> functions.
> >
> > Hi Carlo
> >
> > Maybe deja vu, but i thought a similar patch went by recently?
> >
> Andrew, maybe you mean this one?
>
> 9b420eff9fcf ("net: phy: micrel: use phy_read_mmd and phy_write_mmd")

Yes, probably that one.

Might be worth grepping of 0xd, 0xe, 0x0d, 0x0e, 13, 14, and see if
there are any more instances in PHY drivers.

Andrew

2019-01-27 21:35:48

by David Miller

Subject: Re: [PATCH] net: phy: at803x: Use helpers to access MMD PHY registers

From: Carlo Caione <[email protected]>
Date: Fri, 25 Jan 2019 12:35:10 +0000

> Libphy provides a standard set of helpers to access the MMD PHY
> registers. Use those instead of relying on custom driver-specific
> functions.
>
> Signed-off-by: Carlo Caione <[email protected]>

Applied to net-next.