| Message ID | 20181113140133.17385-11-brgl@bgdev.pl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | at24: remove | expand |
wt., 13 lis 2018 o 15:02 Bartosz Golaszewski <brgl@bgdev.pl> napisał(a): > > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > We already have of_get_nvmem_mac_address() but some non-DT systems want > to read the MAC address from NVMEM too. Implement a generalized routine > that takes struct device as argument. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > --- > include/linux/etherdevice.h | 1 + > net/ethernet/eth.c | 38 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 39 insertions(+) > > diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h > index 572e11bb8696..2c0af7b00715 100644 > --- a/include/linux/etherdevice.h > +++ b/include/linux/etherdevice.h > @@ -32,6 +32,7 @@ > struct device; > int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr); > unsigned char *arch_get_platform_mac_address(void); > +int nvmem_get_mac_address(struct device *dev, void *addrbuf); > u32 eth_get_headlen(void *data, unsigned int max_len); > __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev); > extern const struct header_ops eth_header_ops; > diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c > index fd8faa0dfa61..df38593d1bb4 100644 > --- a/net/ethernet/eth.c > +++ b/net/ethernet/eth.c > @@ -47,6 +47,7 @@ > #include <linux/inet.h> > #include <linux/ip.h> > #include <linux/netdevice.h> > +#include <linux/nvmem-consumer.h> > #include <linux/etherdevice.h> > #include <linux/skbuff.h> > #include <linux/errno.h> > @@ -548,3 +549,40 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) > return 0; > } > EXPORT_SYMBOL(eth_platform_get_mac_address); > + > +/** > + * Obtain the MAC address from an nvmem cell named 'mac-address' associated > + * with given device. > + * > + * @dev: Device with which the mac-address cell is associated. > + * @addrbuf: Buffer to which the MAC address will be copied on success. > + * > + * Returns 0 on success or a negative error number on failure. > + */ > +int nvmem_get_mac_address(struct device *dev, void *addrbuf) > +{ > + struct nvmem_cell *cell; > + const void *mac; > + size_t len; > + > + 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); > + > + if (len != ETH_ALEN || !is_valid_ether_addr(mac)) { > + kfree(mac); > + return -EINVAL; > + } > + > + ether_addr_copy(addrbuf, mac); > + kfree(mac); > + > + return 0; > +} > +EXPORT_SYMBOL(nvmem_get_mac_address); > -- > 2.19.1 > If there are no objections - can patches 10-13 go into the networking tree already so that they spend some time in next before the merge window? Best regards, Bartosz Golaszewski
From: Bartosz Golaszewski <brgl@bgdev.pl> Date: Thu, 29 Nov 2018 17:45:51 +0100 > If there are no objections - can patches 10-13 go into the networking > tree already so that they spend some time in next before the merge > window? Please submit them as a separate series, clearly targetted at the net-next tree.
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 572e11bb8696..2c0af7b00715 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -32,6 +32,7 @@ struct device; int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr); unsigned char *arch_get_platform_mac_address(void); +int nvmem_get_mac_address(struct device *dev, void *addrbuf); u32 eth_get_headlen(void *data, unsigned int max_len); __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev); extern const struct header_ops eth_header_ops; diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index fd8faa0dfa61..df38593d1bb4 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -47,6 +47,7 @@ #include <linux/inet.h> #include <linux/ip.h> #include <linux/netdevice.h> +#include <linux/nvmem-consumer.h> #include <linux/etherdevice.h> #include <linux/skbuff.h> #include <linux/errno.h> @@ -548,3 +549,40 @@ int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr) return 0; } EXPORT_SYMBOL(eth_platform_get_mac_address); + +/** + * Obtain the MAC address from an nvmem cell named 'mac-address' associated + * with given device. + * + * @dev: Device with which the mac-address cell is associated. + * @addrbuf: Buffer to which the MAC address will be copied on success. + * + * Returns 0 on success or a negative error number on failure. + */ +int nvmem_get_mac_address(struct device *dev, void *addrbuf) +{ + struct nvmem_cell *cell; + const void *mac; + size_t len; + + 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); + + if (len != ETH_ALEN || !is_valid_ether_addr(mac)) { + kfree(mac); + return -EINVAL; + } + + ether_addr_copy(addrbuf, mac); + kfree(mac); + + return 0; +} +EXPORT_SYMBOL(nvmem_get_mac_address);