Skip to contentSkip to conversation

wifi: mt76: remove mediatek,mtd-eeprom

PATCH In review Rosen Penev 3 participants 10 messages Apr 27 – Apr 28

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover wifi: mt76: remove mediatek,mtd-eeprom

mediatek,mtd-eeprom predates nvmem which is used everywhere to grab eeprom and mac-address data from MTD devices.

Transition the one place to nvmem and remove the binding to discourage use.

Rosen Penev (3):
MIPS: dts: ralink: gardena_smart_gateway_mt7688: use nvmem for EEPROM
dt-bindings: net: wireless: mt76: remove mediatek,mtd-eeprom
wifi: mt76: remove mt76_get_of_data_from_mtd

 .../bindings/net/wireless/mediatek,mt76.yaml  | 19 +---
 .../ralink/gardena_smart_gateway_mt7688.dts   | 17 +++-
 drivers/net/wireless/mediatek/mt76/eeprom.c   | 87 -------------------
 drivers/net/wireless/mediatek/mt76/mt76.h     |  1 -
 .../wireless/mediatek/mt76/mt7915/eeprom.c    |  4 -
 5 files changed, 17 insertions(+), 111 deletions(-)

--
2.54.0

#1 lore raw

PATCH 1/3 MIPS: dts: ralink: gardena_smart_gateway_mt7688: use nvmem for EEPROM

mediatek,mtd-eeprom is a deprecated binding for extracting data on MTD devices which has been replaced by NVMEM.

The latter is already in wide use with mt76. As this is the only user, transition to NVMEM.

---
 .../dts/ralink/gardena_smart_gateway_mt7688.dts | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts +15 -2
index 0bfb1dde9764..a8a8efbaf527 100644
@@ -155,10 +155,20 @@ partition@b0000 {
 				reg = <0xb0000 0x10000>;
 			};
 
-			factory: partition@c0000 {
+			partition@c0000 {
 				label = "factory";
 				reg = <0xc0000 0x10000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#nvmem-cell-cells = <1>;
+
+					eeprom_factory_0: eeprom@0 {
+						reg = <0x0 0x400>;
+					};
+				};
 			};
 		};
 	};
@@ -201,5 +211,8 @@ &watchdog {
 
 &wmac {
 	status = "okay";
-	mediatek,mtd-eeprom = <&factory 0x0000>;
+
+	nvmem-cells = <&eeprom_factory_0>;
+	nvmem-cell-names = "eeprom"
+
 };
Signature · 1 line
2.54.0
#2 lore raw

PATCH 2/3 dt-bindings: net: wireless: mt76: remove mediatek,mtd-eeprom

In reply to Rosen Penev

mediatek,mtd-eeprom is a widely unused binding that predates and has been replaced by NVMEM. As there are no users, remove it.

---
 .../bindings/net/wireless/mediatek,mt76.yaml  | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)
Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml +2 -17
index ae6b97cdc44b..482c22cd6627 100644
@@ -87,21 +87,6 @@ properties:
     description:
       EEPROM data embedded as array.
 
-  mediatek,mtd-eeprom:
-    $ref: /schemas/types.yaml#/definitions/phandle-array
-    items:
-      - items:
-          - description: phandle to MTD partition
-          - description: offset containing EEPROM data
-    description:
-      Phandle to a MTD partition + offset containing EEPROM data
-    deprecated: true
-
-  big-endian:
-    $ref: /schemas/types.yaml#/definitions/flag
-    description:
-      Specify if the radio eeprom partition is written in big-endian
-
   mediatek,eeprom-merge-otp:
     type: boolean
     description:
@@ -314,8 +299,8 @@ examples:
         compatible = "mediatek,mt76";
         reg = <0x0000 0 0 0 0>;
         ieee80211-freq-limit = <5000000 6000000>;
