target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch

   1 From 096f58e564aed56936ef6de42a44c3101e9b8ed1 Mon Sep 17 00:00:00 2001
   2 From: Atish Patra <atish.patra@wdc.com>
   3 Date: Wed, 3 Mar 2021 11:55:49 -0800
   4 Subject: [PATCH 148/247] net: macb: Add default usrio config to default gem
   5  config
   6
   7 There is no usrio config defined for default gem config leading to
   8 a kernel panic devices that don't define a data. This issue can be
   9 reprdouced with microchip polar fire soc where compatible string
  10 is defined as "cdns,macb".
  11
  12 Fixes: edac63861db7 ("add userio bits as platform configuration")
  13
  14 Signed-off-by: Atish Patra <atish.patra@wdc.com>
  15 Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
  16 Signed-off-by: David S. Miller <davem@davemloft.net>
  17 ---
  18  drivers/net/ethernet/cadence/macb_main.c | 15 ++++++++-------
  19  1 file changed, 8 insertions(+), 7 deletions(-)
  20
  21 --- a/drivers/net/ethernet/cadence/macb_main.c
  22 +++ b/drivers/net/ethernet/cadence/macb_main.c
  23 @@ -3861,6 +3861,13 @@ static int macb_init(struct platform_dev
  24         return 0;
  25  }
  26
  27 +static const struct macb_usrio_config macb_default_usrio = {
  28 +       .mii = MACB_BIT(MII),
  29 +       .rmii = MACB_BIT(RMII),
  30 +       .rgmii = GEM_BIT(RGMII),
  31 +       .refclk = MACB_BIT(CLKEN),
  32 +};
  33 +
  34  #if defined(CONFIG_OF)
  35  /* 1518 rounded up */
  36  #define AT91ETHER_MAX_RBUFF_SZ 0x600
  37 @@ -4376,13 +4383,6 @@ static int fu540_c000_init(struct platfo
  38         return macb_init(pdev);
  39  }
  40
  41 -static const struct macb_usrio_config macb_default_usrio = {
  42 -       .mii = MACB_BIT(MII),
  43 -       .rmii = MACB_BIT(RMII),
  44 -       .rgmii = GEM_BIT(RGMII),
  45 -       .refclk = MACB_BIT(CLKEN),
  46 -};
  47 -
  48  static const struct macb_usrio_config sama7g5_usrio = {
  49         .mii = 0,
  50         .rmii = 1,
  51 @@ -4531,6 +4531,7 @@ static const struct macb_config default_
  52         .dma_burst_length = 16,
  53         .clk_init = macb_clk_init,
  54         .init = macb_init,
  55 +       .usrio = &macb_default_usrio,
  56         .jumbo_max_len = 10240,
  57  };
  58