[3/3] nvmem: u-boot-env: post process "ethaddr" env variable

Message ID 20230105171038.13649-3-zajec5@gmail.com
State New
Headers
Series [1/3] dt-bindings: nvmem: u-boot,env: add MAC's #nvmem-cell-cells |

Commit Message

Rafał Miłecki Jan. 5, 2023, 5:10 p.m. UTC
  From: Rafał Miłecki <rafal@milecki.pl>

U-Boot environment variables are stored in ASCII format so "ethaddr"
requires parsing into binary to make it work with Ethernet interfaces.

This includes support for indexes to support #nvmem-cell-cells = <1>.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 drivers/nvmem/u-boot-env.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
  

Comments

kernel test robot Jan. 5, 2023, 9 p.m. UTC | #1
Hi Rafał,

I love your patch! Yet something to improve:

[auto build test ERROR on next-20230105]
[cannot apply to robh/for-next shawnguo/for-next krzk-dt/for-next linus/master v6.2-rc2 v6.2-rc1 v6.1 v6.2-rc2]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Rafa-Mi-ecki/nvmem-core-allow-read_post_process-callbacks-to-adjust-data-length/20230106-012141
patch link:    https://lore.kernel.org/r/20230105171038.13649-3-zajec5%40gmail.com
patch subject: [PATCH 3/3] nvmem: u-boot-env: post process "ethaddr" env variable
config: nios2-buildonly-randconfig-r005-20230105
compiler: nios2-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/c87cc9dc60051170044407765ab613e77c55b348
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Rafa-Mi-ecki/nvmem-core-allow-read_post_process-callbacks-to-adjust-data-length/20230106-012141
        git checkout c87cc9dc60051170044407765ab613e77c55b348
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=nios2 olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=nios2 SHELL=/bin/bash

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   nios2-linux-ld: drivers/nvmem/u-boot-env.o: in function `u_boot_env_read_post_process_ethaddr':
>> u-boot-env.c:(.text+0x2ec): undefined reference to `mac_pton'
   u-boot-env.c:(.text+0x2ec): relocation truncated to fit: R_NIOS2_CALL26 against `mac_pton'
  

Patch

diff --git a/drivers/nvmem/u-boot-env.c b/drivers/nvmem/u-boot-env.c
index 2a87dda45188..54283f8061b0 100644
--- a/drivers/nvmem/u-boot-env.c
+++ b/drivers/nvmem/u-boot-env.c
@@ -4,6 +4,8 @@ 
  */
 
 #include <linux/crc32.h>
+#include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
@@ -70,6 +72,26 @@  static int u_boot_env_read(void *context, unsigned int offset, void *val,
 	return 0;
 }
 
+static int u_boot_env_read_post_process_ethaddr(void *context, const char *id, int index,
+						unsigned int offset, void *data, size_t *bytes)
+{
+	u8 mac[ETH_ALEN];
+
+	if (*bytes != 3 * ETH_ALEN - 1)
+		return -EINVAL;
+
+	if (!mac_pton(data, mac))
+		return -EINVAL;
+
+	if (index)
+		eth_addr_add(mac, index);
+
+	ether_addr_copy(data, mac);
+	*bytes = ETH_ALEN;
+
+	return 0;
+}
+
 static int u_boot_env_add_cells(struct u_boot_env *priv, uint8_t *buf,
 				size_t data_offset, size_t data_len)
 {
@@ -101,6 +123,8 @@  static int u_boot_env_add_cells(struct u_boot_env *priv, uint8_t *buf,
 		priv->cells[idx].offset = data_offset + value - data;
 		priv->cells[idx].bytes = strlen(value);
 		priv->cells[idx].np = of_get_child_by_name(dev->of_node, priv->cells[idx].name);
+		if (!strcmp(var, "ethaddr"))
+			priv->cells[idx].read_post_process = u_boot_env_read_post_process_ethaddr;
 	}
 
 	if (WARN_ON(idx != priv->ncells))