iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: macb: Add default usrio config to default gem config

Browse Source 
There is no usrio config defined for default gem config leading to
a kernel panic devices that don't define a data. This issue can be
reprdouced with microchip polar fire soc where compatible string
is defined as "cdns,macb".

Fixes: edac63861db7 ("add userio bits as platform configuration")

Signed-off-by: Atish Patra <atish.patra@wdc.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Atish Patra 2021-03-03 11:55:49 -08:00 committed by David S. Miller
parent ef9a6df09c
commit b12422362c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/cadence/macb_main.c
View File

@ -3954,6 +3954,13 @@ static int macb_init(struct platform_device *pdev)
return 0; return 0;
} }
static const struct macb_usrio_config macb_default_usrio = {
.mii = MACB_BIT(MII),
.rmii = MACB_BIT(RMII),
.rgmii = GEM_BIT(RGMII),
.refclk = MACB_BIT(CLKEN),
};
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
/* 1518 rounded up */ /* 1518 rounded up */
#define AT91ETHER_MAX_RBUFF_SZ 0x600 #define AT91ETHER_MAX_RBUFF_SZ 0x600
@ -4439,13 +4446,6 @@ static int fu540_c000_init(struct platform_device *pdev)
return macb_init(pdev); return macb_init(pdev);
} }
static const struct macb_usrio_config macb_default_usrio = {
.mii = MACB_BIT(MII),
.rmii = MACB_BIT(RMII),
.rgmii = GEM_BIT(RGMII),
.refclk = MACB_BIT(CLKEN),
};
static const struct macb_usrio_config sama7g5_usrio = { static const struct macb_usrio_config sama7g5_usrio = {
.mii = 0, .mii = 0,
.rmii = 1, .rmii = 1,
@ -4594,6 +4594,7 @@ static const struct macb_config default_gem_config = {
.dma_burst_length = 16, .dma_burst_length = 16,
.clk_init = macb_clk_init, .clk_init = macb_clk_init,
.init = macb_init, .init = macb_init,
.usrio = &macb_default_usrio,
.jumbo_max_len = 10240, .jumbo_max_len = 10240,
}; };