target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch

   1 From 844c273286f328acf0dab5fbd5d864366b4904dc Mon Sep 17 00:00:00 2001
   2 From: Ansuel Smith <ansuelsmth@gmail.com>
   3 Date: Tue, 30 Mar 2021 18:21:14 +0200
   4 Subject: [PATCH] of_net: add mac-address-increment support
   5
   6 Lots of embedded devices use the mac-address of other interface
   7 extracted from nvmem cells and increments it by one or two. Add two
   8 bindings to integrate this and directly use the right mac-address for
   9 the interface. Some example are some routers that use the gmac
  10 mac-address stored in the art partition and increments it by one for the
  11 wifi. mac-address-increment-byte bindings is used to tell what byte of
  12 the mac-address has to be increased (if not defined the last byte is
  13 increased) and mac-address-increment tells how much the byte decided
  14 early has to be increased.
  15
  16 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  17 ---
  18  drivers/of/of_net.c | 43 +++++++++++++++++++++++++++++++++++++++----
  19  1 file changed, 39 insertions(+), 4 deletions(-)
  20
  21 --- a/drivers/of/of_net.c
  22 +++ b/drivers/of/of_net.c
  23 @@ -115,27 +115,62 @@ static int of_get_mac_addr_nvmem(struct
  24   * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
  25   * but is all zeros.
  26   *
  27 + * DT can tell the system to increment the mac-address after is extracted by
  28 + * using:
  29 + * - mac-address-increment-byte to decide what byte to increase
  30 + *   (if not defined is increased the last byte)
  31 + * - mac-address-increment to decide how much to increase. The value WILL
  32 + *   overflow to other bytes if the increment is over 255 or the total
  33 + *   increment will exceed 255 of the current byte.
  34 + *   (example 00:01:02:03:04:ff + 1 == 00:01:02:03:05:00)
  35 + *   (example 00:01:02:03:04:fe + 5 == 00:01:02:03:05:03)
  36 + *
  37   * Return: 0 on success and errno in case of error.
  38  */
  39  int of_get_mac_address(struct device_node *np, u8 *addr)
  40  {
  41 +       u32 inc_idx, mac_inc, mac_val;
  42         int ret;
  43
  44 +       /* Check first if the increment byte is present and valid.
  45 +        * If not set assume to increment the last byte if found.
  46 +        */
  47 +       if (of_property_read_u32(np, "mac-address-increment-byte", &inc_idx))
  48 +               inc_idx = 5;
  49 +       if (inc_idx < 3 || inc_idx > 5)
  50 +               return -EINVAL;
  51 +
  52         if (!np)
  53                 return -ENODEV;
  54
  55         ret = of_get_mac_addr(np, "mac-address", addr);
  56         if (!ret)
  57 -               return 0;
  58 +               goto found;
  59
  60         ret = of_get_mac_addr(np, "local-mac-address", addr);
  61         if (!ret)
  62 -               return 0;
  63 +               goto found;
  64
  65         ret = of_get_mac_addr(np, "address", addr);
  66         if (!ret)
  67 -               return 0;
  68 +               goto found;
  69 +
  70 +       ret = of_get_mac_addr_nvmem(np, addr);
  71 +       if (ret)
  72 +               return ret;
  73 +
  74 +found:
  75 +       if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) {
  76 +               /* Convert to a contiguous value */
  77 +               mac_val = (addr[3] << 16) + (addr[4] << 8) + addr[5];
  78 +               mac_val += mac_inc << 8 * (5-inc_idx);
  79 +
  80 +               /* Apply the incremented value handling overflow case */
  81 +               addr[3] = (mac_val >> 16) & 0xff;
  82 +               addr[4] = (mac_val >> 8) & 0xff;
  83 +               addr[5] = (mac_val >> 0) & 0xff;
  84 +       }
  85
  86 -       return of_get_mac_addr_nvmem(np, addr);
  87 +       return ret;
  88  }
  89  EXPORT_SYMBOL(of_get_mac_address);