net: ethernet: nb8800: Do not apply TX delay at MAC level

PATCH In review Sebastian Frias 2 participants 6 messages Nov 4, 2016 – Nov 7, 2016

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Sebastian Frias

author

2016-11-04 18:21 UTC #0 lore raw

v3 cover net: ethernet: nb8800: Do not apply TX delay at MAC level

This is v3 of the series, it fixes formatting issues of v2.

In v2 of the series, only the second patch:
"net: ethernet: nb8800: handle all RGMII definitions" is modified to account for Florian's suggestion.

Sebastian Frias (2):
net: ethernet: nb8800: Do not apply TX delay at MAC level
net: ethernet: nb8800: handle all RGMII definitions

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

Signature · 1 line

1.7.11.2

Sebastian Frias

author

2016-11-04 18:22 UTC #1 lore raw

PATCH v3 1/2 net: ethernet: nb8800: Do not apply TX delay at MAC level

The delay can be applied at PHY or MAC level, but since PHY drivers will apply the delay at PHY level when using one of the "internal delay" declinations of RGMII mode (like PHY_INTERFACE_MODE_RGMII_TXID), applying it again at MAC level causes issues.

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

---
 drivers/net/ethernet/aurora/nb8800.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

index b59aa35..d2855c9 100644
@@ -1282,7 +1282,7 @@ static int nb8800_tangox_init(struct net_device *dev)
 		break;
 
 	case PHY_INTERFACE_MODE_RGMII_TXID:
-		pad_mode = PAD_MODE_RGMII | PAD_MODE_GTX_CLK_DELAY;
+		pad_mode = PAD_MODE_RGMII;
 		break;
 
 	default:

Signature · 1 line

1.7.11.2

Sebastian Frias

author

2016-11-04 18:23 UTC #2 lore raw

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

In reply to 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 +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-05 12:58 UTC #3 lore raw

Re: [PATCH v3 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;

As I said before, this part can/should be applied separately, although personally I probably wouldn't have bothered adding a single-use variable.

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

Sebastian Frias

author

2016-11-07 10:01 UTC #4 lore raw

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

Hi Måns,

Quoted 9 lines · Måns Rullgård

drivers/net/ethernet/aurora/nb8800.c static void nb8800_mac_config(struct net_device *dev) · line 616
Quoted 6 lines
drivers/net/ethernet/aurora/nb8800.c +1 -1
 	if (gigabit) {
-		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+		if (phy_interface_is_rgmii(phydev))
 			mac_mode |= RGMII_MODE;
 
 		mac_mode |= GMAC_MODE;
As I said before, this part can/should be applied separately, although personally I probably wouldn't have bothered adding a single-use variable.

It was for consistency with other functions that use 'phydev', but I don't mind making the changes.

Just to be clear, when you say "can/should be applied separately", do you mean that this patch should not be part of a series, and that I should split the series into separate patches?

Best regards,

Sebastian

Måns Rullgård

2016-11-07 11:51 UTC #5 lore raw

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

Quoted 13 lines · Sebastian Frias

Hi Måns,
Quoted 9 lines · Måns Rullgård
drivers/net/ethernet/aurora/nb8800.c static void nb8800_mac_config(struct net_device *dev) · line 616
Quoted 6 lines
drivers/net/ethernet/aurora/nb8800.c +1 -1
 	if (gigabit) {
-		if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+		if (phy_interface_is_rgmii(phydev))
 			mac_mode |= RGMII_MODE;
 
 		mac_mode |= GMAC_MODE;
As I said before, this part can/should be applied separately, although personally I probably wouldn't have bothered adding a single-use variable.

Quoted 6 lines

It was for consistency with other functions that use 'phydev', but I don't mind making the changes.
Just to be clear, when you say "can/should be applied separately", do you mean that this patch should not be part of a series, and that I should split the series into separate patches?

I meant that this change should be made regardless of the others and can be done separately if desired.

Signature · 1 line

Måns Rullgård