[][MAC80211][mt76][rebase internal patches and fix boot crash]
[Description]
Fix following:
- rebase internal patches to fix some patch fails
- fix crash on boot if property "bin_file_mode" is not set in dts
[Release-log]
N/A
Change-Id: I05d0bba2ef777bc8283af17e8bef3676221f3f5e
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6247594
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1117-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/1117-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl.patch
index c25f9b2..defd698 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1117-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/1117-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl.patch
@@ -1,21 +1,21 @@
-From c1e72950b8f7df7c36c64e27613637f88e3c1ba3 Mon Sep 17 00:00:00 2001
+From 49eb731e0ede35ae2deb4e248f704b1c27afeeed Mon Sep 17 00:00:00 2001
From: Howard Hsu <howard-yh.hsu@mediatek.com>
Date: Fri, 24 Jun 2022 11:15:45 +0800
-Subject: [PATCH 1117/1117] mt76: mt7915: add vendor subcmd EDCCA ctrl
+Subject: [PATCH 1117/1119] mt76: mt7915: add vendor subcmd EDCCA ctrl
Change-Id: I92dabf8be9c5a7ecec78f35325bc5645af8d15ab
---
- mt76_connac_mcu.h | 1 +
- mt7915/main.c | 3 +++
- mt7915/mcu.c | 38 ++++++++++++++++++++++++++++
- mt7915/mcu.h | 12 +++++++++
- mt7915/mt7915.h | 2 ++
- mt7915/vendor.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++
- mt7915/vendor.h | 19 ++++++++++++++
+ .../wireless/mediatek/mt76/mt76_connac_mcu.h | 1 +
+ .../net/wireless/mediatek/mt76/mt7915/main.c | 3 +
+ .../net/wireless/mediatek/mt76/mt7915/mcu.c | 38 +++++++++++
+ .../net/wireless/mediatek/mt76/mt7915/mcu.h | 12 ++++
+ .../wireless/mediatek/mt76/mt7915/mt7915.h | 2 +
+ .../wireless/mediatek/mt76/mt7915/vendor.c | 63 +++++++++++++++++++
+ .../wireless/mediatek/mt76/mt7915/vendor.h | 19 ++++++
7 files changed, 138 insertions(+)
diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index a0e6fa6e..1747e06d 100644
+index cb1e94a3..ca68172d 100644
--- a/mt76_connac_mcu.h
+++ b/mt76_connac_mcu.h
@@ -1147,6 +1147,7 @@ enum {
@@ -27,7 +27,7 @@
};
diff --git a/mt7915/main.c b/mt7915/main.c
-index 6c97ce78..1dc41ab6 100644
+index 06658aed..6085e124 100644
--- a/mt7915/main.c
+++ b/mt7915/main.c
@@ -456,6 +456,9 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)
@@ -41,10 +41,10 @@
ret = mt7915_set_channel(phy);
if (ret)
diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 46eef36a..205ecbab 100644
+index 29422f55..681a2a7c 100644
--- a/mt7915/mcu.c
+++ b/mt7915/mcu.c
-@@ -4217,3 +4217,41 @@ int mt7915_mcu_rf_regval(struct mt7915_dev *dev, u32 regidx, u32 *val, bool set)
+@@ -4239,3 +4239,41 @@ int mt7915_mcu_rf_regval(struct mt7915_dev *dev, u32 regidx, u32 *val, bool set)
return 0;
}
@@ -87,10 +87,10 @@
+ return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(EDCCA), &req, sizeof(req), true);
+}
diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 873a8055..72c2cfc6 100644
+index ad85e56c..b8a433e5 100644
--- a/mt7915/mcu.h
+++ b/mt7915/mcu.h
-@@ -785,4 +785,16 @@ enum {
+@@ -789,4 +789,16 @@ enum {
};
#endif
@@ -108,10 +108,10 @@
+};
#endif
diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 0b7f73b3..5c58a29c 100644
+index fb8bd877..6462d502 100644
--- a/mt7915/mt7915.h
+++ b/mt7915/mt7915.h
-@@ -718,6 +718,8 @@ void mt7915_vendor_amnt_fill_rx(struct mt7915_phy *phy, struct sk_buff *skb);
+@@ -721,6 +721,8 @@ void mt7915_vendor_amnt_fill_rx(struct mt7915_phy *phy, struct sk_buff *skb);
int mt7915_vendor_amnt_sta_remove(struct mt7915_phy *phy,
struct ieee80211_sta *sta);
#endif
@@ -241,5 +241,5 @@
CAPI_RFEATURE_CHANGED = BIT(16),
CAPI_WIRELESS_CHANGED = BIT(17),
--
-2.18.0
+2.25.1