[PATCH 4/7] ath9k: Add support for reading the MAC address with nvmem
From: Alban <albeu@free.fr>
Date: 2017-03-13 21:07:09
Also in:
linux-wireless, lkml
Subsystem:
atheros ath generic utilities, qualcomm atheros ath9k wireless driver, the rest · Maintainers:
Jeff Johnson, Toke Høiland-Jørgensen, Linus Torvalds
On embedded platforms the MAC address is often stored in flash, use nvmem to read it if the platform data or DT didn't specify one. Signed-off-by: Alban <albeu@free.fr> --- drivers/net/wireless/ath/ath9k/init.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 054f254..36b51a5 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c@@ -594,6 +594,35 @@ static int ath9k_of_init(struct ath_softc *sc) return 0; } +static int ath9k_get_nvmem_address(struct ath_softc *sc) +{ + struct ath_common *common = ath9k_hw_common(sc->sc_ah); + struct nvmem_cell *cell; + size_t cell_size; + int err = 0; + void *mac; + + cell = nvmem_cell_get(sc->dev, "address"); + if (IS_ERR(cell)) + return PTR_ERR(cell); + + mac = nvmem_cell_read(cell, &cell_size); + nvmem_cell_put(cell); + + if (IS_ERR(mac)) + return PTR_ERR(mac); + + if (cell_size == 6) { + ether_addr_copy(common->macaddr, mac); + } else { + dev_err(sc->dev, "nvmem 'address' cell has invalid size\n"); + err = -EINVAL; + } + + kfree(mac); + return err; +} + static int ath9k_init_softc(u16 devid, struct ath_softc *sc, const struct ath_bus_ops *bus_ops) {
@@ -656,6 +685,10 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, if (ret) return ret; + /* If no MAC address has been set yet try to use nvmem */ + if (!is_valid_ether_addr(common->macaddr)) + ath9k_get_nvmem_address(sc); + /* If the EEPROM hasn't been retrieved via firmware request * use the nvmem API insted. */
--
2.7.4