Re: [PATCH 1/5] net: phy: marvell: Import and use marvell_phy.h from Linux

2023-04-01 Thread Ramon Fried 
On Sun, Mar 19, 2023 at 7:08 PM Marek Vasut
 wrote:
>
> Import marvell_phy.h from Linux 5.14.y as of commit
> a5de4be06 ("net: phy: marvell10g: fix differentiation of 88X3310 from 
> 88X3340")
> and use it in marvell PHY driver instead of current ad-hoc macros.
> Two of the PHY IDs are unknown to Linux, 88E1149S and 88E1680, for
> those two, only sync the length of the hexadecimal number to 8 digits.
>
> No functional change.
>
> Signed-off-by: Marek Vasut 
> ---
> Cc: "Ariel D'Alessandro" 
> Cc: "Marek Behún" 
> Cc: Joe Hershberger 
> Cc: Marek Vasut 
> Cc: Michael Trimarchi 
> Cc: Nate Drude 
> Cc: Ramon Fried 
> Cc: Simon Glass 
> Cc: Stefan Roese 
> Cc: Tim Harvey 
> Cc: Vladimir Oltean 
> ---
>  drivers/net/phy/marvell.c | 45 +++--
>  include/marvell_phy.h | 47 +++
>  2 files changed, 70 insertions(+), 22 deletions(-)
>  create mode 100644 include/marvell_phy.h
>
> diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
> index 8992be6e89e..0a90f710dfe 100644
> --- a/drivers/net/phy/marvell.c
> +++ b/drivers/net/phy/marvell.c
> @@ -7,6 +7,7 @@
>   */
>  #include 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> @@ -695,8 +696,8 @@ static int m88e1680_config(struct phy_device *phydev)
>
>  U_BOOT_PHY_DRIVER(m88e1011s) = {
> .name = "Marvell 88E1011S",
> -   .uid = 0x1410c60,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E1101,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88e1011s_config,
> .startup = &m88e1011s_startup,
> @@ -705,8 +706,8 @@ U_BOOT_PHY_DRIVER(m88e1011s) = {
>
>  U_BOOT_PHY_DRIVER(m88es) = {
> .name = "Marvell 88ES",
> -   .uid = 0x1410cc0,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88es_config,
> .startup = &m88e1011s_startup,
> @@ -715,8 +716,8 @@ U_BOOT_PHY_DRIVER(m88es) = {
>
>  U_BOOT_PHY_DRIVER(m88e1118) = {
> .name = "Marvell 88E1118",
> -   .uid = 0x1410e10,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E1118,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88e1118_config,
> .startup = &m88e1118_startup,
> @@ -725,8 +726,8 @@ U_BOOT_PHY_DRIVER(m88e1118) = {
>
>  U_BOOT_PHY_DRIVER(m88e1118r) = {
> .name = "Marvell 88E1118R",
> -   .uid = 0x1410e40,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E1116R,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88e1118_config,
> .startup = &m88e1118_startup,
> @@ -735,8 +736,8 @@ U_BOOT_PHY_DRIVER(m88e1118r) = {
>
>  U_BOOT_PHY_DRIVER(m88e1121r) = {
> .name = "Marvell 88E1121R",
> -   .uid = 0x1410cb0,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E1121R,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88e1121_config,
> .startup = &genphy_startup,
> @@ -745,8 +746,8 @@ U_BOOT_PHY_DRIVER(m88e1121r) = {
>
>  U_BOOT_PHY_DRIVER(m88e1145) = {
> .name = "Marvell 88E1145",
> -   .uid = 0x1410cd0,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E1145,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88e1145_config,
> .startup = &m88e1145_startup,
> @@ -755,8 +756,8 @@ U_BOOT_PHY_DRIVER(m88e1145) = {
>
>  U_BOOT_PHY_DRIVER(m88e1149s) = {
> .name = "Marvell 88E1149S",
> -   .uid = 0x1410ca0,
> -   .mask = 0xff0,
> +   .uid = 0x01410ca0,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88e1149_config,
> .startup = &m88e1011s_startup,
> @@ -765,8 +766,8 @@ U_BOOT_PHY_DRIVER(m88e1149s) = {
>
>  U_BOOT_PHY_DRIVER(m88e1240) = {
> .name = "Marvell 88E1240",
> -   .uid = 0x1410e30,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E1240,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88e1240_config,
> .startup = &m88e1011s_startup,
> @@ -775,8 +776,8 @@ U_BOOT_PHY_DRIVER(m88e1240) = {
>
>  U_BOOT_PHY_DRIVER(m88e151x) = {
> .name = "Marvell 88E151x",
> -   .uid = 0x1410dd0,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E1510,
> +   .mask = MARVELL_PHY_ID_MASK,
> .features = PHY_GBIT_FEATURES,
> .config = &m88e151x_config,
> .startup = &m88e1011s_startup,
> @@ -787,8 +788,8 @@ U_BOOT_PHY_DRIVER(m88e151x) = {
>
>  U_BOOT_PHY_DRIVER(m88e1310) = {
> .name = "Marvell 88E1310",
> -   .uid = 0x01410e90,
> -   .mask = 0xff0,
> +   .uid = MARVELL_PHY_ID_88E1318S,
> +   .mask = MARVELL_PHY_ID_MASK,
>

[PATCH 1/5] net: phy: marvell: Import and use marvell_phy.h from Linux

2023-03-19 Thread Marek Vasut 
Import marvell_phy.h from Linux 5.14.y as of commit
a5de4be06 ("net: phy: marvell10g: fix differentiation of 88X3310 from 
88X3340")
and use it in marvell PHY driver instead of current ad-hoc macros.
Two of the PHY IDs are unknown to Linux, 88E1149S and 88E1680, for
those two, only sync the length of the hexadecimal number to 8 digits.

No functional change.

Signed-off-by: Marek Vasut 
---
Cc: "Ariel D'Alessandro" 
Cc: "Marek Behún" 
Cc: Joe Hershberger 
Cc: Marek Vasut 
Cc: Michael Trimarchi 
Cc: Nate Drude 
Cc: Ramon Fried 
Cc: Simon Glass 
Cc: Stefan Roese 
Cc: Tim Harvey 
Cc: Vladimir Oltean 
---
 drivers/net/phy/marvell.c | 45 +++--
 include/marvell_phy.h | 47 +++
 2 files changed, 70 insertions(+), 22 deletions(-)
 create mode 100644 include/marvell_phy.h

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 8992be6e89e..0a90f710dfe 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -7,6 +7,7 @@
  */
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -695,8 +696,8 @@ static int m88e1680_config(struct phy_device *phydev)
 
 U_BOOT_PHY_DRIVER(m88e1011s) = {
.name = "Marvell 88E1011S",
-   .uid = 0x1410c60,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E1101,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e1011s_config,
.startup = &m88e1011s_startup,
@@ -705,8 +706,8 @@ U_BOOT_PHY_DRIVER(m88e1011s) = {
 
 U_BOOT_PHY_DRIVER(m88es) = {
.name = "Marvell 88ES",
-   .uid = 0x1410cc0,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88es_config,
.startup = &m88e1011s_startup,
@@ -715,8 +716,8 @@ U_BOOT_PHY_DRIVER(m88es) = {
 
 U_BOOT_PHY_DRIVER(m88e1118) = {
.name = "Marvell 88E1118",
-   .uid = 0x1410e10,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E1118,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e1118_config,
.startup = &m88e1118_startup,
@@ -725,8 +726,8 @@ U_BOOT_PHY_DRIVER(m88e1118) = {
 
 U_BOOT_PHY_DRIVER(m88e1118r) = {
.name = "Marvell 88E1118R",
-   .uid = 0x1410e40,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E1116R,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e1118_config,
.startup = &m88e1118_startup,
@@ -735,8 +736,8 @@ U_BOOT_PHY_DRIVER(m88e1118r) = {
 
 U_BOOT_PHY_DRIVER(m88e1121r) = {
.name = "Marvell 88E1121R",
-   .uid = 0x1410cb0,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E1121R,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e1121_config,
.startup = &genphy_startup,
@@ -745,8 +746,8 @@ U_BOOT_PHY_DRIVER(m88e1121r) = {
 
 U_BOOT_PHY_DRIVER(m88e1145) = {
.name = "Marvell 88E1145",
-   .uid = 0x1410cd0,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E1145,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e1145_config,
.startup = &m88e1145_startup,
@@ -755,8 +756,8 @@ U_BOOT_PHY_DRIVER(m88e1145) = {
 
 U_BOOT_PHY_DRIVER(m88e1149s) = {
.name = "Marvell 88E1149S",
-   .uid = 0x1410ca0,
-   .mask = 0xff0,
+   .uid = 0x01410ca0,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e1149_config,
.startup = &m88e1011s_startup,
@@ -765,8 +766,8 @@ U_BOOT_PHY_DRIVER(m88e1149s) = {
 
 U_BOOT_PHY_DRIVER(m88e1240) = {
.name = "Marvell 88E1240",
-   .uid = 0x1410e30,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E1240,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e1240_config,
.startup = &m88e1011s_startup,
@@ -775,8 +776,8 @@ U_BOOT_PHY_DRIVER(m88e1240) = {
 
 U_BOOT_PHY_DRIVER(m88e151x) = {
.name = "Marvell 88E151x",
-   .uid = 0x1410dd0,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E1510,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e151x_config,
.startup = &m88e1011s_startup,
@@ -787,8 +788,8 @@ U_BOOT_PHY_DRIVER(m88e151x) = {
 
 U_BOOT_PHY_DRIVER(m88e1310) = {
.name = "Marvell 88E1310",
-   .uid = 0x01410e90,
-   .mask = 0xff0,
+   .uid = MARVELL_PHY_ID_88E1318S,
+   .mask = MARVELL_PHY_ID_MASK,
.features = PHY_GBIT_FEATURES,
.config = &m88e1310_config,
.startup = &m88e1011s_startup,
@@ -797,8 +798,8 @@ U_BOOT_PHY_DRIVER(m88e1310) = {
 
 U_BOOT_PHY_DRIVER(m88e1680) = {
.name = "Marvell 88E1680",
-   .uid = 0x1410ed0,
-   .mask = 0xff0,
+   .uid = 0x01410ed0,
+   .mask =