123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124 |
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
- Date: Thu, 13 Jul 2023 18:29:19 +0200
- Subject: [PATCH] nvmem: core: support "mac-base" fixed layout cells
- Fixed layout binding allows specifying "mac-base" NVMEM cells. It's used
- for base MAC address (that can be used for calculating relative
- addresses). It can be stored in a raw binary format or as an ASCII
- string.
- ---
- --- a/drivers/nvmem/Kconfig
- +++ b/drivers/nvmem/Kconfig
- @@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- menuconfig NVMEM
- bool "NVMEM Support"
- + select GENERIC_NET_UTILS
- imply NVMEM_LAYOUTS
- help
- Support for NVMEM(Non Volatile Memory) devices like EEPROM, EFUSES...
- --- a/drivers/nvmem/core.c
- +++ b/drivers/nvmem/core.c
- @@ -7,9 +7,12 @@
- */
-
- #include <linux/device.h>
- +#include <linux/ctype.h>
- +#include <linux/etherdevice.h>
- #include <linux/export.h>
- #include <linux/fs.h>
- #include <linux/idr.h>
- +#include <linux/if_ether.h>
- #include <linux/init.h>
- #include <linux/kref.h>
- #include <linux/module.h>
- @@ -780,6 +783,62 @@ static int nvmem_validate_keepouts(struc
- return 0;
- }
-
- +static int nvmem_mac_base_raw_read(void *context, const char *id, int index, unsigned int offset,
- + void *buf, size_t bytes)
- +{
- + if (WARN_ON(bytes != ETH_ALEN))
- + return -EINVAL;
- +
- + if (index)
- + eth_addr_add(buf, index);
- +
- + return 0;
- +}
- +
- +static int nvmem_mac_base_ascii_read(void *context, const char *id, int index, unsigned int offset,
- + void *buf, size_t bytes)
- +{
- + u8 mac[ETH_ALEN];
- +
- + if (WARN_ON(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 nvmem_mac_base_hex_read(void *context, const char *id, int index, unsigned int offset,
- + void *buf, size_t bytes)
- +{
- + u8 mac[ETH_ALEN], *hexstr;
- + int i;
- +
- + if (WARN_ON(bytes != 2 * ETH_ALEN))
- + return -EINVAL;
- +
- + hexstr = (u8 *)buf;
- + for (i = 0; i < ETH_ALEN; i++) {
- + if (!isxdigit(hexstr[i * 2]) || !isxdigit(hexstr[i * 2 + 1]))
- + return -EINVAL;
- +
- + mac[i] = (hex_to_bin(hexstr[i * 2]) << 4) | hex_to_bin(hexstr[i * 2 + 1]);
- + }
- +
- + if (index)
- + eth_addr_add(mac, index);
- +
- + ether_addr_copy(buf, mac);
- +
- + return 0;
- +}
- +
- static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
- {
- struct device *dev = &nvmem->dev;
- @@ -814,6 +873,25 @@ static int nvmem_add_cells_from_dt(struc
- if (nvmem->fixup_dt_cell_info)
- nvmem->fixup_dt_cell_info(nvmem, &info);
-
- + if (of_device_is_compatible(np, "fixed-layout")) {
- + if (of_device_is_compatible(child, "mac-base")) {
- + if (info.bytes == ETH_ALEN) {
- + info.raw_len = info.bytes;
- + info.bytes = ETH_ALEN;
- + info.read_post_process = nvmem_mac_base_raw_read;
- + } else if (info.bytes == 2 * ETH_ALEN) {
- + info.raw_len = info.bytes;
- + info.bytes = ETH_ALEN;
- + info.read_post_process = nvmem_mac_base_hex_read;
- + } else if (info.bytes == 3 * ETH_ALEN - 1) {
- + info.raw_len = info.bytes;
- + info.bytes = ETH_ALEN;
- + info.read_post_process = nvmem_mac_base_ascii_read;
- + }
- +
- + }
- + }
- +
- ret = nvmem_add_one_cell(nvmem, &info);
- kfree(info.name);
- if (ret) {
|