fa79baf4a6
Copy backport, hack, pending patch and config from 5.15 to 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
82 lines
2.6 KiB
Diff
82 lines
2.6 KiB
Diff
From c49f1a8af6bcf6d18576bca898f8083ca4b129e1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Tue, 4 Apr 2023 18:21:43 +0100
|
|
Subject: [PATCH] nvmem: u-boot-env: post-process "ethaddr" env variable
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230404172148.82422-36-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/Kconfig | 1 +
|
|
drivers/nvmem/u-boot-env.c | 26 ++++++++++++++++++++++++++
|
|
2 files changed, 27 insertions(+)
|
|
|
|
--- a/drivers/nvmem/Kconfig
|
|
+++ b/drivers/nvmem/Kconfig
|
|
@@ -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
|
|
--- 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,25 @@ static int u_boot_env_read(void *context
|
|
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
|
|
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))
|