* [PATCH v3 01/02] ravb: Do not announce HDX as supported
2018-11-21 11:21 [PATCH v3 00/02] ravb: Duplex handling update V3 Magnus Damm
@ 2018-11-21 11:21 ` Magnus Damm
2018-11-21 11:21 ` [PATCH v3 02/02] ravb: Clean up duplex handling Magnus Damm
2018-11-23 19:15 ` [PATCH v3 00/02] ravb: Duplex handling update V3 David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Magnus Damm @ 2018-11-21 11:21 UTC (permalink / raw)
To: netdev; +Cc: linux-renesas-soc, Magnus Damm, davem, sergei.shtylyov
From: Magnus Damm <damm+renesas@opensource.se>
According to the data sheet the Ethernet-AVB hardware in R-Car Gen3
and R-Car Gen2 SoCs do not support half duplex operation. So update
the driver to mark 100Mbit and 1Gbps HDX as unsupported.
Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper")
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
Slightly reworked since V2 to make use of phy_remove_link_mode().
In case Sergei wants to opt-out from the Reviewed-by tag for V2 let us know.
Applies on top of next-20181121
drivers/net/ethernet/renesas/ravb_main.c | 4 ++++
1 file changed, 4 insertions(+)
--- 0001/drivers/net/ethernet/renesas/ravb_main.c
+++ work/drivers/net/ethernet/renesas/ravb_main.c 2018-11-21 19:47:58.165498803 +0900
@@ -1088,6 +1088,10 @@ static int ravb_phy_init(struct net_devi
phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_Pause_BIT);
phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_Asym_Pause_BIT);
+ /* Half Duplex is not supported */
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Half_BIT);
+
phy_attached_info(phydev);
return 0;
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v3 02/02] ravb: Clean up duplex handling
2018-11-21 11:21 [PATCH v3 00/02] ravb: Duplex handling update V3 Magnus Damm
2018-11-21 11:21 ` [PATCH v3 01/02] ravb: Do not announce HDX as supported Magnus Damm
@ 2018-11-21 11:21 ` Magnus Damm
2018-11-23 19:15 ` [PATCH v3 00/02] ravb: Duplex handling update V3 David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Magnus Damm @ 2018-11-21 11:21 UTC (permalink / raw)
To: netdev; +Cc: linux-renesas-soc, Magnus Damm, davem, sergei.shtylyov
From: Magnus Damm <damm+renesas@opensource.se>
Since only full-duplex operation is supported by the
hardware, remove duplex handling code and keep the
register setting of ECMR.DM fixed at 1.
This updates the driver implementation to follow the
data sheet text "This bit should always be set to 1."
Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper")
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
Applies on top of next-20181121
drivers/net/ethernet/renesas/ravb.h | 1 -
drivers/net/ethernet/renesas/ravb_main.c | 19 +------------------
2 files changed, 1 insertion(+), 19 deletions(-)
--- 0001/drivers/net/ethernet/renesas/ravb.h
+++ work/drivers/net/ethernet/renesas/ravb.h 2018-11-21 19:50:04.477121118 +0900
@@ -1032,7 +1032,6 @@ struct ravb_private {
phy_interface_t phy_interface;
int msg_enable;
int speed;
- int duplex;
int emac_irq;
enum ravb_chip_id chip_id;
int rx_irqs[NUM_RX_QUEUE];
--- 0002/drivers/net/ethernet/renesas/ravb_main.c
+++ work/drivers/net/ethernet/renesas/ravb_main.c 2018-11-21 19:50:04.479121223 +0900
@@ -82,13 +82,6 @@ static int ravb_config(struct net_device
return error;
}
-static void ravb_set_duplex(struct net_device *ndev)
-{
- struct ravb_private *priv = netdev_priv(ndev);
-
- ravb_modify(ndev, ECMR, ECMR_DM, priv->duplex ? ECMR_DM : 0);
-}
-
static void ravb_set_rate(struct net_device *ndev)
{
struct ravb_private *priv = netdev_priv(ndev);
@@ -406,13 +399,11 @@ error:
/* E-MAC init function */
static void ravb_emac_init(struct net_device *ndev)
{
- struct ravb_private *priv = netdev_priv(ndev);
-
/* Receive frame limit set register */
ravb_write(ndev, ndev->mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN, RFLR);
/* EMAC Mode: PAUSE prohibition; Duplex; RX Checksum; TX; RX */
- ravb_write(ndev, ECMR_ZPF | (priv->duplex ? ECMR_DM : 0) |
+ ravb_write(ndev, ECMR_ZPF | ECMR_DM |
(ndev->features & NETIF_F_RXCSUM ? ECMR_RCSC : 0) |
ECMR_TE | ECMR_RE, ECMR);
@@ -995,12 +986,6 @@ static void ravb_adjust_link(struct net_
ravb_rcv_snd_disable(ndev);
if (phydev->link) {
- if (phydev->duplex != priv->duplex) {
- new_state = true;
- priv->duplex = phydev->duplex;
- ravb_set_duplex(ndev);
- }
-
if (phydev->speed != priv->speed) {
new_state = true;
priv->speed = phydev->speed;
@@ -1015,7 +1000,6 @@ static void ravb_adjust_link(struct net_
new_state = true;
priv->link = 0;
priv->speed = 0;
- priv->duplex = -1;
}
/* Enable TX and RX right over here, if E-MAC change is ignored */
@@ -1045,7 +1029,6 @@ static int ravb_phy_init(struct net_devi
priv->link = 0;
priv->speed = 0;
- priv->duplex = -1;
/* Try connecting to PHY */
pn = of_parse_phandle(np, "phy-handle", 0);
^ permalink raw reply [flat|nested] 4+ messages in thread