net: phy: Add a generic phy file for TI generic PHYs
Subsystems (4)
RFC PATCH 1/3 net: phy: Add a generic phy file for TI generic PHYs
Add a TI Generic init file that will initialize TI PHYs that follow that not require special handling. These PHYs can connect with the standard MII register set. This generice file will register the PHY IDs and names of the PHYs so when the command 'mdio list' is executed the PHY name will display as opposed to 'Generic PHY'.
The DP8382X PHY series is a generic PHY that requires the generic registration.
The DP83867 driver was updated to rename the init to a more PHY specific init call.
--- configs/am65x_evm_a53_defconfig | 2 +- configs/am65x_hs_evm_a53_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/dra7xx_hs_evm_usb_defconfig | 2 +- configs/j721e_evm_a72_defconfig | 2 +- configs/j721e_hs_evm_a72_defconfig | 2 +- configs/k2g_evm_defconfig | 2 +- configs/xilinx_versal_virt_defconfig | 2 +- configs/xilinx_zynqmp_virt_defconfig | 2 +- drivers/net/phy/Kconfig | 8 ++ drivers/net/phy/Makefile | 3 +- drivers/net/phy/dp83867.c | 3 +- drivers/net/phy/ti_phy_init.c | 106 +++++++++++++++++++++++++++ drivers/net/phy/ti_phy_init.h | 16 ++++ 15 files changed, 144 insertions(+), 12 deletions(-) create mode 100644 drivers/net/phy/ti_phy_init.c create mode 100644 drivers/net/phy/ti_phy_init.h
configs/am65x_evm_a53_defconfig +1 -1
@@ -101,7 +101,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_E1000=y
configs/am65x_hs_evm_a53_defconfig +1 -1
@@ -103,7 +103,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_E1000=y
configs/dra7xx_evm_defconfig +1 -1
@@ -86,7 +86,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=y
configs/dra7xx_hs_evm_defconfig +1 -1
@@ -89,7 +89,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=y
configs/dra7xx_hs_evm_usb_defconfig +1 -1
@@ -87,7 +87,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=y
configs/j721e_evm_a72_defconfig +1 -1
@@ -124,7 +124,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=y
configs/j721e_hs_evm_a72_defconfig +1 -1
@@ -114,7 +114,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=y
configs/k2g_evm_defconfig +1 -1
@@ -58,7 +58,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MARVELL=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_KEYSTONE_NET=y
configs/xilinx_versal_virt_defconfig +1 -1
@@ -61,7 +61,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHY_MARVELL=y CONFIG_PHY_NATSEMI=y CONFIG_PHY_REALTEK=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_VITESSE=y CONFIG_PHY_FIXED=y CONFIG_PHY_GIGE=y
configs/xilinx_zynqmp_virt_defconfig +1 -1
@@ -101,7 +101,7 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_PHY_NATSEMI=y CONFIG_PHY_REALTEK=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_VITESSE=y CONFIG_PHY_XILINX_GMII2RGMII=y CONFIG_PHY_FIXED=y
drivers/net/phy/Kconfig +8 -0
@@ -244,6 +244,14 @@ config PHY_TERANETICS config PHY_TI bool "Texas Instruments Ethernet PHYs support" +config PHY_TI_GENERIC + select PHY_TI + bool "Texas Instruments Ethernet PHYs support" + +config PHY_DP83867 + select PHY_TI + bool "Texas Instruments Ethernet DP83867 PHY support" + config PHY_VITESSE bool "Vitesse Ethernet PHYs support"
drivers/net/phy/Makefile +2 -1
@@ -25,7 +25,8 @@ obj-$(CONFIG_PHY_NATSEMI) += natsemi.o obj-$(CONFIG_PHY_REALTEK) += realtek.o obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o -obj-$(CONFIG_PHY_TI) += dp83867.o +obj-$(CONFIG_PHY_TI) += ti_phy_init.o +obj-$(CONFIG_PHY_DP83867) += dp83867.o obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o obj-$(CONFIG_PHY_VITESSE) += vitesse.o
drivers/net/phy/dp83867.c +2 -1
@@ -12,6 +12,7 @@#include <dm.h> #include <dt-bindings/net/ti-dp83867.h> +#include "ti_phy_init.h" /* TI DP83867 */ #define DP83867_DEVADDR 0x1f
@@ -428,7 +429,7 @@ static struct phy_driver DP83867_driver = { .shutdown = &genphy_shutdown, }; -int phy_ti_init (void ) +int phy_dp83867_init (void ) {phy_register (&DP83867_driver);return 0 ;
drivers/net/phy/ti_phy_init.c new file +106 -0
106 lines not on this page · raw message
drivers/net/phy/ti_phy_init.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* TI Generic Ethernet PHY +* Based on code in sungem_phy.c and (long-removed) gianfar_phy.c +* +* Author: Dan Murphy <[email protected]> +* +* Copyright (C) 2019 Texas Instruments Inc. +*/ + +#ifndef _TI_GEN_PHY_H +#define _TI_GEN_PHY_H + +int phy_dp83867_init (void ); + +#endif /* _TI_GEN_PHY_H */
Signature · 1 line
2.25.1
RFC PATCH 2/3 net: phy: Add helper routines to set and clear bits
Add phy_set/clear_bit helper routines so that ported drivers from the kernel can use these functions.
--- include/phy.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
include/phy.h +38 -0
@@ -257,6 +257,44 @@ static inline int phy_write_mmd(struct phy_device *phydev, int devad,return phy_write (phydev,MDIO_DEVAD_NONE ,MII_MMD_DATA , val); } +static inline int phy_set_bits_mmd (struct phy_device *phydev,int devad, +u32 regnum,u16 val) +{ +int value; +int ret; + + value =phy_read_mmd (phydev, devad, regnum); +if (value <0 ) +return value; + + value |= val; + + ret =phy_write_mmd (phydev, devad, regnum, value); +if (ret <0 ) +return ret; + +return 0 ; +} + +static inline int phy_clear_bits_mmd (struct phy_device *phydev,int devad, +u32 regnum,u16 val) +{ +int value; +int ret; + + value =phy_read_mmd (phydev, devad, regnum); +if (value <0 ) +return value; + + value &= ~val; + + ret =phy_write_mmd (phydev, devad, regnum, value); +if (ret <0 ) +return ret; + +return 0 ; +} +#ifdef CONFIG_PHYLIB_10G extern struct phy_driver gen10g_driver;
Signature · 1 line
2.25.1
RFC PATCH 2/3 net: phy: Add helper routines to set and clear bits
Quoted 13 lines · Dan Murphy
Add phy_set/clear_bit helper routines so that ported drivers from the kernel can use these functions.
Signed-off-by Dan Murphy <[email protected]>--- include/phy.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)include/phy.h +0
-0
include/phy.h static inline int phy_write_mmd(struct phy_device *phydev, int devad, · line 259
Quoted 3 lines
include/phy.h +0
-0@@ -257,6 +257,44 @@ static inline int phy_write_mmd(struct phy_device *phydev, int devad,return phy_write (phydev,MDIO_DEVAD_NONE ,MII_MMD_DATA , val); }
kernel-doc description would be good.
include/phy.h static inline int phy_write_mmd(struct phy_device *phydev, int devad, · line 264
Quoted 5 lines
include/phy.h +5
-0+static inline int phy_set_bits_mmd (struct phy_device *phydev,int devad, +u32 regnum,u16 val) +{ +int value; +int ret;
nit: on one line should be better.
Quoted 9 lines
include/phy.h +9
-0+ + value =phy_read_mmd (phydev, devad, regnum); +if (value <0 ) +return value; + + value |= val; + + ret =phy_write_mmd (phydev, devad, regnum, value); +if (ret <0 )
include/phy.h static inline int phy_write_mmd(struct phy_device *phydev, int devad, · line 283
Quoted 10 lines
include/phy.h +10
-0+return ret; + +return 0 ; +} + +static inline int phy_clear_bits_mmd (struct phy_device *phydev,int devad, +u32 regnum,u16 val) +{ +int value; +int ret;
ditto.
Quoted 7 lines
include/phy.h +7
-0+ + value =phy_read_mmd (phydev, devad, regnum); +if (value <0 ) +return value; + + value &= ~val; +
include/phy.h static inline int phy_write_mmd(struct phy_device *phydev, int devad, · line 300
Quoted 10 lines
include/phy.h +7
-0+ ret =phy_write_mmd (phydev, devad, regnum, value); +if (ret <0 ) +return ret; + +return 0 ; +} +#ifdef CONFIG_PHYLIB_10G extern struct phy_driver gen10g_driver;
Thanks,
Michal
RFC PATCH 2/3 net: phy: Add helper routines to set and clear bits
Michal
Thanks for the review
Quoted 9 lines · Michal Simek
Quoted 8 lines · Dan Murphy
Add phy_set/clear_bit helper routines so that ported drivers from the kernel can use these functions.
Signed-off-by Dan Murphy <[email protected]>--- include/phy.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
Quoted 9 lines
include/phy.h static inline int phy_write_mmd(struct phy_device *phydev, int devad, · line 259
Quoted 8 lines
include/phy.h +0
-0@@ -257,6 +257,44 @@ static inline int phy_write_mmd(struct phy_device *phydev, int devad,return phy_write (phydev,MDIO_DEVAD_NONE ,MII_MMD_DATA , val); }kernel-doc description would be good.
Just following the files coding practice.? No other APIs have kernel-doc.
Not that I won't add them but it is worth pointing this out.
Quoted 7 lines
include/phy.h static inline int phy_write_mmd(struct phy_device *phydev, int devad, · line 264
Quoted 6 lines
include/phy.h +5
-0+static inline int phy_set_bits_mmd (struct phy_device *phydev,int devad, +u32 regnum,u16 val) +{ +int value; +int ret;nit: on one line should be better.
I was under the impression that when code is side ported to uBoot it should be as close to the origin as possible for bug fixes to be easily understood and applied.
Please correct my understanding if I had the wrong impression.
Not that this specific nit is going to make a difference but it applies to other comments made in the other patches.
Dan
RFC PATCH 2/3 net: phy: Add helper routines to set and clear bits
Quoted 25 lines · Dan Murphy
Michal
Thanks for the review
Quoted 9 lines · Michal Simek
Quoted 8 lines · Dan Murphy
Add phy_set/clear_bit helper routines so that ported drivers from the kernel can use these functions.
Signed-off-by Dan Murphy <[email protected]>---
?include/phy.h| 38 ++++++++++++++++++++++++++++++++++++++ ? 1 file changed, 38 insertions(+)Quoted 10 lines
Quoted 9 lines
include/phy.h +0
-0@@ -257,6 +257,44 @@ static inline int phy_write_mmd(struct phy_device *phydev, int devad, ????? return phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_DATA, val); ? }?
kernel-doc description would be good.
Quoted 3 lines
Just following the files coding practice.? No other APIs have kernel-doc.
Not that I won't add them but it is worth pointing this out.
Not sure if this straight copy from Linux but from phy_init() down all functions used that.
Quoted 9 lines
Quoted 8 lines
Quoted 7 lines
+static inline int phy_set_bits_mmd(struct
phy_device*phydev, int devad,
+?????????????????? u32 regnum, u16 val)
+{
+??? int value;
+??? int ret;nit: on one line should be better.
Quoted 8 lines
I was under the impression that when code is side ported to uBoot it should be as close to the origin as possible for bug fixes to be easily understood and applied.
Please correct my understanding if I had the wrong impression.
Not that this specific nit is going to make a difference but it applies to other comments made in the other patches.
then would be good to fix it in origin source. :-) Even this fix is quite trivial.
Thanks,
Michal
RFC PATCH 2/3 net: phy: Add helper routines to set and clear bits
Michal
Quoted 25 lines · Michal Simek
Quoted 24 lines · Dan Murphy
Michal
Thanks for the review
Quoted 19 lines · Michal Simek
Quoted 13 lines · Dan Murphy
Add phy_set/clear_bit helper routines so that ported drivers from the kernel can use these functions.
Signed-off-by Dan Murphy <[email protected]>--- ? include/phy.h | 38 ++++++++++++++++++++++++++++++++++++++? 1 file changed, 38 insertions(+)
include/phy.h +0
-0include/phy.h static inline int phy_write_mmd(struct · line 260
Quoted 4 lines
include/phy.h +0
-0@@ -257,6 +257,44 @@ static inline int phy_write_mmd(struct phy_device *phydev, int devad, ????? return phy_write(phydev, MDIO_DEVAD_NONE, MII_MMD_DATA, val); ? }kernel-doc description would be good.
Quoted 5 lines
Quoted 3 lines
Just following the files coding practice.? No other APIs have kernel-doc.
Not that I won't add them but it is worth pointing this out.
Not sure if this straight copy from Linux but from
phy_init()down all functions used that.
Yes they do but the inline functions don't.
I will actually go one better and add the k-doc to the other in-line functions above for consistency.
Quoted 11 lines
Quoted 11 lines
Quoted 7 lines
include/phy.h static inline int phy_write_mmd(struct · line 266
Quoted 6 lines
include/phy.h +5
-0+static inline int phy_set_bits_mmd (struct phy_device *phydev,int devad, +?????????????????? u32 regnum, u16 val) +{ +??? int value; +??? int ret;nit: on one line should be better.
I was under the impression that when code is side ported to uBoot it should be as close to the origin as possible for bug fixes to be easily understood and applied.
Quoted 6 lines
Quoted 4 lines
Please correct my understanding if I had the wrong impression.
Not that this specific nit is going to make a difference but it applies to other comments made in the other patches.
then would be good to fix it in origin source. :-) Even this fix is quite trivial.
I am currently working on bug fixing the upstream DP83869 driver so I can add some of the fixes.? I will throw your Reported-by in the commit message if you want.
Dan
RFC PATCH 3/3 net: phy: dp83869: Port the kernel driver
In reply to Dan MurphyPort the DP83869 kernel driver.
--- drivers/net/phy/Kconfig | 4 + drivers/net/phy/Makefile | 1 + drivers/net/phy/dp83869.c | 440 +++++++++++++++++++++++++++ drivers/net/phy/ti_phy_init.c | 4 + drivers/net/phy/ti_phy_init.h | 1 + include/dt-bindings/net/ti-dp83869.h | 42 +++ 6 files changed, 492 insertions(+) create mode 100644 drivers/net/phy/dp83869.c create mode 100644 include/dt-bindings/net/ti-dp83869.h
drivers/net/phy/Kconfig +4 -0
@@ -252,6 +252,10 @@ config PHY_DP83867 select PHY_TI bool "Texas Instruments Ethernet DP83867 PHY support" +config PHY_DP83869 + select PHY_TI + bool "Texas Instruments Ethernet DP83869 PHY support" + config PHY_VITESSE bool "Vitesse Ethernet PHYs support"
drivers/net/phy/Makefile +1 -0
@@ -27,6 +27,7 @@ obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o obj-$(CONFIG_PHY_TI) += ti_phy_init.o obj-$(CONFIG_PHY_DP83867) += dp83867.o +obj-$(CONFIG_PHY_DP83869) += dp83869.o obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o obj-$(CONFIG_PHY_VITESSE) += vitesse.o
drivers/net/phy/dp83869.c new file +440 -0
440 lines not on this page · raw message
drivers/net/phy/ti_phy_init.c +4 -0
@@ -92,6 +92,10 @@ int phy_ti_init(void)phy_dp83867_init ();#endif +#ifdef CONFIG_PHY_DP83869 +phy_dp83869_init (); +#endif +#ifdef CONFIG_PHY_TI_GENERIC phy_register (&dp83822_driver);phy_register (&dp83825s_driver);
drivers/net/phy/ti_phy_init.h +1 -0
@@ -12,5 +12,6 @@#define _TI_GEN_PHY_Hint phy_dp83867_init (void ); +int phy_dp83869_init (void );#endif /* _TI_GEN_PHY_H */
include/dt-bindings/net/ti-dp83869.h new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.25.1
RFC PATCH 3/3 net: phy: dp83869: Port the kernel driver
Quoted 19 lines · Dan Murphy
Port the DP83869 kernel driver.
Signed-off-by Dan Murphy <[email protected]>--- drivers/net/phy/Kconfig | 4 + drivers/net/phy/Makefile | 1 + drivers/net/phy/dp83869.c | 440 +++++++++++++++++++++++++++ drivers/net/phy/ti_phy_init.c | 4 + drivers/net/phy/ti_phy_init.h | 1 + include/dt-bindings/net/ti-dp83869.h | 42 +++ 6 files changed, 492 insertions(+) create mode 100644 drivers/net/phy/dp83869.c create mode 100644 include/dt-bindings/net/ti-dp83869.hdrivers/net/phy/Kconfig +0
-0
drivers/net/phy/Kconfig config PHY_DP83867 · line 257
Quoted 6 lines
drivers/net/phy/Kconfig +3
-0@@ -252,6 +252,10 @@ config PHY_DP83867 select PHY_TI bool "Texas Instruments Ethernet DP83867 PHY support" +config PHY_DP83869 + select PHY_TI + bool "Texas Instruments Ethernet DP83869 PHY support"
isn't this a little bit short? I expect checkpatch should be reporting issue with it.
Quoted 22 lines
drivers/net/phy/Kconfig +1
-0+ config PHY_VITESSE bool "Vitesse Ethernet PHYs support"drivers/net/phy/Makefile +1
-0@@ -27,6 +27,7 @@ obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o obj-$(CONFIG_PHY_TI) += ti_phy_init.o obj-$(CONFIG_PHY_DP83867) += dp83867.o +obj-$(CONFIG_PHY_DP83869) += dp83869.o obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o obj-$(CONFIG_PHY_VITESSE) += vitesse.odrivers/net/phy/dp83869.c new file +0
-0
drivers/net/phy/dp83869.c line 3
Quoted 3 lines
drivers/net/phy/dp83869.c new file +3
-0@@ -0,0 +1,440 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Driver for the Texas Instruments DP83869 PHY +* Copyright (C) 2019 Texas Instruments Inc.
2020?
Quoted 101 lines
drivers/net/phy/dp83869.c new file +101
-0+*/ + +#include <common.h> +#include <phy.h> +#include <dm/devres.h> +#include <linux/compat.h> +#include <malloc.h> + +#include <dm.h> + +#include <dt-bindings/net/ti-dp83869.h> + +#include "ti_phy_init.h" + +#define DP83869_PHY_ID 0x2000a0f1 +#define DP83869_DEVADDR 0x1f + +#define MII_DP83869_PHYCTRL 0x10 +#define MII_DP83869_MICR 0x12 +#define MII_DP83869_ISR 0x13 +#define DP83869_CTRL 0x1f +#define DP83869_CFG4 0x1e + +/* Extended Registers */ +#define DP83869_GEN_CFG3 0x0031 +#define DP83869_RGMIICTL 0x0032 +#define DP83869_STRAP_STS1 0x006e +#define DP83869_RGMIIDCTL 0x0086 +#define DP83869_IO_MUX_CFG 0x0170 +#define DP83869_OP_MODE 0x01df +#define DP83869_FX_CTRL 0x0c00 + +#define DP83869_SW_RESET BIT(15) +#define DP83869_SW_RESTART BIT(14) + +/* MICR Interrupt bits */ +#define MII_DP83869_MICR_AN_ERR_INT_EN BIT(15) +#define MII_DP83869_MICR_SPEED_CHNG_INT_EN BIT(14) +#define MII_DP83869_MICR_DUP_MODE_CHNG_INT_EN BIT(13) +#define MII_DP83869_MICR_PAGE_RXD_INT_EN BIT(12) +#define MII_DP83869_MICR_AUTONEG_COMP_INT_EN BIT(11) +#define MII_DP83869_MICR_LINK_STS_CHNG_INT_EN BIT(10) +#define MII_DP83869_MICR_FALSE_CARRIER_INT_EN BIT(8) +#define MII_DP83869_MICR_SLEEP_MODE_CHNG_INT_EN BIT(4) +#define MII_DP83869_MICR_WOL_INT_EN BIT(3) +#define MII_DP83869_MICR_XGMII_ERR_INT_EN BIT(2) +#define MII_DP83869_MICR_POL_CHNG_INT_EN BIT(1) +#define MII_DP83869_MICR_JABBER_INT_EN BIT(0) + +#define MII_DP83869_BMCR_DEFAULT (BMCR_ANENABLE | \ + BMCR_FULLDPLX | \ + BMCR_SPEED1000) + +#define MII_DP83869_FIBER_ADVERTISE (ADVERTISE_CSMA | \ + ADVERTISE_1000XHALF | \ + ADVERTISE_1000XFULL | \ + ADVERTISE_1000XPAUSE | \ + ADVERTISE_1000XPSE_ASYM) + +/* This is the same bit mask as the BMCR so re-use the BMCR default */ +#define DP83869_FX_CTRL_DEFAULT MII_DP83869_BMCR_DEFAULT + +/* CFG1 bits */ +#define DP83869_CFG1_DEFAULT (ADVERTISE_1000HALF | \ + ADVERTISE_1000FULL | \ + CTL1000_AS_MASTER) + +/* RGMIICTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_EN BIT(1) +#define DP83869_RGMII_RX_CLK_DELAY_EN BIT(0) + +/* STRAP_STS1 bits */ +#define DP83869_STRAP_OP_MODE_MASK GENMASK(2, 0) +#define DP83869_STRAP_STS1_RESERVED BIT(11) +#define DP83869_STRAP_MIRROR_ENABLED BIT(12) + +/* PHYCTRL bits */ +#define DP83869_RX_FIFO_SHIFT 12 +#define DP83869_TX_FIFO_SHIFT 14 + +/* PHY_CTRL lower bytes 0x48 are declared as reserved */ +#define DP83869_PHY_CTRL_DEFAULT 0x48 +#define DP83869_PHYCR_FIFO_DEPTH_MASK GENMASK(15, 12) +#define DP83869_PHYCR_RESERVED_MASK BIT(11) + +/* RGMIIDCTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_SHIFT 4 + +/* IO_MUX_CFG bits */ +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL 0x1f + +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MAX 0x0 +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN 0x1f +#define DP83869_IO_MUX_CFG_CLK_O_SEL_MASK (0x1f << 8) +#define DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT 8 + +/* CFG3 bits */ +#define DP83869_CFG3_PORT_MIRROR_EN BIT(0) + +/* CFG4 bits */ +#define DP83869_INT_OE BIT(7)
drivers/net/phy/dp83869.c line 114
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ +/* OP MODE */ +#define DP83869_OP_MODE_MII BIT(5) +#define DP83869_SGMII_RGMII_BRIDGE BIT(6) + +enum { +DP83869_PORT_MIRRORING_KEEP , +DP83869_PORT_MIRRORING_EN , +DP83869_PORT_MIRRORING_DIS , +};
We have met with this in the kernel. Greg was asking us to write exact value to all enum entries.
drivers/net/phy/dp83869.c line 124
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ +struct dp83869_private { +int tx_fifo_depth; +int rx_fifo_depth; +int io_impedance; +int port_mirroring; +bool rxctrl_strap_quirk; +int clk_output_sel; +int mode; +};
I would prefer kernel-doc format to make reading easier. Also tx_fifo_depth doesn't look like signed type. I would make them unsigned.
drivers/net/phy/dp83869.c line 134
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ +static int dp83869_config_port_mirroring (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; + +if (dp83869->port_mirroring ==DP83869_PORT_MIRRORING_EN ) +return phy_set_bits_mmd (phydev,DP83869_DEVADDR , +DP83869_GEN_CFG3 , +DP83869_CFG3_PORT_MIRROR_EN ); +else
you can remove this else.
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+return phy_clear_bits_mmd (phydev,DP83869_DEVADDR , +DP83869_GEN_CFG3 , +DP83869_CFG3_PORT_MIRROR_EN ); +} + +static int dp83869_set_strapped_mode (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +u16 val; +
drivers/net/phy/dp83869.c line 154
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ val =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_STRAP_STS1 ); +if (val <0 ) +return val; + + dp83869->mode = val &DP83869_STRAP_OP_MODE_MASK ; + +return 0 ; +} + +#ifdef CONFIG_OF_MDIO
Isn't there a way to remove these?
if (IS_ENABLED(CONFIG_OF_MDIO))
...
drivers/net/phy/dp83869.c line 163
Quoted 9 lines
drivers/net/phy/dp83869.c new file +9
-0+static int dp83869_of_init (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +struct device *dev = &phydev->mdio.dev; +struct device_node *of_node = dev->of_node; +int ret; + +if (!of_node) +return -ENODEV ;
didn't go deep to this but can this happen?
drivers/net/phy/dp83869.c line 165
Quoted 2 lines
drivers/net/phy/dp83869.c new file +2
-0+ + dp83869->io_impedance = -EINVAL ;
I would prefer to group it together. It means move this before dt reading.
drivers/net/phy/dp83869.c line 174
Quoted 9 lines
drivers/net/phy/dp83869.c new file +9
-0+ +/* Optional configuration */ + ret =of_property_read_u32 (of_node,"ti,clk-output-sel" , + &dp83869->clk_output_sel); +if (ret || dp83869->clk_output_sel >DP83869_CLK_O_SEL_REF_CLK ) + dp83869->clk_output_sel =DP83869_CLK_O_SEL_REF_CLK ; + + ret =of_property_read_u32 (of_node,"ti,op-mode" , &dp83869->mode); +if (ret ==0 ) {
!ret
Quoted 11 lines
drivers/net/phy/dp83869.c new file +11
-0+if (dp83869->mode <DP83869_RGMII_COPPER_ETHERNET || + dp83869->mode >DP83869_SGMII_COPPER_ETHERNET ) +return -EINVAL ; + }else { + ret =dp83869_set_strapped_mode (phydev); +if (ret) +return ret; + } + +if (of_property_read_bool (of_node,"ti,max-output-impedance" )) + dp83869->io_impedance =DP83869_IO_MUX_CFG_IO_IMPEDANCE_MAX ;
drivers/net/phy/dp83869.c line 195
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+else if (of_property_read_bool (of_node,"ti,min-output-impedance" )) + dp83869->io_impedance =DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN ; + +if (of_property_read_bool (of_node,"enet-phy-lane-swap" )) { + dp83869->port_mirroring =DP83869_PORT_MIRRORING_EN ; + }else { +/* If the lane swap is not in the DT then check the straps */ + ret =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_STRAP_STS1 ); +if (ret <0 ) +return ret;
newline here please.
Quoted 58 lines
drivers/net/phy/dp83869.c new file +58
-0+if (ret &DP83869_STRAP_MIRROR_ENABLED ) + dp83869->port_mirroring =DP83869_PORT_MIRRORING_EN ; +else + dp83869->port_mirroring = DP83869_PORT_MIRRORING_DIS; + } + +if (of_property_read_u32 (of_node,"rx-fifo-depth" , + &dp83869->rx_fifo_depth)) + dp83869->rx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + +if (of_property_read_u32 (of_node,"tx-fifo-depth" , + &dp83869->tx_fifo_depth)) + dp83869->tx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + +return ret; +} +#else +static int dp83869_of_init (struct phy_device *phydev) +{ +return dp83869_set_strapped_mode (phydev); +} +#endif /* CONFIG_OF_MDIO */ + +static int dp83869_configure_rgmii (struct phy_device *phydev, +struct dp83869_private *dp83869) +{ +int ret =0 , val; + +if (phy_interface_is_rgmii (phydev)) { + val =phy_read (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL ); +if (val <0 ) +return val; + + val &= ~DP83869_PHYCR_FIFO_DEPTH_MASK ; + val |= (dp83869->tx_fifo_depth <<DP83869_TX_FIFO_SHIFT ); + val |= (dp83869->rx_fifo_depth <<DP83869_RX_FIFO_SHIFT ); + + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , val); +if (ret) +return ret; + } + +if (dp83869->io_impedance >=0 ) + ret =phy_set_bits_mmd (phydev,DP83869_DEVADDR , +DP83869_IO_MUX_CFG , + dp83869->io_impedance & +DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL ); +return ret; +} + +static int dp83869_config_aneg (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +int err; + +if (dp83869->mode ==DP83869_RGMII_1000_BASE ) { + err =phy_write (phydev,MDIO_DEVAD_NONE ,MII_ADVERTISE , +MII_DP83869_FIBER_ADVERTISE );
drivers/net/phy/dp83869.c line 263
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+if (err) +return err; + + err =phy_write (phydev,MDIO_DEVAD_NONE ,DP83869_CTRL , +DP83869_SW_RESTART ); +if (err) +return err; + +return genphy_restart_aneg (phydev); + }else {
you can remove this else.
Quoted 19 lines
drivers/net/phy/dp83869.c new file +19
-0+return genphy_config_aneg (phydev); + } +} + +static int dp83869_configure_mode (struct phy_device *phydev, +struct dp83869_private *dp83869) +{ +int phy_ctrl_val; +int ret; + +if (dp83869->mode <DP83869_RGMII_COPPER_ETHERNET || + dp83869->mode >DP83869_SGMII_COPPER_ETHERNET ) +return -EINVAL ; + +/* Below init sequence for each operational mode is defined in +* section 9.4.8 of the datasheet. +*/ + ret =phy_write_mmd (phydev,DP83869_DEVADDR ,DP83869_OP_MODE , + dp83869->mode);
drivers/net/phy/dp83869.c line 292
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+if (ret) +return ret; + + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_BMCR ,MII_DP83869_BMCR_DEFAULT ); +if (ret) +return ret; + + phy_ctrl_val = (dp83869->rx_fifo_depth <<DP83869_RX_FIFO_SHIFT | + dp83869->tx_fifo_depth <<DP83869_TX_FIFO_SHIFT | +DP83869_PHY_CTRL_DEFAULT );
() are useless.
Quoted 19 lines
drivers/net/phy/dp83869.c new file +19
-0+ +switch (dp83869->mode) { +case DP83869_RGMII_COPPER_ETHERNET : + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , + phy_ctrl_val); +if (ret) +return ret; + + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_CTRL1000 , +DP83869_CFG1_DEFAULT ); +if (ret) +return ret; + + ret =dp83869_configure_rgmii (phydev, dp83869); +if (ret) +return ret; +break ; +case DP83869_RGMII_SGMII_BRIDGE : + ret = phy_set_bits_mmd(phydev, DP83869_DEVADDR, DP83869_OP_MODE,
drivers/net/phy/dp83869.c line 321
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+DP83869_SGMII_RGMII_BRIDGE , + DP83869_SGMII_RGMII_BRIDGE); +if (ret) +return ret; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR , +DP83869_FX_CTRL ,DP83869_FX_CTRL_DEFAULT ); +if (ret) +return ret; +
nit: remove this newline - it is not consistent.
Quoted 23 lines
drivers/net/phy/dp83869.c new file +23
-0+break ; +case DP83869_1000M_MEDIA_CONVERT : + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , + phy_ctrl_val); +if (ret) +return ret; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR , +DP83869_FX_CTRL ,DP83869_FX_CTRL_DEFAULT ); +if (ret) +return ret; +break ; +case DP83869_100M_MEDIA_CONVERT : + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , + phy_ctrl_val); +if (ret) +return ret; +break ; +case DP83869_SGMII_COPPER_ETHERNET : + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , + phy_ctrl_val); +if (ret) +return ret;
drivers/net/phy/dp83869.c line 354
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_CTRL1000 ,DP83869_CFG1_DEFAULT ); +if (ret) +return ret; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR , +DP83869_FX_CTRL ,DP83869_FX_CTRL_DEFAULT ); +if (ret) +return ret; +
ditto.
drivers/net/phy/dp83869.c line 357
Quoted 3 lines
drivers/net/phy/dp83869.c new file +3
-0+break ; +case DP83869_RGMII_100_BASE : +case DP83869_RGMII_1000_BASE :
Does it mean that there is not need to anything to configure? Comment about it would be good.
Quoted 7 lines
drivers/net/phy/dp83869.c new file +7
-0+break ; +default : +return -EINVAL ; + } + +return ret; +}
drivers/net/phy/dp83869.c line 374
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ +static int dp83869_phy_reset (struct phy_device *phydev) +{ +int ret; + + ret =phy_write (phydev,MDIO_DEVAD_NONE ,DP83869_CTRL ,DP83869_SW_RESET ); +if (ret <0 ) +return ret; + +udelay (200 );
comment about this delay would be necessary. Just explain where that 200us is coming from.
Quoted 18 lines
drivers/net/phy/dp83869.c new file +18
-0+ +return 0 ; +} + +static int dp83869_config_init (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +int ret; + + ret =dp83869_phy_reset (phydev); +if (ret) +return ret; + + ret =dp83869_configure_mode (phydev, dp83869); +if (ret) +return ret; + +if (dp83869->port_mirroring !=DP83869_PORT_MIRRORING_KEEP )
drivers/net/phy/dp83869.c line 402
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+dp83869_config_port_mirroring (phydev); + +/* Clock output selection if muxing property is set */ +if (dp83869->clk_output_sel !=DP83869_CLK_O_SEL_REF_CLK ) + ret =phy_set_bits_mmd (phydev,DP83869_DEVADDR , +DP83869_IO_MUX_CFG , + dp83869->clk_output_sel << +DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT ); + +dp83869_config_aneg (phydev);
You are not checking return value from this function.
Quoted 103 lines
drivers/net/phy/dp83869.c new file +38
-0+ +return ret; +} + +static int dp83869_probe (struct phy_device *phydev) +{ +struct dp83869_private *dp83869; +int ret; + + dp83869 =kzalloc (sizeof (*dp83869),GFP_KERNEL ); +if (!dp83869) +return -ENOMEM ; + + phydev->priv = dp83869; + + ret =dp83869_of_init (phydev); +if (ret) +return ret; + +return dp83869_config_init (phydev); +} + +static struct phy_driver dp83869_driver = { + .name ="TI DP83869" , + .uid =DP83869_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_GBIT_FEATURES , + .probe = dp83869_probe, + .config = &dp83869_config_init, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +int phy_dp83869_init (void ) +{ +phy_register (&dp83869_driver); +return 0 ; +}drivers/net/phy/ti_phy_init.c +4
-0@@ -92,6 +92,10 @@ int phy_ti_init(void)phy_dp83867_init ();#endif +#ifdef CONFIG_PHY_DP83869 +phy_dp83869_init (); +#endif +#ifdef CONFIG_PHY_TI_GENERIC phy_register (&dp83822_driver);phy_register (&dp83825s_driver);drivers/net/phy/ti_phy_init.h +1
-0@@ -12,5 +12,6 @@#define _TI_GEN_PHY_Hint phy_dp83867_init (void ); +int phy_dp83869_init (void );#endif /* _TI_GEN_PHY_H */ include/dt-bindings/net/ti-dp83869.h new file +32
-0@@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Device Tree constants for the Texas Instruments DP83869 PHY +* +* Author: Dan Murphy <[email protected]> +* +* Copyright: (C) 2019 Texas Instruments, Inc. +*/ + +#ifndef _DT_BINDINGS_TI_DP83869_H +#define _DT_BINDINGS_TI_DP83869_H + +/* PHY CTRL bits */ +#define DP83869_PHYCR_FIFO_DEPTH_3_B_NIB 0x00 +#define DP83869_PHYCR_FIFO_DEPTH_4_B_NIB 0x01 +#define DP83869_PHYCR_FIFO_DEPTH_6_B_NIB 0x02 +#define DP83869_PHYCR_FIFO_DEPTH_8_B_NIB 0x03 + +/* IO_MUX_CFG - Clock output selection */ +#define DP83869_CLK_O_SEL_CHN_A_RCLK 0x0 +#define DP83869_CLK_O_SEL_CHN_B_RCLK 0x1 +#define DP83869_CLK_O_SEL_CHN_C_RCLK 0x2 +#define DP83869_CLK_O_SEL_CHN_D_RCLK 0x3 +#define DP83869_CLK_O_SEL_CHN_A_RCLK_DIV5 0x4 +#define DP83869_CLK_O_SEL_CHN_B_RCLK_DIV5 0x5 +#define DP83869_CLK_O_SEL_CHN_C_RCLK_DIV5 0x6 +#define DP83869_CLK_O_SEL_CHN_D_RCLK_DIV5 0x7 +#define DP83869_CLK_O_SEL_CHN_A_TCLK 0x8 +#define DP83869_CLK_O_SEL_CHN_B_TCLK 0x9 +#define DP83869_CLK_O_SEL_CHN_C_TCLK 0xa +#define DP83869_CLK_O_SEL_CHN_D_TCLK 0xb +#define DP83869_CLK_O_SEL_REF_CLK 0xc
include/dt-bindings/net/ti-dp83869.h line 42
Quoted 10 lines
include/dt-bindings/net/ti-dp83869.h new file +10
-0+ +#define DP83869_RGMII_COPPER_ETHERNET 0x00 +#define DP83869_RGMII_1000_BASE 0x01 +#define DP83869_RGMII_100_BASE 0x02 +#define DP83869_RGMII_SGMII_BRIDGE 0x03 +#define DP83869_1000M_MEDIA_CONVERT 0x04 +#define DP83869_100M_MEDIA_CONVERT 0x05 +#define DP83869_SGMII_COPPER_ETHERNET 0x06 + +#endif
Thanks,
Michal
RFC PATCH 3/3 net: phy: dp83869: Port the kernel driver
Michal
Quoted 23 lines · Michal Simek
Quoted 22 lines · Dan Murphy
Port the DP83869 kernel driver.
Signed-off-by Dan Murphy <[email protected]>--- drivers/net/phy/Kconfig | 4 + drivers/net/phy/Makefile | 1 + drivers/net/phy/dp83869.c | 440 +++++++++++++++++++++++++++ drivers/net/phy/ti_phy_init.c | 4 + drivers/net/phy/ti_phy_init.h | 1 + include/dt-bindings/net/ti-dp83869.h | 42 +++ 6 files changed, 492 insertions(+)create mode 100644
drivers/net/phy/dp83869.ccreate mode 100644include/dt-bindings/net/ti-dp83869.hdrivers/net/phy/Kconfig +0
-0@@ -252,6 +252,10 @@ config PHY_DP83867 select PHY_TI bool "Texas Instruments Ethernet DP83867 PHY support"
Quoted 5 lines
drivers/net/phy/Kconfig config PHY_DP83867 · line 257
Quoted 3 lines
drivers/net/phy/Kconfig +3
-0+config PHY_DP83869 + select PHY_TI + bool "Texas Instruments Ethernet DP83869 PHY support"isn't this a little bit short? I expect checkpatch should be reporting issue with it.
Yes but I was following other config flags in this file.
Quoted 20 lines
Quoted 20 lines
drivers/net/phy/Kconfig +1
-0+ config PHY_VITESSE bool "Vitesse Ethernet PHYs support"drivers/net/phy/Makefile +1
-0@@ -27,6 +27,7 @@ obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o obj-$(CONFIG_PHY_TI) += ti_phy_init.o obj-$(CONFIG_PHY_DP83867) += dp83867.o +obj-$(CONFIG_PHY_DP83869) += dp83869.o obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o obj-$(CONFIG_PHY_VITESSE) += vitesse.odrivers/net/phy/dp83869.c new file +0
-0
Quoted 8 lines
drivers/net/phy/dp83869.c line 3
Quoted 7 lines
index 000000000000..1eaaea20b37a
drivers/net/phy/dp83869.c new file +3
-0@@ -0,0 +1,440 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Driver for the Texas Instruments DP83869 PHY +* Copyright (C) 2019 Texas Instruments Inc. 2020?
This driver was developed in 2019 and added to the 5.4 kernel so not sure we should update the copyright when side porting.
At the very least I will need to add 2019-20
Quoted 106 lines
Quoted 106 lines
drivers/net/phy/dp83869.c new file +105
-0+*/ + +#include <common.h> +#include <phy.h> +#include <dm/devres.h> +#include <linux/compat.h> +#include <malloc.h> + +#include <dm.h> + +#include <dt-bindings/net/ti-dp83869.h> + +#include "ti_phy_init.h" + +#define DP83869_PHY_ID 0x2000a0f1 +#define DP83869_DEVADDR 0x1f + +#define MII_DP83869_PHYCTRL 0x10 +#define MII_DP83869_MICR 0x12 +#define MII_DP83869_ISR 0x13 +#define DP83869_CTRL 0x1f +#define DP83869_CFG4 0x1e + +/* Extended Registers */ +#define DP83869_GEN_CFG3 0x0031 +#define DP83869_RGMIICTL 0x0032 +#define DP83869_STRAP_STS1 0x006e +#define DP83869_RGMIIDCTL 0x0086 +#define DP83869_IO_MUX_CFG 0x0170 +#define DP83869_OP_MODE 0x01df +#define DP83869_FX_CTRL 0x0c00 + +#define DP83869_SW_RESET BIT(15) +#define DP83869_SW_RESTART BIT(14) + +/* MICR Interrupt bits */ +#define MII_DP83869_MICR_AN_ERR_INT_EN BIT(15) +#define MII_DP83869_MICR_SPEED_CHNG_INT_EN BIT(14) +#define MII_DP83869_MICR_DUP_MODE_CHNG_INT_EN BIT(13) +#define MII_DP83869_MICR_PAGE_RXD_INT_EN BIT(12) +#define MII_DP83869_MICR_AUTONEG_COMP_INT_EN BIT(11) +#define MII_DP83869_MICR_LINK_STS_CHNG_INT_EN BIT(10) +#define MII_DP83869_MICR_FALSE_CARRIER_INT_EN BIT(8) +#define MII_DP83869_MICR_SLEEP_MODE_CHNG_INT_EN BIT(4) +#define MII_DP83869_MICR_WOL_INT_EN BIT(3) +#define MII_DP83869_MICR_XGMII_ERR_INT_EN BIT(2) +#define MII_DP83869_MICR_POL_CHNG_INT_EN BIT(1) +#define MII_DP83869_MICR_JABBER_INT_EN BIT(0) + +#define MII_DP83869_BMCR_DEFAULT (BMCR_ANENABLE | \ + BMCR_FULLDPLX | \ + BMCR_SPEED1000) + +#define MII_DP83869_FIBER_ADVERTISE (ADVERTISE_CSMA | \ + ADVERTISE_1000XHALF | \ + ADVERTISE_1000XFULL | \ + ADVERTISE_1000XPAUSE | \ + ADVERTISE_1000XPSE_ASYM) + +/* This is the same bit mask as the BMCR so re-use the BMCR default */ +#define DP83869_FX_CTRL_DEFAULT MII_DP83869_BMCR_DEFAULT + +/* CFG1 bits */ +#define DP83869_CFG1_DEFAULT (ADVERTISE_1000HALF | \ + ADVERTISE_1000FULL | \ + CTL1000_AS_MASTER) + +/* RGMIICTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_EN BIT(1) +#define DP83869_RGMII_RX_CLK_DELAY_EN BIT(0) + +/* STRAP_STS1 bits */ +#define DP83869_STRAP_OP_MODE_MASK GENMASK(2, 0) +#define DP83869_STRAP_STS1_RESERVED BIT(11) +#define DP83869_STRAP_MIRROR_ENABLED BIT(12) + +/* PHYCTRL bits */ +#define DP83869_RX_FIFO_SHIFT 12 +#define DP83869_TX_FIFO_SHIFT 14 + +/* PHY_CTRL lower bytes 0x48 are declared as reserved */ +#define DP83869_PHY_CTRL_DEFAULT 0x48 +#define DP83869_PHYCR_FIFO_DEPTH_MASK GENMASK(15, 12) +#define DP83869_PHYCR_RESERVED_MASK BIT(11) + +/* RGMIIDCTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_SHIFT 4 + +/* IO_MUX_CFG bits */ +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL 0x1f + +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MAX 0x0 +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN 0x1f +#define DP83869_IO_MUX_CFG_CLK_O_SEL_MASK (0x1f << 8) +#define DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT 8 + +/* CFG3 bits */ +#define DP83869_CFG3_PORT_MIRROR_EN BIT(0) + +/* CFG4 bits */ +#define DP83869_INT_OE BIT(7) + +/* OP MODE */ +#define DP83869_OP_MODE_MII BIT(5) +#define DP83869_SGMII_RGMII_BRIDGE BIT(6)
Quoted 9 lines
drivers/net/phy/dp83869.c line 114
Quoted 6 lines
drivers/net/phy/dp83869.c new file +6
-0+ +enum { +DP83869_PORT_MIRRORING_KEEP , +DP83869_PORT_MIRRORING_EN , +DP83869_PORT_MIRRORING_DIS , +};We have met with this in the kernel. Greg was asking us to write exact value to all enum entries.
Hmm. Can you give me a reference?? I am not doubting you but I would like to read that guidance.
That reference will help with an debate I am having in the kernel.
Quoted 15 lines
drivers/net/phy/dp83869.c line 124
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ +struct dp83869_private { +int tx_fifo_depth; +int rx_fifo_depth; +int io_impedance; +int port_mirroring; +bool rxctrl_strap_quirk; +int clk_output_sel; +int mode; +};I would prefer kernel-doc format to make reading easier. Also
tx_fifo_depthdoesn't look like signed type. I would make them unsigned.
Quoted 11 lines
drivers/net/phy/dp83869.c line 134
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ +static int dp83869_config_port_mirroring (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; + +if (dp83869->port_mirroring ==DP83869_PORT_MIRRORING_EN ) +return phy_set_bits_mmd (phydev,DP83869_DEVADDR , +DP83869_GEN_CFG3 , +DP83869_CFG3_PORT_MIRROR_EN ); +else you can remove this else.
Ack
Quoted 23 lines
Quoted 11 lines
drivers/net/phy/dp83869.c new file +10
-0+return phy_clear_bits_mmd (phydev,DP83869_DEVADDR , +DP83869_GEN_CFG3 , +DP83869_CFG3_PORT_MIRROR_EN ); +} + +static int dp83869_set_strapped_mode (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +u16 val; +drivers/net/phy/dp83869.c line 154
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ val =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_STRAP_STS1 ); +if (val <0 ) +return val; + + dp83869->mode = val &DP83869_STRAP_OP_MODE_MASK ; + +return 0 ; +} + +#ifdef CONFIG_OF_MDIO Isn't there a way to remove these?
Quoted 2 lines
if (
IS_ENABLED(CONFIG_OF_MDIO))
...
I looked at the 83867 it uses #if defined(CONFIG_DM_ETH) so I can change this
Quoted 10 lines
drivers/net/phy/dp83869.c line 163
Quoted 9 lines
drivers/net/phy/dp83869.c new file +9
-0+static int dp83869_of_init (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +struct device *dev = &phydev->mdio.dev; +struct device_node *of_node = dev->of_node; +int ret; + +if (!of_node) +return -ENODEV ;didn't go deep to this but can this happen?
Does every device in the uBoot tree use the DT or do some still use board files?
Quoted 5 lines
drivers/net/phy/dp83869.c line 165
Quoted 3 lines
drivers/net/phy/dp83869.c new file +2
-0+ + dp83869->io_impedance = -EINVAL ;I would prefer to group it together. It means move this before dt reading.
Quoted 10 lines
drivers/net/phy/dp83869.c line 174
Quoted 9 lines
drivers/net/phy/dp83869.c new file +9
-0+ +/* Optional configuration */ + ret =of_property_read_u32 (of_node,"ti,clk-output-sel" , + &dp83869->clk_output_sel); +if (ret || dp83869->clk_output_sel >DP83869_CLK_O_SEL_REF_CLK ) + dp83869->clk_output_sel =DP83869_CLK_O_SEL_REF_CLK ; + + ret =of_property_read_u32 (of_node,"ti,op-mode" , &dp83869->mode); +if (ret ==0 ) {!ret
Ack
Quoted 15 lines
Quoted 15 lines
drivers/net/phy/dp83869.c new file +14
-0+if (dp83869->mode <DP83869_RGMII_COPPER_ETHERNET || + dp83869->mode >DP83869_SGMII_COPPER_ETHERNET ) +return -EINVAL ; + }else { + ret =dp83869_set_strapped_mode (phydev); +if (ret) +return ret; + } + +if (of_property_read_bool (of_node,"ti,max-output-impedance" )) + dp83869->io_impedance =DP83869_IO_MUX_CFG_IO_IMPEDANCE_MAX ; +else if (of_property_read_bool (of_node,"ti,min-output-impedance" )) + dp83869->io_impedance =DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN ; +
Quoted 8 lines
drivers/net/phy/dp83869.c line 195
Quoted 7 lines
drivers/net/phy/dp83869.c new file +7
-0+if (of_property_read_bool (of_node,"enet-phy-lane-swap" )) { + dp83869->port_mirroring =DP83869_PORT_MIRRORING_EN ; + }else { +/* If the lane swap is not in the DT then check the straps */ + ret =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_STRAP_STS1 ); +if (ret <0 ) +return ret;newline here please.
Ack
Quoted 62 lines
Quoted 62 lines
drivers/net/phy/dp83869.c new file +61
-0+if (ret &DP83869_STRAP_MIRROR_ENABLED ) + dp83869->port_mirroring =DP83869_PORT_MIRRORING_EN ; +else + dp83869->port_mirroring = DP83869_PORT_MIRRORING_DIS; + } + +if (of_property_read_u32 (of_node,"rx-fifo-depth" , + &dp83869->rx_fifo_depth)) + dp83869->rx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + +if (of_property_read_u32 (of_node,"tx-fifo-depth" , + &dp83869->tx_fifo_depth)) + dp83869->tx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + +return ret; +} +#else +static int dp83869_of_init (struct phy_device *phydev) +{ +return dp83869_set_strapped_mode (phydev); +} +#endif /* CONFIG_OF_MDIO */ + +static int dp83869_configure_rgmii (struct phy_device *phydev, +struct dp83869_private *dp83869) +{ +int ret =0 , val; + +if (phy_interface_is_rgmii (phydev)) { + val =phy_read (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL ); +if (val <0 ) +return val; + + val &= ~DP83869_PHYCR_FIFO_DEPTH_MASK ; + val |= (dp83869->tx_fifo_depth <<DP83869_TX_FIFO_SHIFT ); + val |= (dp83869->rx_fifo_depth <<DP83869_RX_FIFO_SHIFT ); + + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , val); +if (ret) +return ret; + } + +if (dp83869->io_impedance >=0 ) + ret =phy_set_bits_mmd (phydev,DP83869_DEVADDR , +DP83869_IO_MUX_CFG , + dp83869->io_impedance & +DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL ); +return ret; +} + +static int dp83869_config_aneg (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +int err; + +if (dp83869->mode ==DP83869_RGMII_1000_BASE ) { + err =phy_write (phydev,MDIO_DEVAD_NONE ,MII_ADVERTISE , +MII_DP83869_FIBER_ADVERTISE ); +if (err) +return err; +
Quoted 8 lines
drivers/net/phy/dp83869.c line 263
Quoted 7 lines
drivers/net/phy/dp83869.c new file +7
-0+ err =phy_write (phydev,MDIO_DEVAD_NONE ,DP83869_CTRL , +DP83869_SW_RESTART ); +if (err) +return err; + +return genphy_restart_aneg (phydev); + }else {you can remove this else.
Ack
Quoted 23 lines
Quoted 23 lines
drivers/net/phy/dp83869.c new file +22
-0+return genphy_config_aneg (phydev); + } +} + +static int dp83869_configure_mode (struct phy_device *phydev, +struct dp83869_private *dp83869) +{ +int phy_ctrl_val; +int ret; + +if (dp83869->mode <DP83869_RGMII_COPPER_ETHERNET || + dp83869->mode >DP83869_SGMII_COPPER_ETHERNET ) +return -EINVAL ; + +/* Below init sequence for each operational mode is defined in +* section 9.4.8 of the datasheet. +*/ + ret =phy_write_mmd (phydev,DP83869_DEVADDR ,DP83869_OP_MODE , + dp83869->mode); +if (ret) +return ret; +
Quoted 8 lines
drivers/net/phy/dp83869.c line 292
Quoted 7 lines
drivers/net/phy/dp83869.c new file +7
-0+ ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_BMCR ,MII_DP83869_BMCR_DEFAULT ); +if (ret) +return ret; + + phy_ctrl_val = (dp83869->rx_fifo_depth <<DP83869_RX_FIFO_SHIFT | + dp83869->tx_fifo_depth <<DP83869_TX_FIFO_SHIFT | +DP83869_PHY_CTRL_DEFAULT );() are useless.
Ack
Quoted 23 lines
Quoted 23 lines
drivers/net/phy/dp83869.c new file +22
-0+ +switch (dp83869->mode) { +case DP83869_RGMII_COPPER_ETHERNET : + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , + phy_ctrl_val); +if (ret) +return ret; + + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_CTRL1000 , +DP83869_CFG1_DEFAULT ); +if (ret) +return ret; + + ret =dp83869_configure_rgmii (phydev, dp83869); +if (ret) +return ret; +break ; +case DP83869_RGMII_SGMII_BRIDGE : + ret =phy_set_bits_mmd (phydev,DP83869_DEVADDR ,DP83869_OP_MODE , +DP83869_SGMII_RGMII_BRIDGE , +DP83869_SGMII_RGMII_BRIDGE ); +if (ret)
Quoted 8 lines
drivers/net/phy/dp83869.c line 321
Quoted 7 lines
drivers/net/phy/dp83869.c new file +7
-0+return ret; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR , +DP83869_FX_CTRL ,DP83869_FX_CTRL_DEFAULT ); +if (ret) +return ret; +nit: remove this newline - it is not consistent.
Ack
Quoted 27 lines
Quoted 27 lines
drivers/net/phy/dp83869.c new file +26
-0+break ; +case DP83869_1000M_MEDIA_CONVERT : + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , + phy_ctrl_val); +if (ret) +return ret; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR , +DP83869_FX_CTRL ,DP83869_FX_CTRL_DEFAULT ); +if (ret) +return ret; +break ; +case DP83869_100M_MEDIA_CONVERT : + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , + phy_ctrl_val); +if (ret) +return ret; +break ; +case DP83869_SGMII_COPPER_ETHERNET : + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_DP83869_PHYCTRL , + phy_ctrl_val); +if (ret) +return ret; + + ret =phy_write (phydev,MDIO_DEVAD_NONE ,MII_CTRL1000 ,DP83869_CFG1_DEFAULT ); +if (ret)
Quoted 8 lines
drivers/net/phy/dp83869.c line 321
Quoted 7 lines
drivers/net/phy/dp83869.c new file +7
-0+return ret; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR , +DP83869_FX_CTRL ,DP83869_FX_CTRL_DEFAULT ); +if (ret) +return ret; +ditto.
Ack
Quoted 6 lines
drivers/net/phy/dp83869.c line 357
Quoted 4 lines
drivers/net/phy/dp83869.c new file +3
-0+break ; +case DP83869_RGMII_100_BASE : +case DP83869_RGMII_1000_BASE :Does it mean that there is not need to anything to configure? Comment about it would be good.
I will add a comment as one of these is actually a fiber connection which I have not figured out how uBoot handles fiber connections yet.
Quoted 12 lines
Quoted 12 lines
drivers/net/phy/dp83869.c new file +11
-0+break ; +default : +return -EINVAL ; + } + +return ret; +} + +static int dp83869_phy_reset (struct phy_device *phydev) +{ +int ret;
Quoted 8 lines
drivers/net/phy/dp83869.c line 374
Quoted 6 lines
drivers/net/phy/dp83869.c new file +6
-0+ + ret =phy_write (phydev,MDIO_DEVAD_NONE ,DP83869_CTRL ,DP83869_SW_RESET ); +if (ret <0 ) +return ret; + +udelay (200 );comment about this delay would be necessary. Just explain where that 200us is coming from.
Ack.
Quoted 23 lines
Quoted 23 lines
drivers/net/phy/dp83869.c new file +22
-0+ +return 0 ; +} + +static int dp83869_config_init (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +int ret; + + ret =dp83869_phy_reset (phydev); +if (ret) +return ret; + + ret =dp83869_configure_mode (phydev, dp83869); +if (ret) +return ret; + +if (dp83869->port_mirroring !=DP83869_PORT_MIRRORING_KEEP ) +dp83869_config_port_mirroring (phydev); + +/* Clock output selection if muxing property is set */ +if (dp83869->clk_output_sel !=DP83869_CLK_O_SEL_REF_CLK )
Quoted 8 lines
drivers/net/phy/dp83869.c line 402
Quoted 6 lines
drivers/net/phy/dp83869.c new file +6
-0+ ret =phy_set_bits_mmd (phydev,DP83869_DEVADDR , +DP83869_IO_MUX_CFG , + dp83869->clk_output_sel << +DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT ); + +dp83869_config_aneg (phydev);You are not checking return value from this function.
Ack
Dan
RFC PATCH 3/3 net: phy: dp83869: Port the kernel driver
Quoted 31 lines · Dan Murphy
Michal
Quoted 15 lines · Michal Simek
Quoted 14 lines · Dan Murphy
Port the DP83869 kernel driver.
Signed-off-by Dan Murphy <[email protected]>---
? drivers/net/phy/Kconfig????????????? |?? 4 + ? drivers/net/phy/Makefile???????????? |?? 1 + ? drivers/net/phy/dp83869.c??????????? | 440 +++++++++++++++++++++++++++ ? drivers/net/phy/ti_phy_init.c??????? |?? 4 + ? drivers/net/phy/ti_phy_init.h??????? |?? 1 + ? include/dt-bindings/net/ti-dp83869.h |? 42 +++? 6 files changed, 492 insertions(+)
? create mode 100644drivers/net/phy/dp83869.c
? create mode 100644include/dt-bindings/net/ti-dp83869.hQuoted 12 lines
Quoted 10 lines
drivers/net/phy/Kconfig +0
-0@@ -252,6 +252,10 @@ config PHY_DP83867????? select
PHY_TI
????? bool "Texas Instruments Ethernet DP83867 PHY support" ? +configPHY_DP83869
+??? selectPHY_TI
+??? bool "Texas Instruments Ethernet DP83869 PHY support"isn't this a little bit short? I expect checkpatch should be reporting issue with it.
Quoted 1 line
Yes but I was following other config flags in this file.
Just no reason to follow bad examples. :-)
Quoted 28 lines
Quoted 19 lines
Quoted 19 lines
+
? configPHY_VITESSE
????? bool "Vitesse Ethernet PHYs support"
? diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index9c6d31718c00..f8797319154f100644drivers/net/phy/Makefile +0
-0@@ -27,6 +27,7 @@ obj-$(CONFIG_PHY_SMSC) += smsc.o? obj-$(CONFIG_PHY_TERANETICS) += teranetics.o
? obj-$(CONFIG_PHY_TI) += ti_phy_init.o
? obj-$(CONFIG_PHY_DP83867) += dp83867.o +obj-$(CONFIG_PHY_DP83869) += dp83869.o
? obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o
? obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o ? obj-$(CONFIG_PHY_VITESSE) += vitesse.odrivers/net/phy/dp83869.c new file +0
-0Quoted 8 lines
drivers/net/phy/dp83869.c line 3
Quoted 7 lines
index 000000000000..1eaaea20b37a
drivers/net/phy/dp83869.c new file +3
-0@@ -0,0 +1,440 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Driver for the Texas Instruments DP83869 PHY +* Copyright (C) 2019 Texas Instruments Inc. 2020?
Quoted 4 lines
This driver was developed in 2019 and added to the 5.4 kernel so not sure we should update the copyright when side porting.
At the very least I will need to add 2019-20
yup.
Quoted 116 lines
Quoted 107 lines
Quoted 107 lines
drivers/net/phy/dp83869.c new file +105
-0+*/ + +#include <common.h> +#include <phy.h> +#include <dm/devres.h> +#include <linux/compat.h> +#include <malloc.h> + +#include <dm.h> + +#include <dt-bindings/net/ti-dp83869.h> + +#include "ti_phy_init.h" + +#define DP83869_PHY_ID ??????? 0x2000a0f1 +#define DP83869_DEVADDR ??????? 0x1f + +#define MII_DP83869_PHYCTRL ??? 0x10 +#define MII_DP83869_MICR ??? 0x12 +#define MII_DP83869_ISR ??????? 0x13 +#define DP83869_CTRL ??????? 0x1f +#define DP83869_CFG4 ??????? 0x1e + +/* Extended Registers */ +#define DP83869_GEN_CFG3 ??????? 0x0031 +#define DP83869_RGMIICTL ??? 0x0032 +#define DP83869_STRAP_STS1 ??? 0x006e +#define DP83869_RGMIIDCTL ??? 0x0086 +#define DP83869_IO_MUX_CFG ??? 0x0170 +#define DP83869_OP_MODE ??????? 0x01df +#define DP83869_FX_CTRL ??????? 0x0c00 + +#define DP83869_SW_RESET ??? BIT(15) +#define DP83869_SW_RESTART ??? BIT(14) + +/* MICR Interrupt bits */ +#define MII_DP83869_MICR_AN_ERR_INT_EN ??????? BIT(15) +#define MII_DP83869_MICR_SPEED_CHNG_INT_EN ??? BIT(14) +#define MII_DP83869_MICR_DUP_MODE_CHNG_INT_EN ??? BIT(13) +#define MII_DP83869_MICR_PAGE_RXD_INT_EN ??? BIT(12) +#define MII_DP83869_MICR_AUTONEG_COMP_INT_EN ??? BIT(11) +#define MII_DP83869_MICR_LINK_STS_CHNG_INT_EN ??? BIT(10) +#define MII_DP83869_MICR_FALSE_CARRIER_INT_EN ??? BIT(8) +#define MII_DP83869_MICR_SLEEP_MODE_CHNG_INT_EN ??? BIT(4) +#define MII_DP83869_MICR_WOL_INT_EN ??????? BIT(3) +#define MII_DP83869_MICR_XGMII_ERR_INT_EN ??? BIT(2) +#define MII_DP83869_MICR_POL_CHNG_INT_EN ??? BIT(1) +#define MII_DP83869_MICR_JABBER_INT_EN ??????? BIT(0) + +#define MII_DP83869_BMCR_DEFAULT ??? (BMCR_ANENABLE | \ +???????????????????? BMCR_FULLDPLX | \ +???????????????????? BMCR_SPEED1000) + +#define MII_DP83869_FIBER_ADVERTISE ??? (ADVERTISE_CSMA | \ +???????????????????? ADVERTISE_1000XHALF | \ +???????????????????? ADVERTISE_1000XFULL | \ +???????????????????? ADVERTISE_1000XPAUSE | \ +???????????????????? ADVERTISE_1000XPSE_ASYM) + +/* This is the same bit mask as the BMCR so re-use the BMCR default */ +#define DP83869_FX_CTRL_DEFAULT ??? MII_DP83869_BMCR_DEFAULT + +/* CFG1 bits */ +#define DP83869_CFG1_DEFAULT ??? (ADVERTISE_1000HALF | \ +???????????????? ADVERTISE_1000FULL | \ +???????????????? CTL1000_AS_MASTER) + +/* RGMIICTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_EN ??????? BIT(1) +#define DP83869_RGMII_RX_CLK_DELAY_EN ??????? BIT(0) + +/* STRAP_STS1 bits */ +#define DP83869_STRAP_OP_MODE_MASK ??????? GENMASK(2, 0) +#define DP83869_STRAP_STS1_RESERVED ??????? BIT(11) +#define DP83869_STRAP_MIRROR_ENABLED ??????? BIT(12) + +/* PHYCTRL bits */ +#define DP83869_RX_FIFO_SHIFT ??? 12 +#define DP83869_TX_FIFO_SHIFT ??? 14 + +/* PHY_CTRL lower bytes 0x48 are declared as reserved */ +#define DP83869_PHY_CTRL_DEFAULT ??? 0x48 +#define DP83869_PHYCR_FIFO_DEPTH_MASK ??? GENMASK(15, 12) +#define DP83869_PHYCR_RESERVED_MASK ??? BIT(11) + +/* RGMIIDCTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_SHIFT ??? 4 + +/* IO_MUX_CFG bits */ +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL ??? 0x1f + +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MAX ??? 0x0 +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN ??? 0x1f +#define DP83869_IO_MUX_CFG_CLK_O_SEL_MASK ??? (0x1f << 8) +#define DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT ??? 8 + +/* CFG3 bits */ +#define DP83869_CFG3_PORT_MIRROR_EN ????????????? BIT(0) + +/* CFG4 bits */ +#define DP83869_INT_OE ??? BIT(7) + +/* OP MODE */ +#define DP83869_OP_MODE_MII ??????????? BIT(5) +#define DP83869_SGMII_RGMII_BRIDGE ??????? BIT(6)Quoted 9 lines
drivers/net/phy/dp83869.c line 114
Quoted 6 lines
drivers/net/phy/dp83869.c new file +6
-0+ +enum { +??? DP83869_PORT_MIRRORING_KEEP, +??? DP83869_PORT_MIRRORING_EN, +??? DP83869_PORT_MIRRORING_DIS, +};We have met with this in the kernel. Greg was asking us to write exact value to all enum entries.
Quoted 4 lines
Hmm. Can you give me a reference?? I am not doubting you but I would like to read that guidance.
That reference will help with an debate I am having in the kernel.
Take a look at this thread.
https://lore.kernel.org/linux-arm-kernel/20200318125003.GA2727094 at kroah.com/
<snip>
Quoted 8 lines
Quoted 6 lines
drivers/net/phy/dp83869.c line 116
Quoted 2 lines
drivers/net/phy/dp83869.c new file +2
-0+ +#ifdef CONFIG_OF_MDIO Isn't there a way to remove these?
if (
IS_ENABLED(CONFIG_OF_MDIO))
...I looked at the 83867 it uses #if
defined(CONFIG_DM_ETH)so I can change this
There are a lot of places which should be update/done better.
Quoted 11 lines
Quoted 10 lines
drivers/net/phy/dp83869.c line 125
Quoted 9 lines
drivers/net/phy/dp83869.c new file +9
-0+static int dp83869_of_init (struct phy_device *phydev) +{ +??? struct dp83869_private *dp83869 = phydev->priv; +??? struct device *dev = &phydev->mdio.dev; +??? struct device_node *of_node = dev->of_node; +??? int ret; + +??? if (!of_node) +??????? return -ENODEV;didn't go deep to this but can this happen?
Quoted 2 lines
Does every device in the uBoot tree use the DT or do some still use board files?
IIRC ethernet phys are not based on driver model that's why devices are not created for it and I am not quite sure if platdata are supported.
I think question is what way you use. If you use just OF_MDIO/DM_ETH then Kconfig should have dependencies. And if someone else want to run it without it (which is IMHO unlikely) then they can update the driver self.
Quoted 6 lines
Quoted 6 lines
drivers/net/phy/dp83869.c line 127
Quoted 3 lines
drivers/net/phy/dp83869.c new file +2
-0+ +??? dp83869->io_impedance = -EINVAL;I would prefer to group it together. It means move this before dt reading.
No reaction on this line that's why just commenting it that you spot it.
Thanks,
Michal
RFC PATCH 3/3 net: phy: dp83869: Port the kernel driver
Michal
Quoted 31 lines · Michal Simek
Quoted 30 lines · Dan Murphy
Michal
Quoted 27 lines · Michal Simek
Quoted 19 lines · Dan Murphy
Port the DP83869 kernel driver.
Signed-off-by Dan Murphy <[email protected]>---
? drivers/net/phy/Kconfig????????????? |?? 4 + ? drivers/net/phy/Makefile???????????? |?? 1 + ? drivers/net/phy/dp83869.c??????????? | 440 +++++++++++++++++++++++++++ ? drivers/net/phy/ti_phy_init.c??????? |?? 4 + ? drivers/net/phy/ti_phy_init.h??????? |?? 1 + ? include/dt-bindings/net/ti-dp83869.h |? 42 +++? 6 files changed, 492 insertions(+)
? create mode 100644drivers/net/phy/dp83869.c
? create mode 100644include/dt-bindings/net/ti-dp83869.hdrivers/net/phy/Kconfig +0
-0drivers/net/phy/Kconfig config PHY_DP83867 · line 256
Quoted 5 lines
drivers/net/phy/Kconfig +2
-0@@ -252,6 +252,10 @@ config PHY_DP83867 ????? select PHY_TI ????? bool "Texas Instruments Ethernet DP83867 PHY support" ? +config PHY_DP83869 +??? select PHY_TI +??? bool "Texas Instruments Ethernet DP83869 PHY support"isn't this a little bit short? I expect checkpatch should be reporting issue with it.
Quoted 2 lines
Quoted 1 line
Yes but I was following other config flags in this file.
Just no reason to follow bad examples. :-)
True.
I will update the examples for the TI PHYs.
Quoted 29 lines
Quoted 29 lines
Quoted 29 lines
Quoted 25 lines
drivers/net/phy/Kconfig +1
-0+ ? config PHY_VITESSE ????? bool "Vitesse Ethernet PHYs support" ? diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefileindex
9c6d31718c00..f8797319154f100644drivers/net/phy/Makefile +1
-0@@ -27,6 +27,7 @@ obj-$(CONFIG_PHY_SMSC) += smsc.o ? obj-$(CONFIG_PHY_TERANETICS) += teranetics.o ? obj-$(CONFIG_PHY_TI) += ti_phy_init.o ? obj-$(CONFIG_PHY_DP83867) += dp83867.o +obj-$(CONFIG_PHY_DP83869) += dp83869.o ? obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o ? obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o ? obj-$(CONFIG_PHY_VITESSE) += vitesse.odrivers/net/phy/dp83869.c new file +0
-0drivers/net/phy/dp83869.c line 3
Quoted 3 lines
drivers/net/phy/dp83869.c new file +3
-0@@ -0,0 +1,440 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Driver for the Texas Instruments DP83869 PHY +* Copyright (C) 2019 Texas Instruments Inc. 2020?
Quoted 5 lines
Quoted 4 lines
This driver was developed in 2019 and added to the 5.4 kernel so not sure we should update the copyright when side porting.
At the very least I will need to add 2019-20
yup.
Ack
Quoted 115 lines
Quoted 115 lines
Quoted 115 lines
Quoted 102 lines
drivers/net/phy/dp83869.c new file +101
-0+*/ + +#include <common.h> +#include <phy.h> +#include <dm/devres.h> +#include <linux/compat.h> +#include <malloc.h> + +#include <dm.h> + +#include <dt-bindings/net/ti-dp83869.h> + +#include "ti_phy_init.h" + +#define DP83869_PHY_ID ??????? 0x2000a0f1 +#define DP83869_DEVADDR ??????? 0x1f + +#define MII_DP83869_PHYCTRL ??? 0x10 +#define MII_DP83869_MICR ??? 0x12 +#define MII_DP83869_ISR ??????? 0x13 +#define DP83869_CTRL ??????? 0x1f +#define DP83869_CFG4 ??????? 0x1e + +/* Extended Registers */ +#define DP83869_GEN_CFG3 ??????? 0x0031 +#define DP83869_RGMIICTL ??? 0x0032 +#define DP83869_STRAP_STS1 ??? 0x006e +#define DP83869_RGMIIDCTL ??? 0x0086 +#define DP83869_IO_MUX_CFG ??? 0x0170 +#define DP83869_OP_MODE ??????? 0x01df +#define DP83869_FX_CTRL ??????? 0x0c00 + +#define DP83869_SW_RESET ??? BIT(15) +#define DP83869_SW_RESTART ??? BIT(14) + +/* MICR Interrupt bits */ +#define MII_DP83869_MICR_AN_ERR_INT_EN ??????? BIT(15) +#define MII_DP83869_MICR_SPEED_CHNG_INT_EN ??? BIT(14) +#define MII_DP83869_MICR_DUP_MODE_CHNG_INT_EN ??? BIT(13) +#define MII_DP83869_MICR_PAGE_RXD_INT_EN ??? BIT(12) +#define MII_DP83869_MICR_AUTONEG_COMP_INT_EN ??? BIT(11) +#define MII_DP83869_MICR_LINK_STS_CHNG_INT_EN ??? BIT(10) +#define MII_DP83869_MICR_FALSE_CARRIER_INT_EN ??? BIT(8) +#define MII_DP83869_MICR_SLEEP_MODE_CHNG_INT_EN ??? BIT(4) +#define MII_DP83869_MICR_WOL_INT_EN ??????? BIT(3) +#define MII_DP83869_MICR_XGMII_ERR_INT_EN ??? BIT(2) +#define MII_DP83869_MICR_POL_CHNG_INT_EN ??? BIT(1) +#define MII_DP83869_MICR_JABBER_INT_EN ??????? BIT(0) + +#define MII_DP83869_BMCR_DEFAULT ??? (BMCR_ANENABLE | \ +???????????????????? BMCR_FULLDPLX | \ +???????????????????? BMCR_SPEED1000) + +#define MII_DP83869_FIBER_ADVERTISE ??? (ADVERTISE_CSMA | \ +???????????????????? ADVERTISE_1000XHALF | \ +???????????????????? ADVERTISE_1000XFULL | \ +???????????????????? ADVERTISE_1000XPAUSE | \ +???????????????????? ADVERTISE_1000XPSE_ASYM) + +/* This is the same bit mask as the BMCR so re-use the BMCR default */ +#define DP83869_FX_CTRL_DEFAULT ??? MII_DP83869_BMCR_DEFAULT + +/* CFG1 bits */ +#define DP83869_CFG1_DEFAULT ??? (ADVERTISE_1000HALF | \ +???????????????? ADVERTISE_1000FULL | \ +???????????????? CTL1000_AS_MASTER) + +/* RGMIICTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_EN ??????? BIT(1) +#define DP83869_RGMII_RX_CLK_DELAY_EN ??????? BIT(0) + +/* STRAP_STS1 bits */ +#define DP83869_STRAP_OP_MODE_MASK ??????? GENMASK(2, 0) +#define DP83869_STRAP_STS1_RESERVED ??????? BIT(11) +#define DP83869_STRAP_MIRROR_ENABLED ??????? BIT(12) + +/* PHYCTRL bits */ +#define DP83869_RX_FIFO_SHIFT ??? 12 +#define DP83869_TX_FIFO_SHIFT ??? 14 + +/* PHY_CTRL lower bytes 0x48 are declared as reserved */ +#define DP83869_PHY_CTRL_DEFAULT ??? 0x48 +#define DP83869_PHYCR_FIFO_DEPTH_MASK ??? GENMASK(15, 12) +#define DP83869_PHYCR_RESERVED_MASK ??? BIT(11) + +/* RGMIIDCTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_SHIFT ??? 4 + +/* IO_MUX_CFG bits */ +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL ??? 0x1f + +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MAX ??? 0x0 +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN ??? 0x1f +#define DP83869_IO_MUX_CFG_CLK_O_SEL_MASK ??? (0x1f << 8) +#define DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT ??? 8 + +/* CFG3 bits */ +#define DP83869_CFG3_PORT_MIRROR_EN ????????????? BIT(0) + +/* CFG4 bits */ +#define DP83869_INT_OE ??? BIT(7)drivers/net/phy/dp83869.c line 114
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ +/* OP MODE */ +#define DP83869_OP_MODE_MII ??????????? BIT(5) +#define DP83869_SGMII_RGMII_BRIDGE ??????? BIT(6) + +enum { +??? DP83869_PORT_MIRRORING_KEEP, +??? DP83869_PORT_MIRRORING_EN, +??? DP83869_PORT_MIRRORING_DIS, +};We have met with this in the kernel. Greg was asking us to write exact value to all enum entries.
Quoted 6 lines
Quoted 4 lines
Hmm. Can you give me a reference?? I am not doubting you but I would like to read that guidance.
That reference will help with an debate I am having in the kernel.
Take a look at this thread.
https://lore.kernel.org/linux-arm-kernel/20200318125003.GA2727094 at kroah.com/
Thank you
Quoted 11 lines
<snip>
Quoted 8 lines
Quoted 6 lines
drivers/net/phy/dp83869.c
Quoted 2 lines
drivers/net/phy/dp83869.c new file +2
-0+ +#ifdef CONFIG_OF_MDIO Isn't there a way to remove these?
if (
IS_ENABLED(CONFIG_OF_MDIO))
...I looked at the 83867 it uses #if
defined(CONFIG_DM_ETH)so I can change thisThere are a lot of places which should be update/done better.
Are you inferring that this is not correct either?
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/net/phy/dp83869.c
Quoted 11 lines
drivers/net/phy/dp83869.c new file +9
-0+static int dp83869_of_init (struct phy_device *phydev) +{ +??? struct dp83869_private *dp83869 = phydev->priv; +??? struct device *dev = &phydev->mdio.dev; +??? struct device_node *of_node = dev->of_node; +??? int ret; + +??? if (!of_node) +??????? return -ENODEV;didn't go deep to this but can this happen?
Quoted 8 lines
Quoted 2 lines
Does every device in the uBoot tree use the DT or do some still use board files?
IIRC ethernet phys are not based on driver model that's why devices are not created for it and I am not quite sure if platdata are supported.
I think question is what way you use. If you use just OF_MDIO/DM_ETH then
Kconfigshould have dependencies. And if someone else want to run it without it (which is IMHO unlikely) then they can update the driver self.
Well technically some phys like this one may not need DT at all if strapped in hardware.
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
+
+???dp83869->io_impedance=-EINVAL;I would prefer to group it together. It means move this before dt reading.
No reaction on this line that's why just commenting it that you spot it.
I had to look at it in detail.? Not sure why this was set there. This should be removed
Dan
Quoted 5 lines
Thanks,
Michal
RFC PATCH 3/3 net: phy: dp83869: Port the kernel driver
Hi Dan
I am interested to see the mainline support for the DP83869 phy. Is there any progress on this patch or are there any blocker?
Am Di., 21. Apr. 2020 um 16:35 Uhr schrieb Dan Murphy <[email protected]>:
Quoted 258 lines
Michal
Quoted 31 lines · Michal Simek
Quoted 30 lines · Dan Murphy
Michal
Quoted 27 lines · Michal Simek
Quoted 19 lines · Dan Murphy
Port the DP83869 kernel driver.
Signed-off-by Dan Murphy <[email protected]>--- drivers/net/phy/Kconfig | 4 + drivers/net/phy/Makefile | 1 + drivers/net/phy/dp83869.c | 440 +++++++++++++++++++++++++++ drivers/net/phy/ti_phy_init.c | 4 + drivers/net/phy/ti_phy_init.h | 1 + include/dt-bindings/net/ti-dp83869.h | 42 +++ 6 files changed, 492 insertions(+)create mode 100644
drivers/net/phy/dp83869.ccreate mode 100644include/dt-bindings/net/ti-dp83869.hdrivers/net/phy/Kconfig +0
-0drivers/net/phy/Kconfig config PHY_DP83867 · line 256
Quoted 5 lines
drivers/net/phy/Kconfig +2
-0@@ -252,6 +252,10 @@ config PHY_DP83867 select PHY_TI bool "Texas Instruments Ethernet DP83867 PHY support" +config PHY_DP83869 + select PHY_TI + bool "Texas Instruments Ethernet DP83869 PHY support"isn't this a little bit short? I expect checkpatch should be reporting issue with it.
Quoted 2 lines
Quoted 1 line
Yes but I was following other config flags in this file.
Just no reason to follow bad examples. :-)
True.
I will update the examples for the TI PHYs.
Quoted 29 lines
Quoted 29 lines
Quoted 29 lines
Quoted 25 lines
drivers/net/phy/Kconfig +1
-0+ config PHY_VITESSE bool "Vitesse Ethernet PHYs support" diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefileindex
9c6d31718c00..f8797319154f100644drivers/net/phy/Makefile +1
-0@@ -27,6 +27,7 @@ obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o obj-$(CONFIG_PHY_TI) += ti_phy_init.o obj-$(CONFIG_PHY_DP83867) += dp83867.o +obj-$(CONFIG_PHY_DP83869) += dp83869.o obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o obj-$(CONFIG_PHY_VITESSE) += vitesse.odrivers/net/phy/dp83869.c new file +0
-0drivers/net/phy/dp83869.c line 3
Quoted 3 lines
drivers/net/phy/dp83869.c new file +3
-0@@ -0,0 +1,440 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Driver for the Texas Instruments DP83869 PHY +* Copyright (C) 2019 Texas Instruments Inc. 2020?
Quoted 5 lines
Quoted 4 lines
This driver was developed in 2019 and added to the 5.4 kernel so not sure we should update the copyright when side porting.
At the very least I will need to add 2019-20
yup.
Ack
Quoted 115 lines
Quoted 115 lines
Quoted 115 lines
Quoted 102 lines
drivers/net/phy/dp83869.c new file +101
-0+*/ + +#include <common.h> +#include <phy.h> +#include <dm/devres.h> +#include <linux/compat.h> +#include <malloc.h> + +#include <dm.h> + +#include <dt-bindings/net/ti-dp83869.h> + +#include "ti_phy_init.h" + +#define DP83869_PHY_ID 0x2000a0f1 +#define DP83869_DEVADDR 0x1f + +#define MII_DP83869_PHYCTRL 0x10 +#define MII_DP83869_MICR 0x12 +#define MII_DP83869_ISR 0x13 +#define DP83869_CTRL 0x1f +#define DP83869_CFG4 0x1e + +/* Extended Registers */ +#define DP83869_GEN_CFG3 0x0031 +#define DP83869_RGMIICTL 0x0032 +#define DP83869_STRAP_STS1 0x006e +#define DP83869_RGMIIDCTL 0x0086 +#define DP83869_IO_MUX_CFG 0x0170 +#define DP83869_OP_MODE 0x01df +#define DP83869_FX_CTRL 0x0c00 + +#define DP83869_SW_RESET BIT(15) +#define DP83869_SW_RESTART BIT(14) + +/* MICR Interrupt bits */ +#define MII_DP83869_MICR_AN_ERR_INT_EN BIT(15) +#define MII_DP83869_MICR_SPEED_CHNG_INT_EN BIT(14) +#define MII_DP83869_MICR_DUP_MODE_CHNG_INT_EN BIT(13) +#define MII_DP83869_MICR_PAGE_RXD_INT_EN BIT(12) +#define MII_DP83869_MICR_AUTONEG_COMP_INT_EN BIT(11) +#define MII_DP83869_MICR_LINK_STS_CHNG_INT_EN BIT(10) +#define MII_DP83869_MICR_FALSE_CARRIER_INT_EN BIT(8) +#define MII_DP83869_MICR_SLEEP_MODE_CHNG_INT_EN BIT(4) +#define MII_DP83869_MICR_WOL_INT_EN BIT(3) +#define MII_DP83869_MICR_XGMII_ERR_INT_EN BIT(2) +#define MII_DP83869_MICR_POL_CHNG_INT_EN BIT(1) +#define MII_DP83869_MICR_JABBER_INT_EN BIT(0) + +#define MII_DP83869_BMCR_DEFAULT (BMCR_ANENABLE | \ + BMCR_FULLDPLX | \ + BMCR_SPEED1000) + +#define MII_DP83869_FIBER_ADVERTISE (ADVERTISE_CSMA | \ + ADVERTISE_1000XHALF | \ + ADVERTISE_1000XFULL | \ + ADVERTISE_1000XPAUSE | \ + ADVERTISE_1000XPSE_ASYM) + +/* This is the same bit mask as the BMCR so re-use the BMCR default */ +#define DP83869_FX_CTRL_DEFAULT MII_DP83869_BMCR_DEFAULT + +/* CFG1 bits */ +#define DP83869_CFG1_DEFAULT (ADVERTISE_1000HALF | \ + ADVERTISE_1000FULL | \ + CTL1000_AS_MASTER) + +/* RGMIICTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_EN BIT(1) +#define DP83869_RGMII_RX_CLK_DELAY_EN BIT(0) + +/* STRAP_STS1 bits */ +#define DP83869_STRAP_OP_MODE_MASK GENMASK(2, 0) +#define DP83869_STRAP_STS1_RESERVED BIT(11) +#define DP83869_STRAP_MIRROR_ENABLED BIT(12) + +/* PHYCTRL bits */ +#define DP83869_RX_FIFO_SHIFT 12 +#define DP83869_TX_FIFO_SHIFT 14 + +/* PHY_CTRL lower bytes 0x48 are declared as reserved */ +#define DP83869_PHY_CTRL_DEFAULT 0x48 +#define DP83869_PHYCR_FIFO_DEPTH_MASK GENMASK(15, 12) +#define DP83869_PHYCR_RESERVED_MASK BIT(11) + +/* RGMIIDCTL bits */ +#define DP83869_RGMII_TX_CLK_DELAY_SHIFT 4 + +/* IO_MUX_CFG bits */ +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL 0x1f + +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MAX 0x0 +#define DP83869_IO_MUX_CFG_IO_IMPEDANCE_MIN 0x1f +#define DP83869_IO_MUX_CFG_CLK_O_SEL_MASK (0x1f << 8) +#define DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT 8 + +/* CFG3 bits */ +#define DP83869_CFG3_PORT_MIRROR_EN BIT(0) + +/* CFG4 bits */ +#define DP83869_INT_OE BIT(7)drivers/net/phy/dp83869.c line 114
Quoted 10 lines
drivers/net/phy/dp83869.c new file +10
-0+ +/* OP MODE */ +#define DP83869_OP_MODE_MII BIT(5) +#define DP83869_SGMII_RGMII_BRIDGE BIT(6) + +enum { +DP83869_PORT_MIRRORING_KEEP , +DP83869_PORT_MIRRORING_EN , +DP83869_PORT_MIRRORING_DIS , +};We have met with this in the kernel. Greg was asking us to write exact value to all enum entries.
Quoted 6 lines
Quoted 4 lines
Hmm. Can you give me a reference? I am not doubting you but I would like to read that guidance.
That reference will help with an debate I am having in the kernel.
Take a look at this thread.
https://lore.kernel.org/linux-arm-kernel/20200318125003.GA2727094 at kroah.com/Thank you
Quoted 11 lines
<snip>
Quoted 8 lines
Quoted 6 lines
drivers/net/phy/dp83869.c
Quoted 2 lines
drivers/net/phy/dp83869.c new file +2
-0+ +#ifdef CONFIG_OF_MDIO Isn't there a way to remove these?
if (
IS_ENABLED(CONFIG_OF_MDIO))
...I looked at the 83867 it uses #if
defined(CONFIG_DM_ETH)so I can change thisThere are a lot of places which should be update/done better.
Are you inferring that this is not correct either?
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/net/phy/dp83869.c line 163
Quoted 11 lines
drivers/net/phy/dp83869.c new file +9
-0+static int dp83869_of_init (struct phy_device *phydev) +{ +struct dp83869_private *dp83869 = phydev->priv; +struct device *dev = &phydev->mdio.dev; +struct device_node *of_node = dev->of_node; +int ret; + +if (!of_node) +return -ENODEV ;didn't go deep to this but can this happen?
Quoted 8 lines
Quoted 2 lines
Does every device in the uBoot tree use the DT or do some still use board files?
IIRC ethernet phys are not based on driver model that's why devices are not created for it and I am not quite sure if platdata are supported.
I think question is what way you use. If you use just OF_MDIO/DM_ETH then
Kconfigshould have dependencies. And if someone else want to run it without it (which is IMHO unlikely) then they can update the driver self.Well technically some phys like this one may not need DT at all if strapped in hardware.
Quoted 6 lines
Quoted 5 lines
Quoted 5 lines
drivers/net/phy/dp83869.c
Quoted 2 lines
drivers/net/phy/dp83869.c new file +2
-0+ + dp83869->io_impedance = -EINVAL ;I would prefer to group it together. It means move this before dt reading.
No reaction on this line that's why just commenting it that you spot it.
I had to look at it in detail. Not sure why this was set there. This should be removed
Dan
Quoted 5 lines
Thanks,
Michal
Signature · 5 lines
greets -- Christian Gmeiner, MSc https://christian-gmeiner.info/privacypolicy
RFC PATCH 1/3 net: phy: Add a generic phy file for TI generic PHYs
In reply to Dan MurphyQuoted 6 lines · Dan Murphy
Add a TI Generic init file that will initialize TI PHYs that follow that not require special handling. These PHYs can connect with the standard MII register set. This generice file will register the PHY IDs and names of the PHYs so when the command 'mdio list' is executed the PHY name will display as opposed to 'Generic PHY'.
Quoted 7 lines
The DP8382X PHY series is a generic PHY that requires the generic registration.
The DP83867 driver was updated to rename the init to a more PHY specific init call.
Signed-off-by Dan Murphy <[email protected]>
I would personally do it with two patches.
Quoted 25 lines
--- configs/am65x_evm_a53_defconfig | 2 +- configs/am65x_hs_evm_a53_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/dra7xx_hs_evm_usb_defconfig | 2 +- configs/j721e_evm_a72_defconfig | 2 +- configs/j721e_hs_evm_a72_defconfig | 2 +- configs/k2g_evm_defconfig | 2 +- configs/xilinx_versal_virt_defconfig | 2 +- configs/xilinx_zynqmp_virt_defconfig | 2 +- drivers/net/phy/Kconfig | 8 ++ drivers/net/phy/Makefile | 3 +- drivers/net/phy/dp83867.c | 3 +- drivers/net/phy/ti_phy_init.c | 106 +++++++++++++++++++++++++++ drivers/net/phy/ti_phy_init.h | 16 ++++ 15 files changed, 144 insertions(+), 12 deletions(-) create mode 100644 drivers/net/phy/ti_phy_init.c create mode 100644 drivers/net/phy/ti_phy_init.hconfigs/am65x_evm_a53_defconfig +0
-0
configs/am65x_evm_a53_defconfig CONFIG_SPI_FLASH_SFDP_SUPPORT · line 104
Quoted 5 lines
configs/am65x_evm_a53_defconfig +1
-1@@ -101,7 +101,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y
Don't know why this name was chosen but don't you want to label it with TI?
CONFIG_PHY_TI_DP83867 ?
Kernel is using different symbol anyway.CONFIG_DP83867_PHY
Quoted 180 lines
configs/am65x_evm_a53_defconfig +0
-0CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_E1000=yconfigs/am65x_hs_evm_a53_defconfig +1
-1@@ -103,7 +103,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_E1000=yconfigs/dra7xx_evm_defconfig +1
-1@@ -86,7 +86,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=yconfigs/dra7xx_hs_evm_defconfig +1
-1@@ -89,7 +89,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=yconfigs/dra7xx_hs_evm_usb_defconfig +1
-1@@ -87,7 +87,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=yconfigs/j721e_evm_a72_defconfig +1
-1@@ -124,7 +124,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=yconfigs/j721e_hs_evm_a72_defconfig +1
-1@@ -114,7 +114,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=yconfigs/k2g_evm_defconfig +1
-1@@ -58,7 +58,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MARVELL=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_KEYSTONE_NET=yconfigs/xilinx_versal_virt_defconfig +1
-1@@ -61,7 +61,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHY_MARVELL=y CONFIG_PHY_NATSEMI=y CONFIG_PHY_REALTEK=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_VITESSE=y CONFIG_PHY_FIXED=y CONFIG_PHY_GIGE=yconfigs/xilinx_zynqmp_virt_defconfig +1
-1@@ -101,7 +101,7 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_PHY_NATSEMI=y CONFIG_PHY_REALTEK=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_VITESSE=y CONFIG_PHY_XILINX_GMII2RGMII=y CONFIG_PHY_FIXED=ydrivers/net/phy/Kconfig +8
-0@@ -244,6 +244,14 @@ config PHY_TERANETICS config PHY_TI bool "Texas Instruments Ethernet PHYs support" +config PHY_TI_GENERIC + select PHY_TI + bool "Texas Instruments Ethernet PHYs support" + +config PHY_DP83867 + select PHY_TI + bool "Texas Instruments Ethernet DP83867 PHY support" + config PHY_VITESSE bool "Vitesse Ethernet PHYs support"drivers/net/phy/Makefile +2
-1@@ -25,7 +25,8 @@ obj-$(CONFIG_PHY_NATSEMI) += natsemi.o obj-$(CONFIG_PHY_REALTEK) += realtek.o obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o -obj-$(CONFIG_PHY_TI) += dp83867.o +obj-$(CONFIG_PHY_TI) += ti_phy_init.o +obj-$(CONFIG_PHY_DP83867) += dp83867.o obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o obj-$(CONFIG_PHY_VITESSE) += vitesse.odrivers/net/phy/dp83867.c +2
-1@@ -12,6 +12,7 @@#include <dm.h> #include <dt-bindings/net/ti-dp83867.h> +#include "ti_phy_init.h" /* TI DP83867 */ #define DP83867_DEVADDR 0x1f@@ -428,7 +429,7 @@ static struct phy_driver DP83867_driver = { .shutdown = &genphy_shutdown, }; -int phy_ti_init (void ) +int phy_dp83867_init (void ) {phy_register (&DP83867_driver);return 0 ;drivers/net/phy/ti_phy_init.c new file +0
-0
drivers/net/phy/ti_phy_init.c line 7
Quoted 7 lines
drivers/net/phy/ti_phy_init.c new file +7
-0@@ -0,0 +1,106 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* TI Generic PHY Init to register all TI Ethernet PHYs +* +* Author: Dan Murphy <[email protected]> +* +* Copyright (C) 2019 Texas Instruments Inc.
2020?
Quoted 86 lines
drivers/net/phy/ti_phy_init.c new file +86
-0+*/ + +#include <phy.h> + +#define DP83822_PHY_ID 0x2000a240 +#define DP83825S_PHY_ID 0x2000a140 +#define DP83825I_PHY_ID 0x2000a150 +#define DP83825CM_PHY_ID 0x2000a160 +#define DP83825CS_PHY_ID 0x2000a170 +#define DP83826C_PHY_ID 0x2000a130 +#define DP83826NC_PHY_ID 0x2000a110 + +static struct phy_driver dp83822_driver = { + .name ="TI DP83822" , + .uid =DP83822_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83825s_driver = { + .name ="TI DP83825S" , + .uid =DP83825S_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83825i_driver = { + .name ="TI DP83825I" , + .uid =DP83825I_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83825m_driver = { + .name ="TI DP83825M" , + .uid =DP83825CM_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83825cs_driver = { + .name ="TI DP83825CS" , + .uid =DP83825CS_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83826c_driver = { + .name ="TI DP83826C" , + .uid =DP83826C_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; +static struct phy_driver dp83826nc_driver = { + .name ="TI DP83826NC" , + .uid =DP83826NC_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +int phy_ti_init (void ) +{ +#ifdef CONFIG_PHY_DP83867 +phy_dp83867_init (); +#endif
drivers/net/phy/ti_phy_init.c line 103
Quoted 10 lines
drivers/net/phy/ti_phy_init.c new file +10
-0+ +#ifdef CONFIG_PHY_TI_GENERIC +phy_register (&dp83822_driver); +phy_register (&dp83825s_driver); +phy_register (&dp83825i_driver); +phy_register (&dp83825m_driver); +phy_register (&dp83825cs_driver); +phy_register (&dp83826c_driver); +phy_register (&dp83826nc_driver); +#endif
I would do it in separate patch but up2you.
Quoted 9 lines
drivers/net/phy/ti_phy_init.c new file +3
-0+ +return 0 ; +}drivers/net/phy/ti_phy_init.h new file +0
-0
drivers/net/phy/ti_phy_init.h line 8
Quoted 8 lines
drivers/net/phy/ti_phy_init.h new file +8
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* TI Generic Ethernet PHY +* Based on code in sungem_phy.c and (long-removed) gianfar_phy.c +* +* Author: Dan Murphy <[email protected]> +* +* Copyright (C) 2019 Texas Instruments Inc.
2020
drivers/net/phy/ti_phy_init.h line 16
Quoted 9 lines
drivers/net/phy/ti_phy_init.h new file +8
-0+*/ + +#ifndef _TI_GEN_PHY_H +#define _TI_GEN_PHY_H + +int phy_dp83867_init (void ); + +#endif /* _TI_GEN_PHY_H */
Thanks,
Michal
RFC PATCH 1/3 net: phy: Add a generic phy file for TI generic PHYs
Michal
Quoted 7 lines · Michal Simek
Quoted 6 lines · Dan Murphy
Add a TI Generic init file that will initialize TI PHYs that follow that not require special handling. These PHYs can connect with the standard MII register set. This generice file will register the PHY IDs and names of the PHYs so when the command 'mdio list' is executed the PHY name will display as opposed to 'Generic PHY'.
Quoted 8 lines
Quoted 7 lines
The DP8382X PHY series is a generic PHY that requires the generic registration.
The DP83867 driver was updated to rename the init to a more PHY specific init call.
Signed-off-by Dan Murphy <[email protected]>I would personally do it with two patches.
I was going to do 2 patches but I wanted to show the viability of why this generic file was needed.? Without the DP8382X PHY added it looks like I was just moving things around for the DP83867 and changing names.
I will break it up in v2 (non-RFC if no one has serious objections to this)
Quoted 33 lines
Quoted 26 lines
--- configs/am65x_evm_a53_defconfig | 2 +- configs/am65x_hs_evm_a53_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/dra7xx_hs_evm_usb_defconfig | 2 +- configs/j721e_evm_a72_defconfig | 2 +- configs/j721e_hs_evm_a72_defconfig | 2 +- configs/k2g_evm_defconfig | 2 +- configs/xilinx_versal_virt_defconfig | 2 +- configs/xilinx_zynqmp_virt_defconfig | 2 +- drivers/net/phy/Kconfig | 8 ++ drivers/net/phy/Makefile | 3 +- drivers/net/phy/dp83867.c | 3 +- drivers/net/phy/ti_phy_init.c | 106 +++++++++++++++++++++++++++ drivers/net/phy/ti_phy_init.h | 16 ++++ 15 files changed, 144 insertions(+), 12 deletions(-)create mode 100644
drivers/net/phy/ti_phy_init.ccreate mode 100644drivers/net/phy/ti_phy_init.hconfigs/am65x_evm_a53_defconfig +0
-0configs/am65x_evm_a53_defconfig CONFIG_SPI_FLASH_SFDP_SUPPORT · line 104
Quoted 5 lines
configs/am65x_evm_a53_defconfig +1
-1@@ -101,7 +101,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=yDon't know why this name was chosen but don't you want to label it with TI?
Quoted 5 lines
CONFIG_PHY_TI_DP83867?Kernel is using different symbol anyway.
CONFIG_DP83867_PHY
ACK.? I will make it CONFIG_PHY_TI_DP83867.? That follows the Kconfig uBoot standard for PHYs
Quoted 181 lines
Quoted 181 lines
configs/am65x_evm_a53_defconfig +0
-0CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_E1000=yconfigs/am65x_hs_evm_a53_defconfig +1
-1@@ -103,7 +103,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_E1000=yconfigs/dra7xx_evm_defconfig +1
-1@@ -86,7 +86,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=yconfigs/dra7xx_hs_evm_defconfig +1
-1@@ -89,7 +89,7 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=yconfigs/dra7xx_hs_evm_usb_defconfig +1
-1@@ -87,7 +87,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SF_DEFAULT_SPEED=76800000 CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=yconfigs/j721e_evm_a72_defconfig +1
-1@@ -124,7 +124,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=yconfigs/j721e_hs_evm_a72_defconfig +1
-1@@ -114,7 +114,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT CONFIG_SPI_FLASH_STMICRO=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=yconfigs/k2g_evm_defconfig +1
-1@@ -58,7 +58,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MARVELL=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_KEYSTONE_NET=yconfigs/xilinx_versal_virt_defconfig +1
-1@@ -61,7 +61,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHY_MARVELL=y CONFIG_PHY_NATSEMI=y CONFIG_PHY_REALTEK=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_VITESSE=y CONFIG_PHY_FIXED=y CONFIG_PHY_GIGE=yconfigs/xilinx_zynqmp_virt_defconfig +1
-1@@ -101,7 +101,7 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_PHY_NATSEMI=y CONFIG_PHY_REALTEK=y -CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=y CONFIG_PHY_VITESSE=y CONFIG_PHY_XILINX_GMII2RGMII=y CONFIG_PHY_FIXED=ydrivers/net/phy/Kconfig +8
-0@@ -244,6 +244,14 @@ config PHY_TERANETICS config PHY_TI bool "Texas Instruments Ethernet PHYs support" +config PHY_TI_GENERIC + select PHY_TI + bool "Texas Instruments Ethernet PHYs support" + +config PHY_DP83867 + select PHY_TI + bool "Texas Instruments Ethernet DP83867 PHY support" + config PHY_VITESSE bool "Vitesse Ethernet PHYs support"drivers/net/phy/Makefile +2
-1@@ -25,7 +25,8 @@ obj-$(CONFIG_PHY_NATSEMI) += natsemi.o obj-$(CONFIG_PHY_REALTEK) += realtek.o obj-$(CONFIG_PHY_SMSC) += smsc.o obj-$(CONFIG_PHY_TERANETICS) += teranetics.o -obj-$(CONFIG_PHY_TI) += dp83867.o +obj-$(CONFIG_PHY_TI) += ti_phy_init.o +obj-$(CONFIG_PHY_DP83867) += dp83867.o obj-$(CONFIG_PHY_XILINX) += xilinx_phy.o obj-$(CONFIG_PHY_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o obj-$(CONFIG_PHY_VITESSE) += vitesse.odrivers/net/phy/dp83867.c +2
-1@@ -12,6 +12,7 @@#include <dm.h> #include <dt-bindings/net/ti-dp83867.h> +#include "ti_phy_init.h" /* TI DP83867 */ #define DP83867_DEVADDR 0x1f@@ -428,7 +429,7 @@ static struct phy_driver DP83867_driver = { .shutdown = &genphy_shutdown, }; -int phy_ti_init (void ) +int phy_dp83867_init (void ) {phy_register (&DP83867_driver);return 0 ;drivers/net/phy/ti_phy_init.c new file +0
-0@@ -0,0 +1,106 @@
Quoted 8 lines
drivers/net/phy/ti_phy_init.c line 7
Quoted 7 lines
drivers/net/phy/ti_phy_init.c new file +7
-0+// SPDX-License-Identifier: GPL-2.0 +/* +* TI Generic PHY Init to register all TI Ethernet PHYs +* +* Author: Dan Murphy <[email protected]> +* +* Copyright (C) 2019 Texas Instruments Inc. 2020?
Ack.? I actually started this last year but had to put it aside
Quoted 90 lines
Quoted 90 lines
drivers/net/phy/ti_phy_init.c new file +89
-0+*/ + +#include <phy.h> + +#define DP83822_PHY_ID 0x2000a240 +#define DP83825S_PHY_ID 0x2000a140 +#define DP83825I_PHY_ID 0x2000a150 +#define DP83825CM_PHY_ID 0x2000a160 +#define DP83825CS_PHY_ID 0x2000a170 +#define DP83826C_PHY_ID 0x2000a130 +#define DP83826NC_PHY_ID 0x2000a110 + +static struct phy_driver dp83822_driver = { + .name ="TI DP83822" , + .uid =DP83822_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83825s_driver = { + .name ="TI DP83825S" , + .uid =DP83825S_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83825i_driver = { + .name ="TI DP83825I" , + .uid =DP83825I_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83825m_driver = { + .name ="TI DP83825M" , + .uid =DP83825CM_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83825cs_driver = { + .name ="TI DP83825CS" , + .uid =DP83825CS_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +static struct phy_driver dp83826c_driver = { + .name ="TI DP83826C" , + .uid =DP83826C_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; +static struct phy_driver dp83826nc_driver = { + .name ="TI DP83826NC" , + .uid =DP83826NC_PHY_ID , + .mask =0xfffffff0 , + .features =PHY_BASIC_FEATURES , + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + +int phy_ti_init (void ) +{ +#ifdef CONFIG_PHY_DP83867 +phy_dp83867_init (); +#endif + +#ifdef CONFIG_PHY_TI_GENERIC +phy_register (&dp83822_driver);
Quoted 8 lines
drivers/net/phy/ti_phy_init.c line 103
Quoted 7 lines
drivers/net/phy/ti_phy_init.c new file +7
-0+phy_register (&dp83825s_driver); +phy_register (&dp83825i_driver); +phy_register (&dp83825m_driver); +phy_register (&dp83825cs_driver); +phy_register (&dp83826c_driver); +phy_register (&dp83826nc_driver); +#endif I would do it in separate patch but up2you.
Same reply as above
Quoted 11 lines
Quoted 11 lines
drivers/net/phy/ti_phy_init.c new file +3
-0+ +return 0 ; +}drivers/net/phy/ti_phy_init.h new file +1
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */
Quoted 8 lines
drivers/net/phy/ti_phy_init.h line 8
Quoted 7 lines
drivers/net/phy/ti_phy_init.h new file +7
-0+/* +* TI Generic Ethernet PHY +* Based on code in sungem_phy.c and (long-removed) gianfar_phy.c +* +* Author: Dan Murphy <[email protected]> +* +* Copyright (C) 2019 Texas Instruments Inc. 2020
Same reply as above
Dan
RFC PATCH 1/3 net: phy: Add a generic phy file for TI generic PHYs
Quoted 56 lines · Dan Murphy
Michal
Quoted 7 lines · Michal Simek
Quoted 6 lines · Dan Murphy
Add a TI Generic init file that will initialize TI PHYs that follow that not require special handling.? These PHYs can connect with the standard MII register set.? This generice file will register the PHY IDs and names of the PHYs so when the command 'mdio list' is executed the PHY name will display as opposed to 'Generic PHY'.
Quoted 8 lines
Quoted 7 lines
The DP8382X PHY series is a generic PHY that requires the generic registration.
The DP83867 driver was updated to rename the init to a more PHY specific init call.
Signed-off-by Dan Murphy <[email protected]>I would personally do it with two patches.
I was going to do 2 patches but I wanted to show the viability of why this generic file was needed.? Without the DP8382X PHY added it looks like I was just moving things around for the DP83867 and changing names.
I will break it up in v2 (non-RFC if no one has serious objections to this)
Quoted 33 lines
Quoted 29 lines
---
? configs/am65x_evm_a53_defconfig????? |?? 2 +- ? configs/am65x_hs_evm_a53_defconfig?? |?? 2 +- ? configs/dra7xx_evm_defconfig???????? |?? 2 +- ? configs/dra7xx_hs_evm_defconfig????? |?? 2 +- ? configs/dra7xx_hs_evm_usb_defconfig? |?? 2 +- ? configs/j721e_evm_a72_defconfig????? |?? 2 +- ? configs/j721e_hs_evm_a72_defconfig?? |?? 2 +- ? configs/k2g_evm_defconfig??????????? |?? 2 +- ? configs/xilinx_versal_virt_defconfig |?? 2 +- ? configs/xilinx_zynqmp_virt_defconfig |?? 2 +- ? drivers/net/phy/Kconfig????????????? |?? 8 ++ ? drivers/net/phy/Makefile???????????? |?? 3 +- ? drivers/net/phy/dp83867.c??????????? |?? 3 +- ? drivers/net/phy/ti_phy_init.c??????? | 106 +++++++++++++++++++++++++++ ? drivers/net/phy/ti_phy_init.h??????? |? 16 ++++? 15 files changed, 144 insertions(+), 12 deletions(-) ? create mode 100644
drivers/net/phy/ti_phy_init.c? create mode 100644drivers/net/phy/ti_phy_init.hconfigs/am65x_evm_a53_defconfig +0
-0@@ -101,7 +101,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT?
CONFIG_SPI_FLASH_STMICRO=y
? #CONFIG_SPI_FLASH_USE_4K_SECTORSis not set
?CONFIG_SPI_FLASH_MTD=yconfigs/am65x_evm_a53_defconfig
Quoted 2 lines
configs/am65x_evm_a53_defconfig +1
-1-CONFIG_PHY_TI=y +CONFIG_PHY_DP83867=yDon't know why this name was chosen but don't you want to label it with TI?
Quoted 6 lines
Quoted 5 lines
CONFIG_PHY_TI_DP83867?Kernel is using different symbol anyway.
CONFIG_DP83867_PHYACK.? I will make it
CONFIG_PHY_TI_DP83867.? That follows theKconfiguBoot standard for PHYs
yep. It definitely has to be split
Cover?
Signature · 2 lines
Best regards, grygorii