-        mediatek,mtd-eeprom = <&factory 0x8000>;
-        big-endian;
+        nvmem-cells = <&eeprom>;
+        nvmem-cell-names = "eeprom";
 
         led {
           led-sources = <2>;
Signature · 1 line
2.54.0
#3 lore raw

Re: [PATCH 2/3] dt-bindings: net: wireless: mt76: remove mediatek,mtd-eeprom

Quoted 1 line · Rosen Penev

mediatek,mtd-eeprom is a widely unused binding that predates and has

I clearly see a user. Please use git grep.

Quoted 7 lines

been replaced by NVMEM. As there are no users, remove it.

---
 .../bindings/net/wireless/mediatek,mt76.yaml  | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

Wrong order of patches, you have undocumented ABI.

Best regards,
Krzysztof

#4 lore raw

PATCH 3/3 wifi: mt76: remove mt76_get_of_data_from_mtd

In reply to Rosen Penev

mt76_get_of_data_from_mtd has been replaced by
mt76_get_of_data_from_nvmem in all usages.

Remove it to prevent people from using the deprecated mediatek,mtd-eeprom binding.

---
 drivers/net/wireless/mediatek/mt76/eeprom.c   | 87 -------------------
 drivers/net/wireless/mediatek/mt76/mt76.h     |  1 -
 .../wireless/mediatek/mt76/mt7915/eeprom.c    |  4 -
 3 files changed, 92 deletions(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +0 -87
index afdb73661866..092804323d81 100644
@@ -35,89 +35,6 @@ static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)
 	return 0;
 }
 
-int mt76_get_of_data_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)
-		return -ENOENT;
-
-	phandle = be32_to_cpup(list++);
-	if (!phandle)
-		return -ENOENT;
-
-	np = of_find_node_by_phandle(phandle);
-	if (!np)
-		return -EINVAL;
-
-	part = of_get_property(np, "label", NULL);
-	if (!part)
-		part = np->name;
-
-	mtd = get_mtd_device_nm(part);
-	if (IS_ERR(mtd)) {
-		ret =  PTR_ERR(mtd);
-		goto out_put_node;
-	}
-
-	if (size <= sizeof(*list)) {
-		ret = -EINVAL;
-		goto out_put_node;
-	}
-
-	offset += be32_to_cpup(list);
-	ret = mtd_read(mtd, offset, len, &retlen, eep);
-	put_mtd_device(mtd);
-	if (mtd_is_bitflip(ret))
-		ret = 0;
-	if (ret) {
-		dev_err(dev->dev, "reading EEPROM from mtd %s failed: %i\n",
-			part, ret);
-		goto out_put_node;
-	}
-
-	if (retlen < len) {
-		ret = -EINVAL;
-		goto out_put_node;
-	}
-
-	if (of_property_read_bool(dev->dev->of_node, "big-endian")) {
-		u8 *data = (u8 *)eep;
-		int i;
-
-		/* convert eeprom data in Little Endian */
-		for (i = 0; i < round_down(len, 2); i += 2)
-			put_unaligned_le16(get_unaligned_be16(&data[i]),
-					   &data[i]);
-	}
-
-#ifdef CONFIG_NL80211_TESTMODE
-	dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL);
-	if (!dev->test_mtd.name) {
-		ret = -ENOMEM;
-		goto out_put_node;
-	}
-	dev->test_mtd.offset = offset;
-#endif
-
-out_put_node:
-	of_node_put(np);
-	return ret;
-#else
-	return -ENOENT;
-#endif
-}
-EXPORT_SYMBOL_GPL(mt76_get_of_data_from_mtd);
-
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
 				const char *cell_name, int len)
 {
@@ -163,10 +80,6 @@ static int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int len)
 	if (!ret)
 		return 0;
 
-	ret = mt76_get_of_data_from_mtd(dev, eep, 0, len);
-	if (!ret)
-		return 0;
-
 	return mt76_get_of_data_from_nvmem(dev, eep, "eeprom", len);
 }
 
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
index 527bef97e122..f447ecac664d 100644
@@ -1339,7 +1339,6 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,
 
 int mt76_eeprom_init(struct mt76_dev *dev, int len);
 int mt76_eeprom_override(struct mt76_phy *phy);
