mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
c3c9ef598c
nvmem_cell_read return a pointer error when an error occurs. Currently
we convert the pointer error to an int while the rest of the function
return a void* and expcet an error pointer. Fix this PTR_ERR msuse
fixing compilation warning.
Fixes the following compilation warning:
net/ethernet/eth.c: In function 'nvmem_cell_get_mac_address':
net/ethernet/eth.c:547:24: warning: returning 'long int' from a function with return type 'void *' makes pointer from integer without a cast [-Wint-conversion]
547 | return PTR_ERR(mac);
| ^~~~~~~~~~~~
net/ethernet/eth.c: In function 'nvmem_cell_get_mac_address_ascii':
net/ethernet/eth.c:564:24: warning: returning 'long int' from a function with return type 'void *' makes pointer from integer without a cast [-Wint-conversion]
564 | return PTR_ERR(mac_ascii);
| ^~~~~~~~~~~~~~~~~~
Fixes: 7b863af180 ("kernel: move mac-address-ascii patches to generic")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
113 lines
2.7 KiB
Diff
113 lines
2.7 KiB
Diff
From: Yousong Zhou <yszhou4tech@gmail.com>
|
|
Subject: [PATCH] ath79: add nvmem cell mac-address-ascii support
|
|
|
|
This is needed for devices with mac address stored in ascii format, e.g.
|
|
HiWiFi HC6361 to be ported in the following patch.
|
|
|
|
Submitted-by: Yousong Zhou <yszhou4tech@gmail.com>
|
|
---
|
|
net/ethernet/eth.c | 83 ++++++++++++------
|
|
1 files changed, 72 insertions(+), 11 deletions(-)
|
|
|
|
--- a/net/ethernet/eth.c
|
|
+++ b/net/ethernet/eth.c
|
|
@@ -538,6 +538,63 @@ int eth_platform_get_mac_address(struct
|
|
}
|
|
EXPORT_SYMBOL(eth_platform_get_mac_address);
|
|
|
|
+static void *nvmem_cell_get_mac_address(struct nvmem_cell *cell)
|
|
+{
|
|
+ size_t len;
|
|
+ void *mac;
|
|
+
|
|
+ mac = nvmem_cell_read(cell, &len);
|
|
+ if (IS_ERR(mac))
|
|
+ return mac;
|
|
+ if (len != ETH_ALEN) {
|
|
+ kfree(mac);
|
|
+ return ERR_PTR(-EINVAL);
|
|
+ }
|
|
+ return mac;
|
|
+}
|
|
+
|
|
+static void *nvmem_cell_get_mac_address_ascii(struct nvmem_cell *cell)
|
|
+{
|
|
+ size_t len;
|
|
+ int ret;
|
|
+ void *mac_ascii;
|
|
+ u8 *mac;
|
|
+
|
|
+ mac_ascii = nvmem_cell_read(cell, &len);
|
|
+ if (IS_ERR(mac_ascii))
|
|
+ return mac_ascii;
|
|
+ if (len != ETH_ALEN*2+5) {
|
|
+ kfree(mac_ascii);
|
|
+ return ERR_PTR(-EINVAL);
|
|
+ }
|
|
+ mac = kmalloc(ETH_ALEN, GFP_KERNEL);
|
|
+ if (!mac) {
|
|
+ kfree(mac_ascii);
|
|
+ return ERR_PTR(-ENOMEM);
|
|
+ }
|
|
+ ret = sscanf(mac_ascii, "%2hhx:%2hhx:%2hhx:%2hhx:%2hhx:%2hhx",
|
|
+ &mac[0], &mac[1], &mac[2],
|
|
+ &mac[3], &mac[4], &mac[5]);
|
|
+ kfree(mac_ascii);
|
|
+ if (ret == ETH_ALEN)
|
|
+ return mac;
|
|
+ kfree(mac);
|
|
+ return ERR_PTR(-EINVAL);
|
|
+}
|
|
+
|
|
+static struct nvmem_cell_mac_address_property {
|
|
+ char *name;
|
|
+ void *(*read)(struct nvmem_cell *);
|
|
+} nvmem_cell_mac_address_properties[] = {
|
|
+ {
|
|
+ .name = "mac-address",
|
|
+ .read = nvmem_cell_get_mac_address,
|
|
+ }, {
|
|
+ .name = "mac-address-ascii",
|
|
+ .read = nvmem_cell_get_mac_address_ascii,
|
|
+ },
|
|
+};
|
|
+
|
|
/**
|
|
* nvmem_get_mac_address - Obtain the MAC address from an nvmem cell named
|
|
* 'mac-address' associated with given device.
|
|
@@ -551,19 +608,23 @@ int nvmem_get_mac_address(struct device
|
|
{
|
|
struct nvmem_cell *cell;
|
|
const void *mac;
|
|
- size_t len;
|
|
+ struct nvmem_cell_mac_address_property *property;
|
|
+ int i;
|
|
|
|
- cell = nvmem_cell_get(dev, "mac-address");
|
|
- if (IS_ERR(cell))
|
|
- return PTR_ERR(cell);
|
|
-
|
|
- mac = nvmem_cell_read(cell, &len);
|
|
- nvmem_cell_put(cell);
|
|
-
|
|
- if (IS_ERR(mac))
|
|
- return PTR_ERR(mac);
|
|
+ for (i = 0; i < ARRAY_SIZE(nvmem_cell_mac_address_properties); i++) {
|
|
+ property = &nvmem_cell_mac_address_properties[i];
|
|
+ cell = nvmem_cell_get(dev, property->name);
|
|
+ if (IS_ERR(cell)) {
|
|
+ if (i == ARRAY_SIZE(nvmem_cell_mac_address_properties) - 1)
|
|
+ return PTR_ERR(cell);
|
|
+ continue;
|
|
+ }
|
|
+ mac = property->read(cell);
|
|
+ nvmem_cell_put(cell);
|
|
+ break;
|
|
+ }
|
|
|
|
- if (len != ETH_ALEN || !is_valid_ether_addr(mac)) {
|
|
+ if (!is_valid_ether_addr(mac)) {
|
|
kfree(mac);
|
|
return -EINVAL;
|
|
}
|