[PATCH 0/3] armv8/ls104xardb: RGMII ports require internal delay
The correct setting for the RGMII ports on LS1043/6ARDB is to enable delay on both Rx and Tx so the interface mode used must be PHY_INTERFACE_MODE_RGMII_ID. There is a pull-up that turns on Rx internal delay by default and the u-boot does not override that (yet) so in u-boot the interface is functional. In Linux the PHY driver is clearing the Rx delay for the "rgmii-txid" mode and the reception does not work. Changing the RGMII mode to internal delay here ensures that device tree fix-ups for the PHY connection type turn on both Tx and Rx internal delay in Linux.
The patch set also ensures all internal delay modes are supported in the MEMAC code.
Tested on LS1043ARDB and LS1046ARDB.
Madalin Bucur (3): net: fman: add support for all RGMII delay modes armv8/ls1043ardb: RGMII ports require internal delay armv8/ls1046ardb: RGMII ports require internal delay
drivers/net/fm/ls1043.c | 4 ++-- drivers/net/fm/ls1046.c | 4 ++-- drivers/net/fm/memac.c | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-)
The RGMII modes that include internal delay were not all properly treated in the memac code. Add support for all RGMII delay modes.
Fixes: 111fd19e3b9e ("fm/mEMAC: add mEMAC frame work") Signed-off-by: Madalin Bucur madalin.bucur@oss.nxp.com --- drivers/net/fm/memac.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c index 2c49951..bed8f14 100644 --- a/drivers/net/fm/memac.c +++ b/drivers/net/fm/memac.c @@ -83,6 +83,8 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac, if_mode |= IF_MODE_GMII; break; case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: case PHY_INTERFACE_MODE_RGMII_TXID: if_mode |= (IF_MODE_GMII | IF_MODE_RG); break; @@ -107,6 +109,8 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac, if_mode |= IF_MODE_EN_AUTO;
if (type == PHY_INTERFACE_MODE_RGMII || + type == PHY_INTERFACE_MODE_RGMII_ID || + type == PHY_INTERFACE_MODE_RGMII_RXID || type == PHY_INTERFACE_MODE_RGMII_TXID) { if_mode &= ~IF_MODE_EN_AUTO; if_mode &= ~IF_MODE_SETSP_MASK;
-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Madalin Bucur Sent: Thursday, March 12, 2020 6:24 PM To: joe.hershberger@ni.com; u-boot@lists.denx.de Cc: Madalin Bucur (OSS) madalin.bucur@oss.nxp.com Subject: [PATCH 1/3] net: fman: add support for all RGMII delay modes
The RGMII modes that include internal delay were not all properly treated in the memac code. Add support for all RGMII delay modes.
Fixes: 111fd19e3b9e ("fm/mEMAC: add mEMAC frame work") Signed-off-by: Madalin Bucur madalin.bucur@oss.nxp.com
drivers/net/fm/memac.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c index 2c49951..bed8f14 100644 --- a/drivers/net/fm/memac.c +++ b/drivers/net/fm/memac.c @@ -83,6 +83,8 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac, if_mode |= IF_MODE_GMII; break; case PHY_INTERFACE_MODE_RGMII:
- case PHY_INTERFACE_MODE_RGMII_ID:
- case PHY_INTERFACE_MODE_RGMII_RXID: case PHY_INTERFACE_MODE_RGMII_TXID: if_mode |= (IF_MODE_GMII | IF_MODE_RG); break;
@@ -107,6 +109,8 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac, if_mode |= IF_MODE_EN_AUTO;
if (type == PHY_INTERFACE_MODE_RGMII ||
type == PHY_INTERFACE_MODE_RGMII_ID ||type == PHY_INTERFACE_MODE_RGMII_RXID || type == PHY_INTERFACE_MODE_RGMII_TXID) {-- 2.1.0
Reviewed-by: Priyanka Jain priyanka.jain@nxp.com
Joe,
Can you please review/provide ack to this patch series
Priyanka
-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Madalin Bucur Sent: Thursday, March 12, 2020 6:24 PM To: joe.hershberger@ni.com; u-boot@lists.denx.de Cc: Madalin Bucur (OSS) madalin.bucur@oss.nxp.com Subject: [PATCH 1/3] net: fman: add support for all RGMII delay modes
The RGMII modes that include internal delay were not all properly treated in the memac code. Add support for all RGMII delay modes.
Fixes: 111fd19e3b9e ("fm/mEMAC: add mEMAC frame work") Signed-off-by: Madalin Bucur madalin.bucur@oss.nxp.com
Series applied to u-boot-fsl-qoriq. Waiting upstream
Thanks Priyanka
The correct setting for the RGMII ports on LS1043ARDB is to enable delay on both Rx and Tx so the interface mode used must be PHY_INTERFACE_MODE_RGMII_ID. There is a pull-up that turns on Rx internal delay by default and the u-boot does not override that (yet) so in u-boot the interface is functional. In Linux the PHY driver is clearing the Rx delay for the "rgmii-txid" mode and the reception does not work. Changing the RGMII mode to internal delay here ensures that device tree fix-ups for the PHY connection type turn on both Tx and Rx internal delay in Linux.
Fixes: 5a78a472f666 ("armv8/ls1043a: RGMII PHY requires internal delay on Tx") Signed-off-by: Madalin Bucur madalin.bucur@oss.nxp.com --- drivers/net/fm/ls1043.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c index cd510f2..ba4da69 100644 --- a/drivers/net/fm/ls1043.c +++ b/drivers/net/fm/ls1043.c @@ -65,12 +65,12 @@ phy_interface_t fman_port_enet_if(enum fm_port port) if (port == FM1_DTSEC3) if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == FSL_CHASSIS2_RCWSR13_EC1_DTSEC3_RGMII) { - return PHY_INTERFACE_MODE_RGMII_TXID; + return PHY_INTERFACE_MODE_RGMII_ID; } if (port == FM1_DTSEC4) if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC2) == FSL_CHASSIS2_RCWSR13_EC2_DTSEC4_RGMII) { - return PHY_INTERFACE_MODE_RGMII_TXID; + return PHY_INTERFACE_MODE_RGMII_ID; }
/* handle SGMII */
-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Madalin Bucur Sent: Thursday, March 12, 2020 6:24 PM To: joe.hershberger@ni.com; u-boot@lists.denx.de Cc: Madalin Bucur (OSS) madalin.bucur@oss.nxp.com Subject: [PATCH 2/3] armv8/ls1043ardb: RGMII ports require internal delay
The changes are in net driver. Please use net in prefix?. Are the changes board specific? Or soc specific?
The correct setting for the RGMII ports on LS1043ARDB is to enable delay on both Rx and Tx so the interface mode used must be PHY_INTERFACE_MODE_RGMII_ID. There is a pull-up that turns on Rx internal delay by default and the u-boot does not override that (yet) so in u-boot the interface is functional. In Linux the PHY driver is clearing the Rx delay for the "rgmii-txid" mode and the reception does not work. Changing the RGMII mode to internal delay here ensures that device tree fix- ups for the PHY connection type turn on both Tx and Rx internal delay in Linux.
Fixes: 5a78a472f666 ("armv8/ls1043a: RGMII PHY requires internal delay on Tx") Signed-off-by: Madalin Bucur madalin.bucur@oss.nxp.com
drivers/net/fm/ls1043.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c index cd510f2..ba4da69 100644 --- a/drivers/net/fm/ls1043.c +++ b/drivers/net/fm/ls1043.c @@ -65,12 +65,12 @@ phy_interface_t fman_port_enet_if(enum fm_port port) if (port == FM1_DTSEC3) if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == FSL_CHASSIS2_RCWSR13_EC1_DTSEC3_RGMII) {
return PHY_INTERFACE_MODE_RGMII_TXID;
return PHY_INTERFACE_MODE_RGMII_ID;{
return PHY_INTERFACE_MODE_RGMII_TXID;
return PHY_INTERFACE_MODE_RGMII_ID;}
/* handle SGMII */
-- 2.1.0
Priyanka
-----Original Message----- From: Priyanka Jain (OSS) priyanka.jain@oss.nxp.com Sent: Monday, March 23, 2020 12:30 PM To: Madalin Bucur (OSS) madalin.bucur@oss.nxp.com; joe.hershberger@ni.com; u-boot@lists.denx.de Subject: RE: [PATCH 2/3] armv8/ls1043ardb: RGMII ports require internal delay
-----Original Message----- From: U-Boot u-boot-bounces@lists.denx.de On Behalf Of Madalin Bucur Sent: Thursday, March 12, 2020 6:24 PM To: joe.hershberger@ni.com; u-boot@lists.denx.de Cc: Madalin Bucur (OSS) madalin.bucur@oss.nxp.com Subject: [PATCH 2/3] armv8/ls1043ardb: RGMII ports require internal delay
The changes are in net driver. Please use net in prefix?. Are the changes board specific? Or soc specific?
The net: prefix could have been added but the RGMII in the subject is a sufficient hint, no need to bloat the subject line further. This change in particular is board specific, so the subject is correct in that respect.
Please use empty lines around your replies, they are unreadable like that.
The correct setting for the RGMII ports on LS1043ARDB is to enable delay
on
both Rx and Tx so the interface mode used must be PHY_INTERFACE_MODE_RGMII_ID. There is a pull-up that turns on Rx internal delay by default and the u-boot does not override that (yet) so in u-boot
the
interface is functional. In Linux the PHY driver is clearing the Rx delay for the "rgmii-txid"
mode and
the reception does not work. Changing the RGMII mode to internal delay here ensures that device tree
fix-
ups for the PHY connection type turn on both Tx and Rx internal delay in Linux.
Fixes: 5a78a472f666 ("armv8/ls1043a: RGMII PHY requires internal delay on Tx") Signed-off-by: Madalin Bucur madalin.bucur@oss.nxp.com
drivers/net/fm/ls1043.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c index cd510f2..ba4da69 100644 --- a/drivers/net/fm/ls1043.c +++ b/drivers/net/fm/ls1043.c @@ -65,12 +65,12 @@ phy_interface_t fman_port_enet_if(enum fm_port port) if (port == FM1_DTSEC3) if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == FSL_CHASSIS2_RCWSR13_EC1_DTSEC3_RGMII) {
return PHY_INTERFACE_MODE_RGMII_TXID;
return PHY_INTERFACE_MODE_RGMII_ID;{
return PHY_INTERFACE_MODE_RGMII_TXID;
return PHY_INTERFACE_MODE_RGMII_ID;}
/* handle SGMII */
-- 2.1.0
Priyanka
The correct setting for the RGMII ports on LS1046ARDB is to enable delay on both Rx and Tx so the interface mode used must be PHY_INTERFACE_MODE_RGMII_ID. There is a pull-up that turns on Rx internal delay by default and the u-boot does not override that (yet) so in u-boot the interface is functional. In Linux the PHY driver is clearing the Rx delay for the "rgmii-txid" mode and the reception does not work. Changing the RGMII mode to internal delay here ensures that device tree fix-ups for the PHY connection type turn on both Tx and Rx internal delay in Linux.
Fixes: cc1aa218f510 ("armv8/ls1046a: RGMII PHY requires internal delay on Tx") Signed-off-by: Madalin Bucur madalin.bucur@oss.nxp.com --- drivers/net/fm/ls1046.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/fm/ls1046.c b/drivers/net/fm/ls1046.c index 3617ad9..49b540b 100644 --- a/drivers/net/fm/ls1046.c +++ b/drivers/net/fm/ls1046.c @@ -71,12 +71,12 @@ phy_interface_t fman_port_enet_if(enum fm_port port) if (port == FM1_DTSEC3) if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == FSL_CHASSIS2_RCWSR13_EC1_DTSEC3_RGMII) - return PHY_INTERFACE_MODE_RGMII_TXID; + return PHY_INTERFACE_MODE_RGMII_ID;
if (port == FM1_DTSEC4) if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC2) == FSL_CHASSIS2_RCWSR13_EC2_DTSEC4_RGMII) - return PHY_INTERFACE_MODE_RGMII_TXID; + return PHY_INTERFACE_MODE_RGMII_ID;
/* handle SGMII, only MAC 2/5/6/9/10 available */ switch (port) {
participants (3)
-
Madalin Bucur -
Madalin Bucur (OSS)
-
Priyanka Jain (OSS)