Commit c49f1a8a authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Greg Kroah-Hartman
Browse files

nvmem: u-boot-env: post-process "ethaddr" env variable 



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: default avatarRafał Miłecki <rafal@milecki.pl>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230404172148.82422-36-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 55d4980c

drivers/nvmem/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ config NVMEM_U_BOOT_ENV 
	tristate "U-Boot environment variables support"

	depends on OF && MTD

	select CRC32

	select GENERIC_NET_UTILS

	help

	  U-Boot stores its setup as environment variables. This driver adds

	  support for verifying & exporting such data. It also exposes variables

drivers/nvmem/u-boot-env.c

+26 −0
Original line number Diff line number Diff line
@@ -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,25 @@ 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 *buf, size_t bytes)

{

	u8 mac[ETH_ALEN];



	if (bytes != 3 * ETH_ALEN - 1)

		return -EINVAL;



	if (!mac_pton(buf, mac))

		return -EINVAL;



	if (index)

		eth_addr_add(mac, index);



	ether_addr_copy(buf, mac);



	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 +122,11 @@ 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].raw_len = strlen(value);

			priv->cells[idx].bytes = ETH_ALEN;

			priv->cells[idx].read_post_process = u_boot_env_read_post_process_ethaddr;

		}

	}



	if (WARN_ON(idx != priv->ncells))