In preparation for NVMEM support, split get_of_eeprom() in subfunction
to tidy the code and facilitate the addition of alternative method to
get eeprom data. No behaviour change intended.
While at it also drop OF ifdef checks as OF have stubs and calling
of_get_property would result in the same error returned.
Signed-off-by: Christian Marangi <[email protected]>
---
drivers/net/wireless/mediatek/mt76/eeprom.c | 51 ++++++++++++++-------
1 file changed, 35 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
index dce851d42e08..c3a762074be8 100644
--- a/drivers/net/wireless/mediatek/mt76/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
@@ -9,31 +9,35 @@
#include <linux/etherdevice.h>
#include "mt76.h"
-int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
+static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)
{
-#if defined(CONFIG_OF) && defined(CONFIG_MTD)
struct device_node *np = dev->dev->of_node;
- struct mtd_info *mtd;
- const __be32 *list;
const void *data;
- const char *part;
- phandle phandle;
int size;
- size_t retlen;
- int ret;
- if (!np)
+ data = of_get_property(np, "mediatek,eeprom-data", &size);
+ if (!data)
return -ENOENT;
- data = of_get_property(np, "mediatek,eeprom-data", &size);
- if (data) {
- if (size > len)
- return -EINVAL;
+ if (size > len)
+ return -EINVAL;
- memcpy(eep, data, size);
+ memcpy(eep, data, size);
- return 0;
- }
+ return 0;
+}
+
+static int mt76_get_of_epprom_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len)
+{
+#ifdef CONFIG_MTD
+ struct device_node *np = dev->dev->of_node;
+ struct mtd_info *mtd;
+ const __be32 *list;
+ const char *part;
+ phandle phandle;
+ size_t retlen;
+ int size;
+ int ret;
list = of_get_property(np, "mediatek,mtd-eeprom", &size);
if (!list)
@@ -100,6 +104,21 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
return -ENOENT;
#endif
}
+
+int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
+{
+ struct device_node *np = dev->dev->of_node;
+ int ret;
+
+ if (!np)
+ return -ENOENT;
+
+ ret = mt76_get_of_eeprom_data(dev, eep, len);
+ if (!ret)
+ return 0;
+
+ return mt76_get_of_epprom_from_mtd(dev, eep, offset, len);
+}
EXPORT_SYMBOL_GPL(mt76_get_of_eeprom);
void
--
2.40.1
Add support for providing eeprom in nvmem cells by adding nvmem cell as
an alternative source for mt76_get_of_eeprom().
Nvmem cells will follow standard nvmem cell definition and needs to be
called 'eeprom' to be correctly identified.
Signed-off-by: Christian Marangi <[email protected]>
---
drivers/net/wireless/mediatek/mt76/eeprom.c | 38 ++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
index c3a762074be8..36564930aef1 100644
--- a/drivers/net/wireless/mediatek/mt76/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
@@ -6,6 +6,7 @@
#include <linux/of_net.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
+#include <linux/nvmem-consumer.h>
#include <linux/etherdevice.h>
#include "mt76.h"
@@ -105,6 +106,37 @@ static int mt76_get_of_epprom_from_mtd(struct mt76_dev *dev, void *eep, int offs
#endif
}
+static int mt76_get_of_epprom_from_nvmem(struct mt76_dev *dev, void *eep, int len)
+{
+ struct device_node *np = dev->dev->of_node;
+ struct nvmem_cell *cell;
+ const void *data;
+ size_t retlen;
+ int ret = 0;
+
+ cell = of_nvmem_cell_get(np, "eeprom");
+ if (IS_ERR(cell))
+ return PTR_ERR(cell);
+
+ data = nvmem_cell_read(cell, &retlen);
+ nvmem_cell_put(cell);
+
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
+ if (retlen < len) {
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ memcpy(eep, data, len);
+
+exit:
+ kfree(data);
+
+ return ret;
+}
+
int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
{
struct device_node *np = dev->dev->of_node;
@@ -117,7 +149,11 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
if (!ret)
return 0;
- return mt76_get_of_epprom_from_mtd(dev, eep, offset, len);
+ ret = mt76_get_of_epprom_from_mtd(dev, eep, offset, len);
+ if (!ret)
+ return 0;
+
+ return mt76_get_of_epprom_from_nvmem(dev, eep, len);
}
EXPORT_SYMBOL_GPL(mt76_get_of_eeprom);
--
2.40.1
On Sat, Jul 08, 2023 at 08:29:35PM +0200, Christian Marangi wrote:
> In preparation for NVMEM support, split get_of_eeprom() in subfunction
> to tidy the code and facilitate the addition of alternative method to
> get eeprom data. No behaviour change intended.
>
> While at it also drop OF ifdef checks as OF have stubs and calling
> of_get_property would result in the same error returned.
>
> Signed-off-by: Christian Marangi <[email protected]>
Reviewed-by: Daniel Golle <[email protected]>
Tested-by: Daniel Golle <[email protected]>
> ---
> drivers/net/wireless/mediatek/mt76/eeprom.c | 51 ++++++++++++++-------
> 1 file changed, 35 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
> index dce851d42e08..c3a762074be8 100644
> --- a/drivers/net/wireless/mediatek/mt76/eeprom.c
> +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
> @@ -9,31 +9,35 @@
> #include <linux/etherdevice.h>
> #include "mt76.h"
>
> -int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
> +static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)
> {
> -#if defined(CONFIG_OF) && defined(CONFIG_MTD)
> struct device_node *np = dev->dev->of_node;
> - struct mtd_info *mtd;
> - const __be32 *list;
> const void *data;
> - const char *part;
> - phandle phandle;
> int size;
> - size_t retlen;
> - int ret;
>
> - if (!np)
> + data = of_get_property(np, "mediatek,eeprom-data", &size);
> + if (!data)
> return -ENOENT;
>
> - data = of_get_property(np, "mediatek,eeprom-data", &size);
> - if (data) {
> - if (size > len)
> - return -EINVAL;
> + if (size > len)
> + return -EINVAL;
>
> - memcpy(eep, data, size);
> + memcpy(eep, data, size);
>
> - return 0;
> - }
> + return 0;
> +}
> +
> +static int mt76_get_of_epprom_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len)
> +{
> +#ifdef CONFIG_MTD
> + struct device_node *np = dev->dev->of_node;
> + struct mtd_info *mtd;
> + const __be32 *list;
> + const char *part;
> + phandle phandle;
> + size_t retlen;
> + int size;
> + int ret;
>
> list = of_get_property(np, "mediatek,mtd-eeprom", &size);
> if (!list)
> @@ -100,6 +104,21 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
> return -ENOENT;
> #endif
> }
> +
> +int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
> +{
> + struct device_node *np = dev->dev->of_node;
> + int ret;
> +
> + if (!np)
> + return -ENOENT;
> +
> + ret = mt76_get_of_eeprom_data(dev, eep, len);
> + if (!ret)
> + return 0;
> +
> + return mt76_get_of_epprom_from_mtd(dev, eep, offset, len);
> +}
> EXPORT_SYMBOL_GPL(mt76_get_of_eeprom);
>
> void
> --
> 2.40.1
>
>
On Sat, Jul 08, 2023 at 08:29:36PM +0200, Christian Marangi wrote:
> Add support for providing eeprom in nvmem cells by adding nvmem cell as
> an alternative source for mt76_get_of_eeprom().
>
> Nvmem cells will follow standard nvmem cell definition and needs to be
> called 'eeprom' to be correctly identified.
>
> Signed-off-by: Christian Marangi <[email protected]>
Reviewed-by: Daniel Golle <[email protected]>
Tested-by: Daniel Golle <[email protected]>
> ---
> drivers/net/wireless/mediatek/mt76/eeprom.c | 38 ++++++++++++++++++++-
> 1 file changed, 37 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
> index c3a762074be8..36564930aef1 100644
> --- a/drivers/net/wireless/mediatek/mt76/eeprom.c
> +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
> @@ -6,6 +6,7 @@
> #include <linux/of_net.h>
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/partitions.h>
> +#include <linux/nvmem-consumer.h>
> #include <linux/etherdevice.h>
> #include "mt76.h"
>
> @@ -105,6 +106,37 @@ static int mt76_get_of_epprom_from_mtd(struct mt76_dev *dev, void *eep, int offs
> #endif
> }
>
> +static int mt76_get_of_epprom_from_nvmem(struct mt76_dev *dev, void *eep, int len)
> +{
> + struct device_node *np = dev->dev->of_node;
> + struct nvmem_cell *cell;
> + const void *data;
> + size_t retlen;
> + int ret = 0;
> +
> + cell = of_nvmem_cell_get(np, "eeprom");
> + if (IS_ERR(cell))
> + return PTR_ERR(cell);
> +
> + data = nvmem_cell_read(cell, &retlen);
> + nvmem_cell_put(cell);
> +
> + if (IS_ERR(data))
> + return PTR_ERR(data);
> +
> + if (retlen < len) {
> + ret = -EINVAL;
> + goto exit;
> + }
> +
> + memcpy(eep, data, len);
> +
> +exit:
> + kfree(data);
> +
> + return ret;
> +}
> +
> int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
> {
> struct device_node *np = dev->dev->of_node;
> @@ -117,7 +149,11 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len)
> if (!ret)
> return 0;
>
> - return mt76_get_of_epprom_from_mtd(dev, eep, offset, len);
> + ret = mt76_get_of_epprom_from_mtd(dev, eep, offset, len);
> + if (!ret)
> + return 0;
> +
> + return mt76_get_of_epprom_from_nvmem(dev, eep, len);
> }
> EXPORT_SYMBOL_GPL(mt76_get_of_eeprom);
>
> --
> 2.40.1
>
>
On 8.07.2023 20:29, Christian Marangi wrote:
> In preparation for NVMEM support, split get_of_eeprom() in subfunction
> to tidy the code and facilitate the addition of alternative method to
> get eeprom data. No behaviour change intended.
>
> While at it also drop OF ifdef checks as OF have stubs and calling
> of_get_property would result in the same error returned.
>
> Signed-off-by: Christian Marangi <[email protected]>
Reviewed-by: Rafał Miłecki <[email protected]>
On 8.07.2023 20:29, Christian Marangi wrote:
> Add support for providing eeprom in nvmem cells by adding nvmem cell as
> an alternative source for mt76_get_of_eeprom().
>
> Nvmem cells will follow standard nvmem cell definition and needs to be
> called 'eeprom' to be correctly identified.
>
> Signed-off-by: Christian Marangi <[email protected]>
Reviewed-by: Rafał Miłecki <[email protected]>