-int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len);
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
 				const char *cell_name, int len);
 
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +0 -4
index eb92cbf1a284..c24e1276700b 100644
@@ -29,10 +29,6 @@ static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)
 
 	offs = is_mt7915(&dev->mt76) ? MT_EE_PRECAL : MT_EE_PRECAL_V2;
 
-	ret = mt76_get_of_data_from_mtd(mdev, dev->cal, offs, size);
-	if (!ret)
-		return ret;
-
 	ret = mt76_get_of_data_from_nvmem(mdev, dev->cal, "precal", size);
 	if (!ret)
 		return ret;
Signature · 1 line
2.54.0
#5 lore raw

Re: [PATCH 3/3] wifi: mt76: remove mt76_get_of_data_from_mtd

Quoted 2 lines · Rosen Penev

mt76_get_of_data_from_mtd has been replaced by
mt76_get_of_data_from_nvmem in all usages.

All users in the kernel, but what about other sources of devicetrees? Those built into firmware etc? Are there none of those too?

Conor.

Quoted 146 lines

Remove it to prevent people from using the deprecated mediatek,mtd-eeprom binding.

---
 drivers/net/wireless/mediatek/mt76/eeprom.c   | 87 -------------------
 drivers/net/wireless/mediatek/mt76/mt76.h     |  1 -
 .../wireless/mediatek/mt76/mt7915/eeprom.c    |  4 -
 3 files changed, 92 deletions(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +0 -87
index afdb73661866..092804323d81 100644
@@ -35,89 +35,6 @@ static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)
 	return 0;
 }
 
-int mt76_get_of_data_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)
-		return -ENOENT;
-
-	phandle = be32_to_cpup(list++);
-	if (!phandle)
-		return -ENOENT;
-
-	np = of_find_node_by_phandle(phandle);
-	if (!np)
-		return -EINVAL;
-
-	part = of_get_property(np, "label", NULL);
-	if (!part)
-		part = np->name;
-
-	mtd = get_mtd_device_nm(part);
-	if (IS_ERR(mtd)) {
-		ret =  PTR_ERR(mtd);
-		goto out_put_node;
-	}
-
-	if (size <= sizeof(*list)) {
-		ret = -EINVAL;
-		goto out_put_node;
-	}
-
-	offset += be32_to_cpup(list);
-	ret = mtd_read(mtd, offset, len, &retlen, eep);
-	put_mtd_device(mtd);
-	if (mtd_is_bitflip(ret))
-		ret = 0;
-	if (ret) {
-		dev_err(dev->dev, "reading EEPROM from mtd %s failed: %i\n",
-			part, ret);
-		goto out_put_node;
-	}
-
-	if (retlen < len) {
-		ret = -EINVAL;
-		goto out_put_node;
-	}
-
-	if (of_property_read_bool(dev->dev->of_node, "big-endian")) {
-		u8 *data = (u8 *)eep;
-		int i;
-
-		/* convert eeprom data in Little Endian */
-		for (i = 0; i < round_down(len, 2); i += 2)
-			put_unaligned_le16(get_unaligned_be16(&data[i]),
-					   &data[i]);
-	}
-
-#ifdef CONFIG_NL80211_TESTMODE
-	dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL);
-	if (!dev->test_mtd.name) {
-		ret = -ENOMEM;
-		goto out_put_node;
-	}
-	dev->test_mtd.offset = offset;
-#endif
-
-out_put_node:
-	of_node_put(np);
-	return ret;
-#else
-	return -ENOENT;
-#endif
-}
-EXPORT_SYMBOL_GPL(mt76_get_of_data_from_mtd);
-
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
 				const char *cell_name, int len)
 {
@@ -163,10 +80,6 @@ static int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int len)
 	if (!ret)
 		return 0;
 
