Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1301532

[PATCH v5 net-next 1/3] net: ethernet: cadence-macb: Add disabled usrio caps

Show all headers | View raw

On some platforms, the macb integration does not use the USRIO
register to configure the (R)MII port and clocks.
When the register is not implemented and the MACB error signal
is connected to the bus error, reading or writing to the USRIO
register can trigger some Imprecise External Aborts on ARM platforms.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/net/ethernet/cadence/macb.c | 27 +++++++++++++++------------
 drivers/net/ethernet/cadence/macb.h |  1 +
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 8b45bc9..fa53bc3 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2124,7 +2124,8 @@ static void macb_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 	regs_buff[10] = macb_tx_dma(&bp->queues[0], tail);
 	regs_buff[11] = macb_tx_dma(&bp->queues[0], head);
 
-	regs_buff[12] = macb_or_gem_readl(bp, USRIO);
+	if (!(bp->caps & MACB_CAPS_USRIO_DISABLED))
+		regs_buff[12] = macb_or_gem_readl(bp, USRIO);
 	if (macb_is_gem(bp)) {
 		regs_buff[13] = gem_readl(bp, DMACFG);
 	}
@@ -2403,19 +2404,21 @@ static int macb_init(struct platform_device *pdev)
 		dev->hw_features &= ~NETIF_F_SG;
 	dev->features = dev->hw_features;
 
-	val = 0;
-	if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII)
-		val = GEM_BIT(RGMII);
-	else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII &&
-		 (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII))
-		val = MACB_BIT(RMII);
-	else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII))
-		val = MACB_BIT(MII);
+	if (!(bp->caps & MACB_CAPS_USRIO_DISABLED)) {
+		val = 0;
+		if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII)
+			val = GEM_BIT(RGMII);
+		else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII &&
+			 (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII))
+			val = MACB_BIT(RMII);
+		else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII))
+			val = MACB_BIT(MII);
 
-	if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN)
-		val |= MACB_BIT(CLKEN);
+		if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN)
+			val |= MACB_BIT(CLKEN);
 
-	macb_or_gem_writel(bp, USRIO, val);
+		macb_or_gem_writel(bp, USRIO, val);
+	}
 
 	/* Set MII management clock divider */
 	val = macb_mdc_clk_div(bp);
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 5c03e81..0d4ecfc 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -400,6 +400,7 @@
 #define MACB_CAPS_USRIO_HAS_CLKEN		0x00000002
 #define MACB_CAPS_USRIO_DEFAULT_IS_MII		0x00000004
 #define MACB_CAPS_NO_GIGABIT_HALF		0x00000008
+#define MACB_CAPS_USRIO_DISABLED		0x00000010
 #define MACB_CAPS_FIFO_MODE			0x10000000
 #define MACB_CAPS_GIGABIT_MODE_AVAILABLE	0x20000000
 #define MACB_CAPS_SG_DISABLED			0x40000000
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 net-next] net: ethernet: cadence-macb: Add disabled usrio caps Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:10 +0100
  Re: [PATCH v3 net-next] net: ethernet: cadence-macb: Add disabled  usrio caps Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-04 10:30 +0100
  [PATCH v4 net-next 1/3] net: ethernet: cadence-macb: Add disabled usrio caps Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:50 +0100
  [PATCH v4 net-next 3/3] dt-bindings: net: macb: Add NPx macb variant Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:50 +0100
  [PATCH v4 net-next 0/3] Add new capability and macb DT variant Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:50 +0100
    [PATCH v4 net-next 2/3] net: macb: Add NPx macb config using USRIO_DISABLED cap Neil Armstrong <narmstrong@baylibre.com> - 2016-01-04 10:50 +0100
      Re: [PATCH v4 net-next 2/3] net: macb: Add NPx macb config using  USRIO_DISABLED cap Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-04 11:40 +0100
        Re: [PATCH v4 net-next 2/3] net: macb: Add NPx macb config using  USRIO_DISABLED cap Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 13:30 +0100
          Re: [PATCH v4 net-next 2/3] net: macb: Add NPx macb config using  USRIO_DISABLED cap Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-05 14:30 +0100
    [PATCH v5 net-next 0/3] Add new capability and macb DT variant Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 14:40 +0100
      [PATCH v5 net-next 1/3] net: ethernet: cadence-macb: Add disabled usrio caps Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 14:40 +0100
        Re: [PATCH v5 net-next 1/3] net: ethernet: cadence-macb: Add disabled  usrio caps Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-05 14:50 +0100
      [PATCH v5 net-next 3/3] dt-bindings: net: macb: Add NP4 macb variant Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 14:50 +0100
        Re: [PATCH v5 net-next 3/3] dt-bindings: net: macb: Add NP4 macb  variant Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-05 14:50 +0100
        Re: [PATCH v5 net-next 3/3] dt-bindings: net: macb: Add NP4 macb  variant Rob Herring <robh@kernel.org> - 2016-01-06 16:00 +0100
      [PATCH v5 net-next 2/3] net: macb: Add NP4 macb config using USRIO_DISABLED Neil Armstrong <narmstrong@baylibre.com> - 2016-01-05 14:50 +0100
        Re: [PATCH v5 net-next 2/3] net: macb: Add NP4 macb config using  USRIO_DISABLED Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-01-05 14:50 +0100
      Re: [PATCH v5 net-next 0/3] Add new capability and macb DT variant David Miller <davem@davemloft.net> - 2016-01-07 22:30 +0100

csiph-web