Patch "net: macb: fix default configuration for GMAC on AT91" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: macb: fix default configuration for GMAC on AT91
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-macb-fix-default-configuration-for-gmac-on-at91.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Wed Jul 6 16:50:47 PDT 2016
From: Nicolas Ferre <[email protected]>
Date: Thu, 10 Mar 2016 16:44:32 +0100
Subject: net: macb: fix default configuration for GMAC on AT91
From: Nicolas Ferre <[email protected]>
[ Upstream commit 6bdaa5e9ed39b3b3328f35d218e8ad5a99cfc4d2 ]
On AT91 SoCs, the User Register (USRIO) exposes a switch to configure the "Reduced" or "Traditional" version of the Media Independent Interface (RMII vs. MII or RGMII vs. GMII).
As on the older EMAC version, on GMAC, this switch is set by default to the non-reduced type of interface, so use the existing capability and extend it to GMII as well. We then keep the current logic in the macb_init() function.
The capabilities of sama5d2, sama5d4 and sama5d3 GEM interface are updated in the macb_config structure to be able to properly enable them with a traditional interface (GMII or MII).
--- drivers/net/ethernet/cadence/macb.c | 13 +++++++------ drivers/net/ethernet/cadence/macb.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-)
drivers/net/ethernet/cadence/macb.c +7 -6
@@ -2405,9 +2405,9 @@ static int macb_init(struct platform_devif (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 )) + (bp->caps &MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII )) val =MACB_BIT (RMII ); -else if (!(bp->caps &MACB_CAPS_USRIO_DEFAULT_IS_MII )) +else if (!(bp->caps &MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII )) val =MACB_BIT (MII );if (bp->caps &MACB_CAPS_USRIO_HAS_CLKEN )
@@ -2738,7 +2738,7 @@ static int at91ether_init(struct platfor }static const struct macb_config at91sam9260_config = { - .caps =MACB_CAPS_USRIO_HAS_CLKEN |MACB_CAPS_USRIO_DEFAULT_IS_MII , + .caps =MACB_CAPS_USRIO_HAS_CLKEN |MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII , .clk_init = macb_clk_init, .init = macb_init, };
@@ -2751,21 +2751,22 @@ static const struct macb_config pc302gem };static const struct macb_config sama5d2_config = { - .caps =0 , + .caps =MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII , .dma_burst_length =16 , .clk_init = macb_clk_init, .init = macb_init, };static const struct macb_config sama5d3_config = { - .caps =MACB_CAPS_SG_DISABLED |MACB_CAPS_GIGABIT_MODE_AVAILABLE , + .caps =MACB_CAPS_SG_DISABLED |MACB_CAPS_GIGABIT_MODE_AVAILABLE + |MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII , .dma_burst_length =16 , .clk_init = macb_clk_init, .init = macb_init, };static const struct macb_config sama5d4_config = { - .caps =0 , + .caps =MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII , .dma_burst_length =4 , .clk_init = macb_clk_init, .init = macb_init,
drivers/net/ethernet/cadence/macb.h +1 -1
@@ -398,7 +398,7 @@/* Capability mask bits */ #define MACB_CAPS_ISR_CLEAR_ON_WRITE 0x00000001#define MACB_CAPS_USRIO_HAS_CLKEN 0x00000002 -#define MACB_CAPS_USRIO_DEFAULT_IS_MII 0x00000004 +#define MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII 0x00000004#define MACB_CAPS_NO_GIGABIT_HALF 0x00000008#define MACB_CAPS_FIFO_MODE 0x10000000#define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/net-macb-fix-default-configuration-for-gmac-on-at91.patch