-	ret = mt76_get_of_data_from_mtd(dev, eep, 0, len);
-	if (!ret)
-		return 0;
-
 	return mt76_get_of_data_from_nvmem(dev, eep, "eeprom", len);
 }
 
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
index 527bef97e122..f447ecac664d 100644
@@ -1339,7 +1339,6 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,
 
 int mt76_eeprom_init(struct mt76_dev *dev, int len);
 int mt76_eeprom_override(struct mt76_phy *phy);
-int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len);
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
 				const char *cell_name, int len);
 
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +0 -4
index eb92cbf1a284..c24e1276700b 100644
@@ -29,10 +29,6 @@ static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)
 
 	offs = is_mt7915(&dev->mt76) ? MT_EE_PRECAL : MT_EE_PRECAL_V2;
 
-	ret = mt76_get_of_data_from_mtd(mdev, dev->cal, offs, size);
-	if (!ret)
-		return ret;
-
 	ret = mt76_get_of_data_from_nvmem(mdev, dev->cal, "precal", size);
 	if (!ret)
 		return ret;
Signature · 1 line
2.54.0
#6 lore raw

Re: [PATCH 3/3] wifi: mt76: remove mt76_get_of_data_from_mtd

Quoted 7 lines · Conor Dooley
Quoted 2 lines · Rosen Penev

mt76_get_of_data_from_mtd has been replaced by
mt76_get_of_data_from_nvmem in all usages.

All users in the kernel, but what about other sources of devicetrees? Those built into firmware etc? Are there none of those too?

I'm actively removing those: https://github.com/openwrt/openwrt/pull/23113

Anyway, irrelevant here.

Quoted 149 lines

Conor.

Quoted 146 lines

Remove it to prevent people from using the deprecated mediatek,mtd-eeprom binding.

---
 drivers/net/wireless/mediatek/mt76/eeprom.c   | 87 -------------------
 drivers/net/wireless/mediatek/mt76/mt76.h     |  1 -
 .../wireless/mediatek/mt76/mt7915/eeprom.c    |  4 -
 3 files changed, 92 deletions(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +0 -87
index afdb73661866..092804323d81 100644
@@ -35,89 +35,6 @@ static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)
      return 0;
 }
 
-int mt76_get_of_data_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)
-             return -ENOENT;
-
-     phandle = be32_to_cpup(list++);
-     if (!phandle)
-             return -ENOENT;
-
-     np = of_find_node_by_phandle(phandle);
-     if (!np)
-             return -EINVAL;
-
-     part = of_get_property(np, "label", NULL);
-     if (!part)
-             part = np->name;
-
-     mtd = get_mtd_device_nm(part);
-     if (IS_ERR(mtd)) {
-             ret =  PTR_ERR(mtd);
-             goto out_put_node;
-     }
-
-     if (size <= sizeof(*list)) {
-             ret = -EINVAL;
-             goto out_put_node;
-     }
-
-     offset += be32_to_cpup(list);
-     ret = mtd_read(mtd, offset, len, &retlen, eep);
-     put_mtd_device(mtd);
-     if (mtd_is_bitflip(ret))
-             ret = 0;
-     if (ret) {
-             dev_err(dev->dev, "reading EEPROM from mtd %s failed: %i\n",
-                     part, ret);
-             goto out_put_node;
-     }
-
-     if (retlen < len) {
-             ret = -EINVAL;
-             goto out_put_node;
-     }
-
-     if (of_property_read_bool(dev->dev->of_node, "big-endian")) {
-             u8 *data = (u8 *)eep;
-             int i;
-
-             /* convert eeprom data in Little Endian */
-             for (i = 0; i < round_down(len, 2); i += 2)
-                     put_unaligned_le16(get_unaligned_be16(&data[i]),
-                                        &data[i]);
-     }
-
-#ifdef CONFIG_NL80211_TESTMODE
-     dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL);
-     if (!dev->test_mtd.name) {
-             ret = -ENOMEM;
-             goto out_put_node;
-     }
-     dev->test_mtd.offset = offset;
-#endif
-
-out_put_node:
-     of_node_put(np);
-     return ret;
-#else
-     return -ENOENT;
-#endif
-}
-EXPORT_SYMBOL_GPL(mt76_get_of_data_from_mtd);
-
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
                              const char *cell_name, int len)
 {
@@ -163,10 +80,6 @@ static int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int len)
      if (!ret)
              return 0;
 
