* [PATCH] net: phy: broadcom: add support for BCM54210E
@ 2017-01-27 10:47 Rafał Miłecki
2017-01-27 12:50 ` kbuild test robot
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Rafał Miłecki @ 2017-01-27 10:47 UTC (permalink / raw)
To: David S . Miller, Florian Fainelli
Cc: Xo Wang, Joel Stanley, Jon Mason, Jaedon Shin, netdev,
Rafał Miłecki
From: Rafał Miłecki <rafal@milecki.pl>
It's Broadcom PHY simply described as single-port
RGMII 10/100/1000BASE-T PHY. It requires disabling delay skew and GTXCLK
bits.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
drivers/net/phy/broadcom.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 97d1c057c0a1..794b9ec81ba5 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -30,6 +30,22 @@ MODULE_DESCRIPTION("Broadcom PHY driver");
MODULE_AUTHOR("Maciej W. Rozycki");
MODULE_LICENSE("GPL");
+static int bcm54210e_config_init(struct phy_device *phydev)
+{
+ int val;
+
+ val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
+ val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN;
+ val |= MII_BCM54XX_AUXCTL_MISC_WREN;
+ bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, val);
+
+ val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
+ val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
+ bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
+
+ return 0;
+}
+
static int bcm54810_config(struct phy_device *phydev)
{
int rc, val;
@@ -230,7 +246,11 @@ static int bcm54xx_config_init(struct phy_device *phydev)
(phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE))
bcm54xx_adjust_rxrefclk(phydev);
- if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
+ if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
+ err = bcm54210e_config_init(phydev);
+ if (err)
+ return err;
+ } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
err = bcm54810_config(phydev);
if (err)
return err;
@@ -542,6 +562,17 @@ static struct phy_driver broadcom_drivers[] = {
.ack_interrupt = bcm_phy_ack_intr,
.config_intr = bcm_phy_config_intr,
}, {
+ .phy_id = PHY_ID_BCM54210E,
+ .phy_id_mask = 0xfffffff0,
+ .name = "Broadcom BCM54210E",
+ .features = PHY_GBIT_FEATURES,
+ .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+ .config_init = bcm54xx_config_init,
+ .config_aneg = genphy_config_aneg,
+ .read_status = genphy_read_status,
+ .ack_interrupt = bcm_phy_ack_intr,
+ .config_intr = bcm_phy_config_intr,
+}, {
.phy_id = PHY_ID_BCM5461,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5461",
@@ -680,6 +711,7 @@ module_phy_driver(broadcom_drivers);
static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
{ PHY_ID_BCM5411, 0xfffffff0 },
{ PHY_ID_BCM5421, 0xfffffff0 },
+ { PHY_ID_BCM54210E, 0xfffffff0 },
{ PHY_ID_BCM5461, 0xfffffff0 },
{ PHY_ID_BCM54612E, 0xfffffff0 },
{ PHY_ID_BCM54616S, 0xfffffff0 },
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] net: phy: broadcom: add support for BCM54210E
2017-01-27 10:47 [PATCH] net: phy: broadcom: add support for BCM54210E Rafał Miłecki
@ 2017-01-27 12:50 ` kbuild test robot
2017-01-27 13:07 ` [PATCH V2 net-next] " Rafał Miłecki
2017-01-27 13:37 ` [PATCH] " kbuild test robot
2 siblings, 0 replies; 8+ messages in thread
From: kbuild test robot @ 2017-01-27 12:50 UTC (permalink / raw)
To: Rafał Miłecki
Cc: kbuild-all, David S . Miller, Florian Fainelli, Xo Wang,
Joel Stanley, Jon Mason, Jaedon Shin, netdev,
Rafał Miłecki
[-- Attachment #1: Type: text/plain, Size: 3446 bytes --]
Hi Rafał,
[auto build test WARNING on net-next/master]
[also build test WARNING on v4.10-rc5 next-20170125]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Rafa-Mi-ecki/net-phy-broadcom-add-support-for-BCM54210E/20170127-190002
config: x86_64-randconfig-s5-01271950 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All warnings (new ones prefixed by >>):
In file included from include/linux/phy.h:19:0,
from drivers/net/phy/bcm-phy-lib.h:17,
from drivers/net/phy/broadcom.c:17:
drivers/net/phy/broadcom.c: In function 'bcm54xx_config_init':
drivers/net/phy/broadcom.c:249:32: error: 'PHY_ID_BCM54210E' undeclared (first use in this function)
if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
^
include/linux/compiler.h:149:30: note: in definition of macro '__trace_if'
if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
^~~~
>> drivers/net/phy/broadcom.c:249:2: note: in expansion of macro 'if'
if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
^~
drivers/net/phy/broadcom.c:249:32: note: each undeclared identifier is reported only once for each function it appears in
if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
^
include/linux/compiler.h:149:30: note: in definition of macro '__trace_if'
if (__builtin_constant_p(!!(cond)) ? !!(cond) : \
^~~~
>> drivers/net/phy/broadcom.c:249:2: note: in expansion of macro 'if'
if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
^~
drivers/net/phy/broadcom.c: At top level:
drivers/net/phy/broadcom.c:565:13: error: 'PHY_ID_BCM54210E' undeclared here (not in a function)
.phy_id = PHY_ID_BCM54210E,
^~~~~~~~~~~~~~~~
drivers/net/phy/broadcom.c:714:4: error: initializer element is not constant
{ PHY_ID_BCM54210E, 0xfffffff0 },
^~~~~~~~~~~~~~~~
drivers/net/phy/broadcom.c:714:4: note: (near initialization for 'broadcom_tbl[2].phy_id')
vim +/if +249 drivers/net/phy/broadcom.c
233 MII_BCM54XX_INT_SPEED |
234 MII_BCM54XX_INT_LINK);
235 err = phy_write(phydev, MII_BCM54XX_IMR, reg);
236 if (err < 0)
237 return err;
238
239 if ((BRCM_PHY_MODEL(phydev) == PHY_ID_BCM50610 ||
240 BRCM_PHY_MODEL(phydev) == PHY_ID_BCM50610M) &&
241 (phydev->dev_flags & PHY_BRCM_CLEAR_RGMII_MODE))
242 bcm_phy_write_shadow(phydev, BCM54XX_SHD_RGMII_MODE, 0);
243
244 if ((phydev->dev_flags & PHY_BRCM_RX_REFCLK_UNUSED) ||
245 (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY) ||
246 (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE))
247 bcm54xx_adjust_rxrefclk(phydev);
248
> 249 if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
250 err = bcm54210e_config_init(phydev);
251 if (err)
252 return err;
253 } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
254 err = bcm54810_config(phydev);
255 if (err)
256 return err;
257 }
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 32428 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V2 net-next] net: phy: broadcom: add support for BCM54210E
2017-01-27 10:47 [PATCH] net: phy: broadcom: add support for BCM54210E Rafał Miłecki
2017-01-27 12:50 ` kbuild test robot
@ 2017-01-27 13:07 ` Rafał Miłecki
2017-01-27 16:29 ` David Miller
2017-01-27 13:37 ` [PATCH] " kbuild test robot
2 siblings, 1 reply; 8+ messages in thread
From: Rafał Miłecki @ 2017-01-27 13:07 UTC (permalink / raw)
To: David S . Miller, Florian Fainelli
Cc: Xo Wang, Joel Stanley, Jon Mason, Jaedon Shin, netdev,
Rafał Miłecki
From: Rafał Miłecki <rafal@milecki.pl>
It's Broadcom PHY simply described as single-port
RGMII 10/100/1000BASE-T PHY. It requires disabling delay skew and GTXCLK
bits.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
V2: Include include/linux/brcmphy.h change I forgot to commit
---
drivers/net/phy/broadcom.c | 34 +++++++++++++++++++++++++++++++++-
include/linux/brcmphy.h | 1 +
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 97d1c057c0a1..794b9ec81ba5 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -30,6 +30,22 @@ MODULE_DESCRIPTION("Broadcom PHY driver");
MODULE_AUTHOR("Maciej W. Rozycki");
MODULE_LICENSE("GPL");
+static int bcm54210e_config_init(struct phy_device *phydev)
+{
+ int val;
+
+ val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC);
+ val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN;
+ val |= MII_BCM54XX_AUXCTL_MISC_WREN;
+ bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, val);
+
+ val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
+ val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
+ bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
+
+ return 0;
+}
+
static int bcm54810_config(struct phy_device *phydev)
{
int rc, val;
@@ -230,7 +246,11 @@ static int bcm54xx_config_init(struct phy_device *phydev)
(phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE))
bcm54xx_adjust_rxrefclk(phydev);
- if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
+ if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
+ err = bcm54210e_config_init(phydev);
+ if (err)
+ return err;
+ } else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54810) {
err = bcm54810_config(phydev);
if (err)
return err;
@@ -542,6 +562,17 @@ static struct phy_driver broadcom_drivers[] = {
.ack_interrupt = bcm_phy_ack_intr,
.config_intr = bcm_phy_config_intr,
}, {
+ .phy_id = PHY_ID_BCM54210E,
+ .phy_id_mask = 0xfffffff0,
+ .name = "Broadcom BCM54210E",
+ .features = PHY_GBIT_FEATURES,
+ .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+ .config_init = bcm54xx_config_init,
+ .config_aneg = genphy_config_aneg,
+ .read_status = genphy_read_status,
+ .ack_interrupt = bcm_phy_ack_intr,
+ .config_intr = bcm_phy_config_intr,
+}, {
.phy_id = PHY_ID_BCM5461,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5461",
@@ -680,6 +711,7 @@ module_phy_driver(broadcom_drivers);
static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
{ PHY_ID_BCM5411, 0xfffffff0 },
{ PHY_ID_BCM5421, 0xfffffff0 },
+ { PHY_ID_BCM54210E, 0xfffffff0 },
{ PHY_ID_BCM5461, 0xfffffff0 },
{ PHY_ID_BCM54612E, 0xfffffff0 },
{ PHY_ID_BCM54616S, 0xfffffff0 },
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index cf93f1399d3e..5881d1fdc1fb 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -17,6 +17,7 @@
#define PHY_ID_BCM5482 0x0143bcb0
#define PHY_ID_BCM5411 0x00206070
#define PHY_ID_BCM5421 0x002060e0
+#define PHY_ID_BCM54210E 0x600d84a0
#define PHY_ID_BCM5464 0x002060b0
#define PHY_ID_BCM5461 0x002060c0
#define PHY_ID_BCM54612E 0x03625e60
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] net: phy: broadcom: add support for BCM54210E
2017-01-27 10:47 [PATCH] net: phy: broadcom: add support for BCM54210E Rafał Miłecki
2017-01-27 12:50 ` kbuild test robot
2017-01-27 13:07 ` [PATCH V2 net-next] " Rafał Miłecki
@ 2017-01-27 13:37 ` kbuild test robot
2 siblings, 0 replies; 8+ messages in thread
From: kbuild test robot @ 2017-01-27 13:37 UTC (permalink / raw)
To: Rafał Miłecki
Cc: kbuild-all, David S . Miller, Florian Fainelli, Xo Wang,
Joel Stanley, Jon Mason, Jaedon Shin, netdev,
Rafał Miłecki
[-- Attachment #1: Type: text/plain, Size: 2011 bytes --]
Hi Rafał,
[auto build test ERROR on net-next/master]
[also build test ERROR on v4.10-rc5 next-20170125]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Rafa-Mi-ecki/net-phy-broadcom-add-support-for-BCM54210E/20170127-190002
config: x86_64-lkp (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All errors (new ones prefixed by >>):
drivers/net/phy/broadcom.c: In function 'bcm54xx_config_init':
>> drivers/net/phy/broadcom.c:249:32: error: 'PHY_ID_BCM54210E' undeclared (first use in this function)
if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
^~~~~~~~~~~~~~~~
drivers/net/phy/broadcom.c:249:32: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/phy/broadcom.c: At top level:
>> drivers/net/phy/broadcom.c:565:13: error: 'PHY_ID_BCM54210E' undeclared here (not in a function)
.phy_id = PHY_ID_BCM54210E,
^~~~~~~~~~~~~~~~
>> drivers/net/phy/broadcom.c:714:4: error: initializer element is not constant
{ PHY_ID_BCM54210E, 0xfffffff0 },
^~~~~~~~~~~~~~~~
drivers/net/phy/broadcom.c:714:4: note: (near initialization for 'broadcom_tbl[2].phy_id')
vim +/PHY_ID_BCM54210E +249 drivers/net/phy/broadcom.c
243
244 if ((phydev->dev_flags & PHY_BRCM_RX_REFCLK_UNUSED) ||
245 (phydev->dev_flags & PHY_BRCM_DIS_TXCRXC_NOENRGY) ||
246 (phydev->dev_flags & PHY_BRCM_AUTO_PWRDWN_ENABLE))
247 bcm54xx_adjust_rxrefclk(phydev);
248
> 249 if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54210E) {
250 err = bcm54210e_config_init(phydev);
251 if (err)
252 return err;
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 24674 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH V2 net-next] net: phy: broadcom: add support for BCM54210E
2017-01-27 13:07 ` [PATCH V2 net-next] " Rafał Miłecki
@ 2017-01-27 16:29 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-01-27 16:29 UTC (permalink / raw)
To: zajec5; +Cc: f.fainelli, xow, joel, jon.mason, jaedon.shin, netdev, rafal
From: Rafał Miłecki <zajec5@gmail.com>
Date: Fri, 27 Jan 2017 14:07:01 +0100
> From: Rafał Miłecki <rafal@milecki.pl>
>
> It's Broadcom PHY simply described as single-port
> RGMII 10/100/1000BASE-T PHY. It requires disabling delay skew and GTXCLK
> bits.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
> V2: Include include/linux/brcmphy.h change I forgot to commit
Applied, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] net: phy: broadcom: add support for BCM54210E
2023-08-05 9:34 ` Rafał Miłecki
@ 2023-08-05 16:45 ` Marek Vasut
0 siblings, 0 replies; 8+ messages in thread
From: Marek Vasut @ 2023-08-05 16:45 UTC (permalink / raw)
To: Rafał Miłecki, u-boot
Cc: Joe Hershberger, Michal Simek, Ramon Fried, Rasmus Villemoes
On 8/5/23 11:34, Rafał Miłecki wrote:
> On 5.08.2023 05:38, Marek Vasut wrote:
>> It's Broadcom PHY simply described as single-port
>> RGMII 10/100/1000BASE-T PHY. It requires disabling
>> delay skew and GTXCLK bits.
>>
>> Ported from Linux kernel commit
>> 0fc9ae1076697 ("net: phy: broadcom: add support for BCM54210E")
>>
>> Signed-off-by: Marek Vasut <marex@denx.de>
>> ---
>> Cc: Joe Hershberger <joe.hershberger@ni.com>
>> Cc: Marek Vasut <marex@denx.de>
>> Cc: Michal Simek <michal.simek@amd.com>
>> Cc: Ramon Fried <rfried.dev@gmail.com>
>> Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
>
> Including original author may be a good idea too :)
Done in V2 .
TBH I'm still unsure whether or not CC the kernel people on U-Boot patch
ports.
> This patch isn't really correct, see below.
>
>
>> ---
>> drivers/net/phy/broadcom.c | 66 +++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 65 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
>> index 36c70da181a..0967363b3bc 100644
>> --- a/drivers/net/phy/broadcom.c
>> +++ b/drivers/net/phy/broadcom.c
>> @@ -30,10 +30,47 @@
>> #define MIIM_BCM54XX_EXP_SEL_ER 0x0f00 /* Expansion
>> register select */
>> #define MIIM_BCM_AUXCNTL_SHDWSEL_MISC 0x0007
>> -#define MIIM_BCM_AUXCNTL_ACTL_SMDSP_EN 0x0800
>> +#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_WIRESPEED_EN 0x0010
>> +#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_EN 0x0080
>> +#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_SKEW_EN 0x0100
>> +#define MIIM_BCM_AUXCNTL_MISC_FORCE_AMDIX 0x0200
>> +#define MIIM_BCM_AUXCNTL_ACTL_SMDSP_EN 0x0800
>> +#define MIIM_BCM_AUXCNTL_MISC_WREN 0x8000
>> #define MIIM_BCM_CHANNEL_WIDTH 0x2000
>> +#define BCM54810_SHD_CLK_CTL 0x3
>> +#define BCM54810_SHD_CLK_CTL_GTXCLK_EN BIT(9)
>> +
>> +static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum)
>> +{
>> + /* The register must be written to both the Shadow Register
>> Select and
>> + * the Shadow Read Register Selector
>> + */
>> + phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL,
>> + MIIM_BCM54xx_AUXCNTL_ENCODE(regnum));
>> + return phy_read(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL);
>> +}
>> +
>> +static int bcm54xx_auxctl_write(struct phy_device *phydev, u16
>> regnum, u16 val)
>> +{
>> + return phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL,
>> regnum | val);
>> +}
>> +
>> +static int bcm_phy_read_shadow(struct phy_device *phydev, u16 shadow)
>> +{
>> + phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54XX_SHD,
>> + MIIM_BCM54XX_SHD_VAL(shadow));
>> + return MIIM_BCM54XX_SHD_DATA(phy_read(phydev, MDIO_DEVAD_NONE,
>> + MIIM_BCM54XX_SHD));
>> +}
>> +
>> +static int bcm_phy_write_shadow(struct phy_device *phydev, u16
>> shadow, u16 val)
>> +{
>> + return phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54XX_SHD,
>> + MIIM_BCM54XX_SHD_WR_ENCODE(shadow, val));
>> +}
>> +
>> static void bcm_phy_write_misc(struct phy_device *phydev,
>> u16 reg, u16 chl, u16 value)
>> {
>> @@ -62,6 +99,23 @@ static int bcm5461_config(struct phy_device *phydev)
>> return 0;
>> }
>> +/* Broadcom BCM54210E */
>> +static int bcm54210e_config(struct phy_device *phydev)
>> +{
>> + int val;
>> +
>> + val = bcm54xx_auxctl_read(phydev, MIIM_BCM_AUXCNTL_SHDWSEL_MISC);
>> + val &= ~MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_SKEW_EN;
>> + val |= MIIM_BCM_AUXCNTL_MISC_WREN;
>> + bcm54xx_auxctl_write(phydev, MIIM_BCM_AUXCNTL_SHDWSEL_MISC, val);
>> +
>> + val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
>> + val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
>> + bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
>> +
>> + return bcm5461_config(phydev);
>> +}
>
> Above function hardcodes setup for a specific PHY mode. It should be
> done depending on PHY mode specified in DT. See kernel commit
> fea7fda7f50a ("net: phy: broadcom: Fix RGMII delays configuration for
> BCM54210E")
Updated in v2, thanks !
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] net: phy: broadcom: add support for BCM54210E
2023-08-05 3:38 Marek Vasut
@ 2023-08-05 9:34 ` Rafał Miłecki
2023-08-05 16:45 ` Marek Vasut
0 siblings, 1 reply; 8+ messages in thread
From: Rafał Miłecki @ 2023-08-05 9:34 UTC (permalink / raw)
To: Marek Vasut, u-boot
Cc: Joe Hershberger, Michal Simek, Ramon Fried, Rasmus Villemoes
On 5.08.2023 05:38, Marek Vasut wrote:
> It's Broadcom PHY simply described as single-port
> RGMII 10/100/1000BASE-T PHY. It requires disabling
> delay skew and GTXCLK bits.
>
> Ported from Linux kernel commit
> 0fc9ae1076697 ("net: phy: broadcom: add support for BCM54210E")
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> ---
> Cc: Joe Hershberger <joe.hershberger@ni.com>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Michal Simek <michal.simek@amd.com>
> Cc: Ramon Fried <rfried.dev@gmail.com>
> Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Including original author may be a good idea too :)
This patch isn't really correct, see below.
> ---
> drivers/net/phy/broadcom.c | 66 +++++++++++++++++++++++++++++++++++++-
> 1 file changed, 65 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
> index 36c70da181a..0967363b3bc 100644
> --- a/drivers/net/phy/broadcom.c
> +++ b/drivers/net/phy/broadcom.c
> @@ -30,10 +30,47 @@
> #define MIIM_BCM54XX_EXP_SEL_ER 0x0f00 /* Expansion register select */
>
> #define MIIM_BCM_AUXCNTL_SHDWSEL_MISC 0x0007
> -#define MIIM_BCM_AUXCNTL_ACTL_SMDSP_EN 0x0800
> +#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_WIRESPEED_EN 0x0010
> +#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_EN 0x0080
> +#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_SKEW_EN 0x0100
> +#define MIIM_BCM_AUXCNTL_MISC_FORCE_AMDIX 0x0200
> +#define MIIM_BCM_AUXCNTL_ACTL_SMDSP_EN 0x0800
> +#define MIIM_BCM_AUXCNTL_MISC_WREN 0x8000
>
> #define MIIM_BCM_CHANNEL_WIDTH 0x2000
>
> +#define BCM54810_SHD_CLK_CTL 0x3
> +#define BCM54810_SHD_CLK_CTL_GTXCLK_EN BIT(9)
> +
> +static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum)
> +{
> + /* The register must be written to both the Shadow Register Select and
> + * the Shadow Read Register Selector
> + */
> + phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL,
> + MIIM_BCM54xx_AUXCNTL_ENCODE(regnum));
> + return phy_read(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL);
> +}
> +
> +static int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val)
> +{
> + return phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL, regnum | val);
> +}
> +
> +static int bcm_phy_read_shadow(struct phy_device *phydev, u16 shadow)
> +{
> + phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54XX_SHD,
> + MIIM_BCM54XX_SHD_VAL(shadow));
> + return MIIM_BCM54XX_SHD_DATA(phy_read(phydev, MDIO_DEVAD_NONE,
> + MIIM_BCM54XX_SHD));
> +}
> +
> +static int bcm_phy_write_shadow(struct phy_device *phydev, u16 shadow, u16 val)
> +{
> + return phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54XX_SHD,
> + MIIM_BCM54XX_SHD_WR_ENCODE(shadow, val));
> +}
> +
> static void bcm_phy_write_misc(struct phy_device *phydev,
> u16 reg, u16 chl, u16 value)
> {
> @@ -62,6 +99,23 @@ static int bcm5461_config(struct phy_device *phydev)
> return 0;
> }
>
> +/* Broadcom BCM54210E */
> +static int bcm54210e_config(struct phy_device *phydev)
> +{
> + int val;
> +
> + val = bcm54xx_auxctl_read(phydev, MIIM_BCM_AUXCNTL_SHDWSEL_MISC);
> + val &= ~MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_SKEW_EN;
> + val |= MIIM_BCM_AUXCNTL_MISC_WREN;
> + bcm54xx_auxctl_write(phydev, MIIM_BCM_AUXCNTL_SHDWSEL_MISC, val);
> +
> + val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
> + val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
> + bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
> +
> + return bcm5461_config(phydev);
> +}
Above function hardcodes setup for a specific PHY mode. It should be
done depending on PHY mode specified in DT. See kernel commit
fea7fda7f50a ("net: phy: broadcom: Fix RGMII delays configuration for
BCM54210E")
> +
> static int bcm54xx_parse_status(struct phy_device *phydev)
> {
> unsigned int mii_reg;
> @@ -311,6 +365,16 @@ static int bcm5482_startup(struct phy_device *phydev)
> return bcm54xx_parse_status(phydev);
> }
>
> +U_BOOT_PHY_DRIVER(bcm54210e) = {
> + .name = "Broadcom BCM54210E",
> + .uid = 0x600d84a0,
> + .mask = 0xfffffff0,
> + .features = PHY_GBIT_FEATURES,
> + .config = &bcm54210e_config,
> + .startup = &bcm54xx_startup,
> + .shutdown = &genphy_shutdown,
> +};
> +
> U_BOOT_PHY_DRIVER(bcm5461s) = {
> .name = "Broadcom BCM5461S",
> .uid = 0x2060c0,
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] net: phy: broadcom: add support for BCM54210E
@ 2023-08-05 3:38 Marek Vasut
2023-08-05 9:34 ` Rafał Miłecki
0 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2023-08-05 3:38 UTC (permalink / raw)
To: u-boot
Cc: Marek Vasut, Joe Hershberger, Michal Simek, Ramon Fried,
Rasmus Villemoes
It's Broadcom PHY simply described as single-port
RGMII 10/100/1000BASE-T PHY. It requires disabling
delay skew and GTXCLK bits.
Ported from Linux kernel commit
0fc9ae1076697 ("net: phy: broadcom: add support for BCM54210E")
Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Michal Simek <michal.simek@amd.com>
Cc: Ramon Fried <rfried.dev@gmail.com>
Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
drivers/net/phy/broadcom.c | 66 +++++++++++++++++++++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 36c70da181a..0967363b3bc 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -30,10 +30,47 @@
#define MIIM_BCM54XX_EXP_SEL_ER 0x0f00 /* Expansion register select */
#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC 0x0007
-#define MIIM_BCM_AUXCNTL_ACTL_SMDSP_EN 0x0800
+#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_WIRESPEED_EN 0x0010
+#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_EN 0x0080
+#define MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_SKEW_EN 0x0100
+#define MIIM_BCM_AUXCNTL_MISC_FORCE_AMDIX 0x0200
+#define MIIM_BCM_AUXCNTL_ACTL_SMDSP_EN 0x0800
+#define MIIM_BCM_AUXCNTL_MISC_WREN 0x8000
#define MIIM_BCM_CHANNEL_WIDTH 0x2000
+#define BCM54810_SHD_CLK_CTL 0x3
+#define BCM54810_SHD_CLK_CTL_GTXCLK_EN BIT(9)
+
+static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum)
+{
+ /* The register must be written to both the Shadow Register Select and
+ * the Shadow Read Register Selector
+ */
+ phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL,
+ MIIM_BCM54xx_AUXCNTL_ENCODE(regnum));
+ return phy_read(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL);
+}
+
+static int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val)
+{
+ return phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54xx_AUXCNTL, regnum | val);
+}
+
+static int bcm_phy_read_shadow(struct phy_device *phydev, u16 shadow)
+{
+ phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54XX_SHD,
+ MIIM_BCM54XX_SHD_VAL(shadow));
+ return MIIM_BCM54XX_SHD_DATA(phy_read(phydev, MDIO_DEVAD_NONE,
+ MIIM_BCM54XX_SHD));
+}
+
+static int bcm_phy_write_shadow(struct phy_device *phydev, u16 shadow, u16 val)
+{
+ return phy_write(phydev, MDIO_DEVAD_NONE, MIIM_BCM54XX_SHD,
+ MIIM_BCM54XX_SHD_WR_ENCODE(shadow, val));
+}
+
static void bcm_phy_write_misc(struct phy_device *phydev,
u16 reg, u16 chl, u16 value)
{
@@ -62,6 +99,23 @@ static int bcm5461_config(struct phy_device *phydev)
return 0;
}
+/* Broadcom BCM54210E */
+static int bcm54210e_config(struct phy_device *phydev)
+{
+ int val;
+
+ val = bcm54xx_auxctl_read(phydev, MIIM_BCM_AUXCNTL_SHDWSEL_MISC);
+ val &= ~MIIM_BCM_AUXCNTL_SHDWSEL_MISC_RGMII_SKEW_EN;
+ val |= MIIM_BCM_AUXCNTL_MISC_WREN;
+ bcm54xx_auxctl_write(phydev, MIIM_BCM_AUXCNTL_SHDWSEL_MISC, val);
+
+ val = bcm_phy_read_shadow(phydev, BCM54810_SHD_CLK_CTL);
+ val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
+ bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
+
+ return bcm5461_config(phydev);
+}
+
static int bcm54xx_parse_status(struct phy_device *phydev)
{
unsigned int mii_reg;
@@ -311,6 +365,16 @@ static int bcm5482_startup(struct phy_device *phydev)
return bcm54xx_parse_status(phydev);
}
+U_BOOT_PHY_DRIVER(bcm54210e) = {
+ .name = "Broadcom BCM54210E",
+ .uid = 0x600d84a0,
+ .mask = 0xfffffff0,
+ .features = PHY_GBIT_FEATURES,
+ .config = &bcm54210e_config,
+ .startup = &bcm54xx_startup,
+ .shutdown = &genphy_shutdown,
+};
+
U_BOOT_PHY_DRIVER(bcm5461s) = {
.name = "Broadcom BCM5461S",
.uid = 0x2060c0,
--
2.40.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-08-05 16:45 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-27 10:47 [PATCH] net: phy: broadcom: add support for BCM54210E Rafał Miłecki
2017-01-27 12:50 ` kbuild test robot
2017-01-27 13:07 ` [PATCH V2 net-next] " Rafał Miłecki
2017-01-27 16:29 ` David Miller
2017-01-27 13:37 ` [PATCH] " kbuild test robot
2023-08-05 3:38 Marek Vasut
2023-08-05 9:34 ` Rafał Miłecki
2023-08-05 16:45 ` Marek Vasut
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.