[][MAC80211][mt76][implement bin file mode]
[Description]
Add bin file mode and update Makefile for bin file mode support
[Release-log]
N/A
Change-Id: I6b30dacffbac0e9fb179c1d172b63f41924097cb
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6219800
diff --git a/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch b/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
index 9166c81..f76ad60 100644
--- a/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
+++ b/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
@@ -1,16 +1,18 @@
-From bd0dae19286bf13e74698d753a98e46b155a5882 Mon Sep 17 00:00:00 2001
-From: Evelyn Tsai <evelyn.tsai@mediatek.com>
-Date: Wed, 30 Mar 2022 10:38:24 +0800
-Subject: [PATCH] mt76: add MT7986/MT7916/Besra support in makefile
+From a30647e3152b03eeb65ce60b60cb52a2c0840d28 Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Thu, 7 Jul 2022 17:09:31 +0800
+Subject: [PATCH] mt76: add MT7986/MT7916/Besra & bin file mode support in
+ makefile
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
- kernel/mt76/Makefile | 69 +++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 68 insertions(+), 1 deletion(-)
+ Makefile | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 76 insertions(+), 1 deletion(-)
-diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index 0ccf067..75e65f7 100644
---- a/package/kernel/mt76/Makefile
-+++ b/package/kernel/mt76/Makefile
+diff --git a/Makefile b/Makefile
+index 354449b..758546f 100644
+--- a/Makefile
++++ b/Makefile
@@ -220,12 +220,20 @@ endef
define KernelPackage/mt7915e
@@ -59,7 +61,7 @@
endif
ifdef CONFIG_PACKAGE_kmod-mt7921-common
PKG_MAKE_FLAGS += CONFIG_MT7921_COMMON=m
-@@ -447,9 +467,55 @@ define KernelPackage/mt7915e/install
+@@ -447,9 +467,63 @@ define KernelPackage/mt7915e/install
$(PKG_BUILD_DIR)/firmware/mt7915_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7915_wm.bin \
$(PKG_BUILD_DIR)/firmware/mt7915_rom_patch.bin \
@@ -80,6 +82,9 @@
+ $(PKG_BUILD_DIR)/firmware/mt7916_eeprom.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7915_eeprom.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7915_eeprom_dbdc.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7916_binfile.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7915_binfile.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7915_binfile_dbdc.bin \
$(1)/lib/firmware/mediatek
+ifdef CONFIG_TARGET_mediatek_mt7986
+ cp \
@@ -88,6 +93,11 @@
+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7976_dbdc.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7975_dual.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7986_eeprom_mt7975.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7986_binfile_mt7976_dual.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7986_binfile_mt7976.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7986_binfile_mt7976_dbdc.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7986_binfile_mt7975_dual.bin \
++ $(PKG_BUILD_DIR)/firmware/mt7986_binfile_mt7975.bin \
+ $(1)/lib/firmware/mediatek
+ifdef CONFIG_NET_MEDIATEK_SOC_WED
+ cp \
@@ -115,7 +125,7 @@
define KernelPackage/mt7921e/install
$(INSTALL_DIR) $(1)/lib/firmware/mediatek
cp \
-@@ -489,5 +555,6 @@ $(eval $(call KernelPackage,mt7921-common))
+@@ -489,5 +563,6 @@ $(eval $(call KernelPackage,mt7921-common))
$(eval $(call KernelPackage,mt7921u))
$(eval $(call KernelPackage,mt7921s))
$(eval $(call KernelPackage,mt7921e))
@@ -123,5 +133,5 @@
$(eval $(call KernelPackage,mt76))
$(eval $(call BuildPackage,mt76-test))
--
-2.29.2
+2.18.0
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1117-mt76-mt7915-implement-bin-file-mode.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/1117-mt76-mt7915-implement-bin-file-mode.patch
new file mode 100644
index 0000000..d3c2b68
--- /dev/null
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/1117-mt76-mt7915-implement-bin-file-mode.patch
@@ -0,0 +1,180 @@
+From 558aef638808667341e65d8c11ee7da4266189cd Mon Sep 17 00:00:00 2001
+From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+Date: Thu, 7 Jul 2022 11:09:59 +0800
+Subject: [PATCH] mt76: mt7915: implement bin file mode
+
+Change-Id: I2a726341541a11cbecdb210b33a8e79aefbd6cf3
+Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
+---
+ eeprom.c | 18 +++++++++++++++++
+ mt76.h | 1 +
+ mt7915/eeprom.c | 53 +++++++++++++++++++++++++++++++++++++++----------
+ mt7915/mt7915.h | 10 ++++++++++
+ 4 files changed, 71 insertions(+), 11 deletions(-)
+
+diff --git a/eeprom.c b/eeprom.c
+index d172cb0..7e4cb0f 100644
+--- a/eeprom.c
++++ b/eeprom.c
+@@ -102,6 +102,24 @@ out_put_node:
+ }
+ EXPORT_SYMBOL_GPL(mt76_get_of_eeprom);
+
++bool mt76_check_bin_file_mode(struct mt76_dev *dev)
++{
++ struct device_node *np = dev->dev->of_node;
++ const __be32 *bin_file_mode;
++ bool ret = false;
++
++ if (!np)
++ return false;
++
++ bin_file_mode = of_get_property(np, "bin_file_mode", NULL);
++ if (be32_to_cpu(*bin_file_mode))
++ ret = true;
++
++ of_node_put(np);
++ return ret;
++}
++EXPORT_SYMBOL_GPL(mt76_check_bin_file_mode);
++
+ void
+ mt76_eeprom_override(struct mt76_phy *phy)
+ {
+diff --git a/mt76.h b/mt76.h
+index 4c8a671..4931489 100644
+--- a/mt76.h
++++ b/mt76.h
+@@ -1005,6 +1005,7 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,
+ int mt76_eeprom_init(struct mt76_dev *dev, int len);
+ void mt76_eeprom_override(struct mt76_phy *phy);
+ int mt76_get_of_eeprom(struct mt76_dev *dev, void *data, int offset, int len);
++bool mt76_check_bin_file_mode(struct mt76_dev *dev);
+
+ struct mt76_queue *
+ mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,
+diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c
+index ee3049e..98e6a76 100644
+--- a/mt7915/eeprom.c
++++ b/mt7915/eeprom.c
+@@ -46,26 +46,36 @@ static char *mt7915_eeprom_name(struct mt7915_dev *dev)
+ {
+ switch (mt76_chip(&dev->mt76)) {
+ case 0x7915:
+- return dev->dbdc_support ?
+- MT7915_EEPROM_DEFAULT_DBDC : MT7915_EEPROM_DEFAULT;
++ if (dev->bin_file_mode)
++ return dev->dbdc_support ?
++ MT7915_BIN_FILE_DBDC : MT7915_BIN_FILE;
++ else
++ return dev->dbdc_support ?
++ MT7915_EEPROM_DEFAULT_DBDC : MT7915_EEPROM_DEFAULT;
+ case 0x7986:
+ switch (mt7915_check_adie(dev, true)) {
+ case MT7976_ONE_ADIE_DBDC:
+- return MT7986_EEPROM_MT7976_DEFAULT_DBDC;
++ return dev->bin_file_mode ?
++ MT7986_BIN_FILE_MT7976_DBDC : MT7986_EEPROM_MT7976_DEFAULT_DBDC;
+ case MT7975_ONE_ADIE:
+- return MT7986_EEPROM_MT7975_DEFAULT;
++ return dev->bin_file_mode ?
++ MT7986_BIN_FILE_MT7975 : MT7986_EEPROM_MT7975_DEFAULT;
+ case MT7976_ONE_ADIE:
+- return MT7986_EEPROM_MT7976_DEFAULT;
++ return dev->bin_file_mode ?
++ MT7986_BIN_FILE_MT7976 : MT7986_EEPROM_MT7976_DEFAULT;
+ case MT7975_DUAL_ADIE:
+- return MT7986_EEPROM_MT7975_DUAL_DEFAULT;
++ return dev->bin_file_mode ?
++ MT7986_BIN_FILE_MT7975_DUAL : MT7986_EEPROM_MT7975_DUAL_DEFAULT;
+ case MT7976_DUAL_ADIE:
+- return MT7986_EEPROM_MT7976_DUAL_DEFAULT;
++ return dev->bin_file_mode ?
++ MT7986_BIN_FILE_MT7976_DUAL : MT7986_EEPROM_MT7976_DUAL_DEFAULT;
+ default:
+ break;
+ }
+ return NULL;
+ default:
+- return MT7916_EEPROM_DEFAULT;
++ return dev->bin_file_mode ?
++ MT7916_BIN_FILE : MT7916_EEPROM_DEFAULT;
+ }
+ }
+
+@@ -81,7 +91,10 @@ mt7915_eeprom_load_default(struct mt7915_dev *dev)
+ return ret;
+
+ if (!fw || !fw->data) {
+- dev_err(dev->mt76.dev, "Invalid default bin\n");
++ if (dev->bin_file_mode)
++ dev_err(dev->mt76.dev, "Invalid bin (bin file mode)\n");
++ else
++ dev_err(dev->mt76.dev, "Invalid default bin\n");
+ ret = -EINVAL;
+ goto out;
+ }
+@@ -234,12 +247,30 @@ int mt7915_eeprom_init(struct mt7915_dev *dev)
+ {
+ int ret;
+
+- ret = mt7915_eeprom_load(dev);
++ dev->bin_file_mode = mt76_check_bin_file_mode(&dev->mt76);
++
++ if (dev->bin_file_mode) {
++ dev->mt76.eeprom.size = mt7915_eeprom_size(dev);
++ dev->mt76.eeprom.data = devm_kzalloc(dev->mt76.dev, dev->mt76.eeprom.size,
++ GFP_KERNEL);
++ if (!dev->mt76.eeprom.data)
++ return -ENOMEM;
++ ret = mt7915_eeprom_load_default(dev);
++ } else {
++ ret = mt7915_eeprom_load(dev);
++ }
++
+ if (ret < 0) {
+ if (ret != -EINVAL)
+ return ret;
+
+- dev_warn(dev->mt76.dev, "eeprom load fail, use default bin\n");
++ if (dev->bin_file_mode) {
++ dev_warn(dev->mt76.dev, "bin file load fail, use default bin\n");
++ dev->bin_file_mode = false;
++ } else {
++ dev_warn(dev->mt76.dev, "eeprom load fail, use default bin\n");
++ }
++
+ ret = mt7915_eeprom_load_default(dev);
+ if (ret)
+ return ret;
+diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
+index fb8bd87..a81bc7c 100644
+--- a/mt7915/mt7915.h
++++ b/mt7915/mt7915.h
+@@ -51,6 +51,15 @@
+ #define MT7986_EEPROM_MT7976_DEFAULT_DBDC "mediatek/mt7986_eeprom_mt7976_dbdc.bin"
+ #define MT7986_EEPROM_MT7976_DUAL_DEFAULT "mediatek/mt7986_eeprom_mt7976_dual.bin"
+
++#define MT7915_BIN_FILE "mediatek/mt7915_binfile.bin"
++#define MT7915_BIN_FILE_DBDC "mediatek/mt7915_binfile_dbdc.bin"
++#define MT7916_BIN_FILE "mediatek/mt7916_binfile.bin"
++#define MT7986_BIN_FILE_MT7975 "mediatek/mt7986_binfile_mt7975.bin"
++#define MT7986_BIN_FILE_MT7975_DUAL "mediatek/mt7986_binfile_mt7975_dual.bin"
++#define MT7986_BIN_FILE_MT7976 "mediatek/mt7986_binfile_mt7976.bin"
++#define MT7986_BIN_FILE_MT7976_DBDC "mediatek/mt7986_binfile_mt7976_dbdc.bin"
++#define MT7986_BIN_FILE_MT7976_DUAL "mediatek/mt7986_binfile_mt7976_dual.bin"
++
+ #define MT7915_EEPROM_SIZE 3584
+ #define MT7916_EEPROM_SIZE 4096
+
+@@ -377,6 +386,7 @@ struct mt7915_dev {
+
+ bool dbdc_support;
+ bool flash_mode;
++ bool bin_file_mode;
+ bool muru_debug;
+ bool ibf;
+
+--
+2.18.0
+