-     ret = mt76_get_of_data_from_mtd(dev, eep, 0, len);
-     if (!ret)
-             return 0;
-
      return mt76_get_of_data_from_nvmem(dev, eep, "eeprom", len);
 }
 
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
index 527bef97e122..f447ecac664d 100644
@@ -1339,7 +1339,6 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,
 
 int mt76_eeprom_init(struct mt76_dev *dev, int len);
 int mt76_eeprom_override(struct mt76_phy *phy);
-int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len);
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
                              const char *cell_name, int len);
 
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +0 -5
index eb92cbf1a284..c24e1276700b 100644
@@ -29,10 +29,6 @@ static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)
 
      offs = is_mt7915(&dev->mt76) ? MT_EE_PRECAL : MT_EE_PRECAL_V2;
 
-     ret = mt76_get_of_data_from_mtd(mdev, dev->cal, offs, size);
-     if (!ret)
-             return ret;
-
      ret = mt76_get_of_data_from_nvmem(mdev, dev->cal, "precal", size);
      if (!ret)
              return ret;
--

2.54.0

#7 lore raw

Re: [PATCH 3/3] wifi: mt76: remove mt76_get_of_data_from_mtd

Quoted 11 lines · Rosen Penev
Quoted 7 lines · Conor Dooley
Quoted 2 lines · Rosen Penev

mt76_get_of_data_from_mtd has been replaced by
mt76_get_of_data_from_nvmem in all usages.

All users in the kernel, but what about other sources of devicetrees? Those built into firmware etc? Are there none of those too?

I'm actively removing those: https://github.com/openwrt/openwrt/pull/23113

Anyway, irrelevant here.

Hardly, you can't break backwards compatibility with old devicetrees. Removing known users from the kernel is one step in that process, but if there's devicetrees in other places those cunt too!

With the moving pieces in this patchset alone it's problematic to move this fast, since you're changing the dts user in the same series as removing driver support (AFIACT), which means that neither netdev nor the platform tree will work with their portion applied.

Quoted 149 lines
Quoted 149 lines

Conor.

Quoted 146 lines

Remove it to prevent people from using the deprecated mediatek,mtd-eeprom binding.

---
 drivers/net/wireless/mediatek/mt76/eeprom.c   | 87 -------------------
 drivers/net/wireless/mediatek/mt76/mt76.h     |  1 -
 .../wireless/mediatek/mt76/mt7915/eeprom.c    |  4 -
 3 files changed, 92 deletions(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +0 -87
index afdb73661866..092804323d81 100644
@@ -35,89 +35,6 @@ static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)
      return 0;
 }
 
-int mt76_get_of_data_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)
-             return -ENOENT;
-
-     phandle = be32_to_cpup(list++);
-     if (!phandle)
-             return -ENOENT;
-
-     np = of_find_node_by_phandle(phandle);
-     if (!np)
-             return -EINVAL;
-
-     part = of_get_property(np, "label", NULL);
-     if (!part)
-             part = np->name;
-
-     mtd = get_mtd_device_nm(part);
-     if (IS_ERR(mtd)) {
-             ret =  PTR_ERR(mtd);
-             goto out_put_node;
-     }
-
-     if (size <= sizeof(*list)) {
-             ret = -EINVAL;
-             goto out_put_node;
-     }
-
-     offset += be32_to_cpup(list);
-     ret = mtd_read(mtd, offset, len, &retlen, eep);
-     put_mtd_device(mtd);
-     if (mtd_is_bitflip(ret))
-             ret = 0;
-     if (ret) {
-             dev_err(dev->dev, "reading EEPROM from mtd %s failed: %i\n",
-                     part, ret);
-             goto out_put_node;
-     }
-
-     if (retlen < len) {
-             ret = -EINVAL;
-             goto out_put_node;
-     }
-
-     if (of_property_read_bool(dev->dev->of_node, "big-endian")) {
-             u8 *data = (u8 *)eep;
-             int i;
-
-             /* convert eeprom data in Little Endian */
-             for (i = 0; i < round_down(len, 2); i += 2)
-                     put_unaligned_le16(get_unaligned_be16(&data[i]),
-                                        &data[i]);
-     }
-
-#ifdef CONFIG_NL80211_TESTMODE
-     dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL);
-     if (!dev->test_mtd.name) {
-             ret = -ENOMEM;
-             goto out_put_node;
-     }
-     dev->test_mtd.offset = offset;
-#endif
-
-out_put_node:
-     of_node_put(np);
-     return ret;
-#else
-     return -ENOENT;
-#endif
-}
-EXPORT_SYMBOL_GPL(mt76_get_of_data_from_mtd);
-
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
                              const char *cell_name, int len)
 {
@@ -163,10 +80,6 @@ static int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int len)
      if (!ret)
              return 0;
 
-     ret = mt76_get_of_data_from_mtd(dev, eep, 0, len);
-     if (!ret)
-             return 0;
-
      return mt76_get_of_data_from_nvmem(dev, eep, "eeprom", len);
 }
 
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
index 527bef97e122..f447ecac664d 100644
@@ -1339,7 +1339,6 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,
 
 int mt76_eeprom_init(struct mt76_dev *dev, int len);
 int mt76_eeprom_override(struct mt76_phy *phy);
-int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len);
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
                              const char *cell_name, int len);
 
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +0 -5
index eb92cbf1a284..c24e1276700b 100644
@@ -29,10 +29,6 @@ static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)
 
      offs = is_mt7915(&dev->mt76) ? MT_EE_PRECAL : MT_EE_PRECAL_V2;
 
-     ret = mt76_get_of_data_from_mtd(mdev, dev->cal, offs, size);
-     if (!ret)
-             return ret;
-
      ret = mt76_get_of_data_from_nvmem(mdev, dev->cal, "precal", size);
      if (!ret)
              return ret;
--

2.54.0

#8 lore raw

Re: [PATCH 3/3] wifi: mt76: remove mt76_get_of_data_from_mtd

Quoted 13 lines · Conor Dooley
Quoted 11 lines · Rosen Penev
Quoted 7 lines · Conor Dooley
Quoted 2 lines · Rosen Penev

mt76_get_of_data_from_mtd has been replaced by
mt76_get_of_data_from_nvmem in all usages.

All users in the kernel, but what about other sources of devicetrees? Those built into firmware etc? Are there none of those too?

I'm actively removing those: https://github.com/openwrt/openwrt/pull/23113

Anyway, irrelevant here.

Quoted 8 lines

Hardly, you can't break backwards compatibility with old devicetrees. Removing known users from the kernel is one step in that process, but if there's devicetrees in other places those cunt too!

With the moving pieces in this patchset alone it's problematic to move this fast, since you're changing the dts user in the same series as removing driver support (AFIACT), which means that neither netdev nor the platform tree will work with their portion applied.

Well, maybe the platform tree will work, but not the netdev tree unless I've misunderstood completely.

Quoted 150 lines
Quoted 150 lines
Quoted 150 lines

Conor.

Quoted 146 lines

Remove it to prevent people from using the deprecated mediatek,mtd-eeprom binding.

---
 drivers/net/wireless/mediatek/mt76/eeprom.c   | 87 -------------------
 drivers/net/wireless/mediatek/mt76/mt76.h     |  1 -
 .../wireless/mediatek/mt76/mt7915/eeprom.c    |  4 -
 3 files changed, 92 deletions(-)
drivers/net/wireless/mediatek/mt76/eeprom.c +0 -87
index afdb73661866..092804323d81 100644
@@ -35,89 +35,6 @@ static int mt76_get_of_eeprom_data(struct mt76_dev *dev, void *eep, int len)
      return 0;
 }
 
-int mt76_get_of_data_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)
-             return -ENOENT;
-
-     phandle = be32_to_cpup(list++);
-     if (!phandle)
-             return -ENOENT;
-
-     np = of_find_node_by_phandle(phandle);
-     if (!np)
-             return -EINVAL;
-
-     part = of_get_property(np, "label", NULL);
-     if (!part)
-             part = np->name;
-
-     mtd = get_mtd_device_nm(part);
-     if (IS_ERR(mtd)) {
-             ret =  PTR_ERR(mtd);
-             goto out_put_node;
-     }
-
-     if (size <= sizeof(*list)) {
-             ret = -EINVAL;
-             goto out_put_node;
-     }
-
-     offset += be32_to_cpup(list);
-     ret = mtd_read(mtd, offset, len, &retlen, eep);
-     put_mtd_device(mtd);
-     if (mtd_is_bitflip(ret))
-             ret = 0;
-     if (ret) {
-             dev_err(dev->dev, "reading EEPROM from mtd %s failed: %i\n",
-                     part, ret);
-             goto out_put_node;
-     }
-
-     if (retlen < len) {
-             ret = -EINVAL;
-             goto out_put_node;
-     }
-
-     if (of_property_read_bool(dev->dev->of_node, "big-endian")) {
-             u8 *data = (u8 *)eep;
-             int i;
-
-             /* convert eeprom data in Little Endian */
-             for (i = 0; i < round_down(len, 2); i += 2)
-                     put_unaligned_le16(get_unaligned_be16(&data[i]),
-                                        &data[i]);
-     }
-
-#ifdef CONFIG_NL80211_TESTMODE
-     dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL);
-     if (!dev->test_mtd.name) {
-             ret = -ENOMEM;
-             goto out_put_node;
-     }
-     dev->test_mtd.offset = offset;
-#endif
-
-out_put_node:
-     of_node_put(np);
-     return ret;
-#else
-     return -ENOENT;
-#endif
-}
-EXPORT_SYMBOL_GPL(mt76_get_of_data_from_mtd);
-
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
                              const char *cell_name, int len)
 {
@@ -163,10 +80,6 @@ static int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int len)
      if (!ret)
              return 0;
 
-     ret = mt76_get_of_data_from_mtd(dev, eep, 0, len);
-     if (!ret)
-             return 0;
-
      return mt76_get_of_data_from_nvmem(dev, eep, "eeprom", len);
 }
 
drivers/net/wireless/mediatek/mt76/mt76.h +0 -1
index 527bef97e122..f447ecac664d 100644
@@ -1339,7 +1339,6 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,
 
 int mt76_eeprom_init(struct mt76_dev *dev, int len);
 int mt76_eeprom_override(struct mt76_phy *phy);
-int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int len);
 int mt76_get_of_data_from_nvmem(struct mt76_dev *dev, void *eep,
                              const char *cell_name, int len);
 
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +0 -5
index eb92cbf1a284..c24e1276700b 100644
@@ -29,10 +29,6 @@ static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)
 
      offs = is_mt7915(&dev->mt76) ? MT_EE_PRECAL : MT_EE_PRECAL_V2;
 
-     ret = mt76_get_of_data_from_mtd(mdev, dev->cal, offs, size);
-     if (!ret)
-             return ret;
-
      ret = mt76_get_of_data_from_nvmem(mdev, dev->cal, "precal", size);
      if (!ret)
              return ret;
--

2.54.0

#9 lore raw

Re: [PATCH 3/3] wifi: mt76: remove mt76_get_of_data_from_mtd

In reply to Rosen Penev
Quoted 5 lines · Rosen Penev

mt76_get_of_data_from_mtd has been replaced by
mt76_get_of_data_from_nvmem in all usages.

Remove it to prevent people from using the deprecated mediatek,mtd-eeprom binding.

Where did you deprecate it? I cannot find it.

Anyway, as Conor pointed out, this is ABI break and really poorly explained. Cleanup is not a reason to break ABI.

Best regards,
Krzysztof