net: ethernet: nb8800: handle all RGMII declinations

PATCH Superseded Sebastian Frias 4 participants 7 messages Nov 4, 2016

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Sebastian Frias

author

2016-11-04 15:05 UTC #0 lore raw

PATCH 2/2 net: ethernet: nb8800: handle all RGMII declinations

Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII declinations:
PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.

Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC Mode or the Pads Mode for the HW to work properly.

Signed-off-by Sebastian Frias <[email protected]>

---
 drivers/net/ethernet/aurora/nb8800.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

drivers/net/ethernet/aurora/nb8800.c +6 -4

index d2855c9..6230ace 100644
@@ -609,7 +609,10 @@ static void nb8800_mac_config(struct net_device *dev)
 		mac_mode |= HALF_DUPLEX;
 
 	if (gigabit) {
-		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
 			mac_mode |= RGMII_MODE;
 
 		mac_mode |= GMAC_MODE;

@@ -1278,9 +1281,8 @@ static int nb8800_tangox_init(struct net_device *dev)
 		break;
 
 	case PHY_INTERFACE_MODE_RGMII:
-		pad_mode = PAD_MODE_RGMII;
-		break;
-
+	case PHY_INTERFACE_MODE_RGMII_ID:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
 	case PHY_INTERFACE_MODE_RGMII_TXID:
 		pad_mode = PAD_MODE_RGMII;
 		break;

Signature · 1 line

1.7.11.2

Florian Fainelli

2016-11-04 16:23 UTC #1 lore raw

Quoted 19 lines · Sebastian Frias

Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII declinations:
PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.
Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC Mode or the Pads Mode for the HW to work properly.
Signed-off-by Sebastian Frias <[email protected]>
---
 drivers/net/ethernet/aurora/nb8800.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/aurora/nb8800.c +0 -0
index d2855c9..6230ace 100644

drivers/net/ethernet/aurora/nb8800.c static void nb8800_mac_config(struct net_device *dev) · line 615

Quoted 8 lines

drivers/net/ethernet/aurora/nb8800.c +4 -1

@@ -609,7 +609,10 @@ static void nb8800_mac_config(struct net_device *dev)
 		mac_mode |= HALF_DUPLEX;
 
 	if (gigabit) {
-		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)

phy_interface_is_rgmii(phydev)?

Quoted 16 lines

drivers/net/ethernet/aurora/nb8800.c +2 -3

 			mac_mode |= RGMII_MODE;
 
 		mac_mode |= GMAC_MODE;

@@ -1278,9 +1281,8 @@ static int nb8800_tangox_init(struct net_device *dev)
 		break;
 
 	case PHY_INTERFACE_MODE_RGMII:
-		pad_mode = PAD_MODE_RGMII;
-		break;
-
+	case PHY_INTERFACE_MODE_RGMII_ID:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
 	case PHY_INTERFACE_MODE_RGMII_TXID:
 		pad_mode = PAD_MODE_RGMII;
 		break;

Signature · 1 line

Florian

Sebastian Frias

author

2016-11-04 16:29 UTC #2 lore raw

Quoted 24 lines · Florian Fainelli

Quoted 21 lines · Sebastian Frias
Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII declinations:
PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.
Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC Mode or the Pads Mode for the HW to work properly.
Signed-off-by Sebastian Frias <[email protected]>
---
 drivers/net/ethernet/aurora/nb8800.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/ethernet/aurora/nb8800.c +0 -0
index d2855c9..6230ace 100644
@@ -609,7 +609,10 @@ static void nb8800_mac_config(struct net_device *dev)
 		mac_mode |= HALF_DUPLEX;
 

Quoted 8 lines

drivers/net/ethernet/aurora/nb8800.c static void nb8800_mac_config(struct net_device *dev) · line 615
Quoted 6 lines
drivers/net/ethernet/aurora/nb8800.c +4 -1
 	if (gigabit) {
-		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||
+		    priv->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
phy_interface_is_rgmii(phydev)?

Thanks! I'll post an update.

Quoted 18 lines

Quoted 17 lines

drivers/net/ethernet/aurora/nb8800.c +2 -3

 			mac_mode |= RGMII_MODE;
 
 		mac_mode |= GMAC_MODE;

@@ -1278,9 +1281,8 @@ static int nb8800_tangox_init(struct net_device *dev)
 		break;
 
 	case PHY_INTERFACE_MODE_RGMII:
-		pad_mode = PAD_MODE_RGMII;
-		break;
-
+	case PHY_INTERFACE_MODE_RGMII_ID:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
 	case PHY_INTERFACE_MODE_RGMII_TXID:
 		pad_mode = PAD_MODE_RGMII;
 		break;

Sebastian Frias

author

2016-11-04 17:02 UTC #3 lore raw

PATCH v2 2/2 net: ethernet: nb8800: handle all RGMII definitions

In reply to Florian Fainelli

Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII definitions:
PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.

Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC mode or the pad mode for the HW to work properly.

Signed-off-by Sebastian Frias <[email protected]>

---
 drivers/net/ethernet/aurora/nb8800.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

drivers/net/ethernet/aurora/nb8800.c +4 -4

index d2855c9..fba2699 100644
@@ -598,6 +598,7 @@ static irqreturn_t nb8800_irq(int irq, void *dev_id)
 static void nb8800_mac_config(struct net_device *dev)
 {
 	struct nb8800_priv *priv = netdev_priv(dev);
+	struct phy_device *phydev = dev->phydev;
 	bool gigabit = priv->speed == SPEED_1000;
 	u32 mac_mode_mask = RGMII_MODE | HALF_DUPLEX | GMAC_MODE;
 	u32 mac_mode = 0;

@@ -609,7 +610,7 @@ static void nb8800_mac_config(struct net_device *dev)
 		mac_mode |= HALF_DUPLEX;
 
 	if (gigabit) {
-		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+		if (phy_interface_is_rgmii(phydev))
 			mac_mode |= RGMII_MODE;
 
 		mac_mode |= GMAC_MODE;

@@ -1278,9 +1279,8 @@ static int nb8800_tangox_init(struct net_device *dev)
 		break;
 
 	case PHY_INTERFACE_MODE_RGMII:
-		pad_mode = PAD_MODE_RGMII;
-		break;
-
+	case PHY_INTERFACE_MODE_RGMII_ID:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
 	case PHY_INTERFACE_MODE_RGMII_TXID:
 		pad_mode = PAD_MODE_RGMII;
 		break;

Signature · 1 line

1.7.11.2

Måns Rullgård

2016-11-04 17:12 UTC #4 lore raw

Re: [PATCH v2 2/2 ] net: ethernet: nb8800: handle all RGMII definitions

Quoted 27 lines · Sebastian Frias

Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII definitions:
PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.
Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC mode or the pad mode for the HW to work properly.
Signed-off-by Sebastian Frias <[email protected]>
---
 drivers/net/ethernet/aurora/nb8800.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/aurora/nb8800.c +1 -0
index d2855c9..fba2699 100644
@@ -598,6 +598,7 @@ static irqreturn_t nb8800_irq(int irq, void *dev_id)
 static void nb8800_mac_config(struct net_device *dev)
 {
 	struct nb8800_priv *priv = netdev_priv(dev);
+	struct phy_device *phydev = dev->phydev;
 	bool gigabit = priv->speed == SPEED_1000;
 	u32 mac_mode_mask = RGMII_MODE | HALF_DUPLEX | GMAC_MODE;
 	u32 mac_mode = 0;

drivers/net/ethernet/aurora/nb8800.c static void nb8800_mac_config(struct net_device *dev) · line 616

Quoted 8 lines

drivers/net/ethernet/aurora/nb8800.c +1 -1

@@ -609,7 +610,7 @@ static void nb8800_mac_config(struct net_device *dev)
 		mac_mode |= HALF_DUPLEX;
 
 	if (gigabit) {
-		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+		if (phy_interface_is_rgmii(phydev))
 			mac_mode |= RGMII_MODE;
 
 		mac_mode |= GMAC_MODE;

This part is correct regardless of the outcome of the delay setup discussion.

Quoted 15 lines

drivers/net/ethernet/aurora/nb8800.c +2 -3

@@ -1278,9 +1279,8 @@ static int nb8800_tangox_init(struct net_device *dev)
 		break;
 
 	case PHY_INTERFACE_MODE_RGMII:
-		pad_mode = PAD_MODE_RGMII;
-		break;
-
+	case PHY_INTERFACE_MODE_RGMII_ID:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
 	case PHY_INTERFACE_MODE_RGMII_TXID:
 		pad_mode = PAD_MODE_RGMII;
 		break;

Signature · 1 line

1.7.11.2

Signature · 1 line

Måns Rullgård

David Miller

maintainer

2016-11-04 17:54 UTC #5 lore raw

Re: [PATCH v2 2/2 ] net: ethernet: nb8800: handle all RGMII definitions

In reply to Sebastian Frias

From: Sebastian Frias <[email protected]>
Date: Fri, 4 Nov 2016 18:02:15 +0100

Quoted 10 lines

Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII definitions:
PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.
Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC mode or the pad mode for the HW to work properly.
Signed-off-by Sebastian Frias <[email protected]>

You cannot just repost one part of a patch series when you make changes.

You must always repost the entire series as a new fresh version, with changelog entries added to your "[PATCH v2 0/2] ..." header posting.

Sebastian Frias

author

2016-11-04 18:24 UTC #6 lore raw

Re: [PATCH v2 2/2 ] net: ethernet: nb8800: handle all RGMII definitions

Hi David,

Quoted 12 lines · David Miller

From: Sebastian Frias <[email protected]>
Date: Fri, 4 Nov 2016 18:02:15 +0100
Quoted 9 lines
Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII definitions:
PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.
Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC mode or the pad mode for the HW to work properly.

Quoted 7 lines

Quoted 1 line
Signed-off-by Sebastian Frias <[email protected]>
You cannot just repost one part of a patch series when you make changes.
You must always repost the entire series as a new fresh version, with changelog entries added to your "[PATCH v2 0/2] ..." header posting.

Thanks for the information.

I sent v2, and then v3, because v2 had formatting issues, hopefully it is ok now.

Best regards,

Sebastian