mirror of https://gitee.com/openkylin/linux.git
net: ethernet: cadence-macb: Add disabled usrio caps
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> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1235817753
commit
ce721a7021
|
@ -2113,6 +2113,7 @@ 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);
|
||||
|
||||
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);
|
||||
|
@ -2392,6 +2393,7 @@ static int macb_init(struct platform_device *pdev)
|
|||
dev->hw_features &= ~NETIF_F_SG;
|
||||
dev->features = dev->hw_features;
|
||||
|
||||
if (!(bp->caps & MACB_CAPS_USRIO_DISABLED)) {
|
||||
val = 0;
|
||||
if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII)
|
||||
val = GEM_BIT(RGMII);
|
||||
|
@ -2405,6 +2407,7 @@ static int macb_init(struct platform_device *pdev)
|
|||
val |= MACB_BIT(CLKEN);
|
||||
|
||||
macb_or_gem_writel(bp, USRIO, val);
|
||||
}
|
||||
|
||||
/* Set MII management clock divider */
|
||||
val = macb_mdc_clk_div(bp);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue