aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@microchip.com>2018-09-14 11:48:10 -0400
committerDavid S. Miller <davem@davemloft.net>2018-09-17 10:53:21 -0400
commiteb4ed8e2d7fecb5f40db38e4498b9ee23cddf196 (patch)
tree3c63c4db7c5f0753299905e49c6d9c0a3e92a21f
parent41948ccb4a856dddacfbd4d789d4fa8663fe41bb (diff)
net: macb: disable scatter-gather for macb on sama5d3
Create a new configuration for the sama5d3-macb new compatibility string. This configuration disables scatter-gather because we experienced lock down of the macb interface of this particular SoC under very high load. Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/cadence/macb_main.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 16e4ef7d7185..f1a86b422617 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3837,6 +3837,13 @@ static const struct macb_config at91sam9260_config = {
3837 .init = macb_init, 3837 .init = macb_init,
3838}; 3838};
3839 3839
3840static const struct macb_config sama5d3macb_config = {
3841 .caps = MACB_CAPS_SG_DISABLED
3842 | MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,
3843 .clk_init = macb_clk_init,
3844 .init = macb_init,
3845};
3846
3840static const struct macb_config pc302gem_config = { 3847static const struct macb_config pc302gem_config = {
3841 .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE, 3848 .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,
3842 .dma_burst_length = 16, 3849 .dma_burst_length = 16,
@@ -3904,6 +3911,7 @@ static const struct of_device_id macb_dt_ids[] = {
3904 { .compatible = "cdns,gem", .data = &pc302gem_config }, 3911 { .compatible = "cdns,gem", .data = &pc302gem_config },
3905 { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config }, 3912 { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },
3906 { .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config }, 3913 { .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },
3914 { .compatible = "atmel,sama5d3-macb", .data = &sama5d3macb_config },
3907 { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config }, 3915 { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
3908 { .compatible = "cdns,at91rm9200-emac", .data = &emac_config }, 3916 { .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
3909 { .compatible = "cdns,emac", .data = &emac_config }, 3917 { .compatible = "cdns,emac", .data = &emac_config },