[PATCH v2 rtw-next 0/3] wifi: rtw89: 8922d: increase firmware format to 1

[PATCH v2 rtw-next 0/3] wifi: rtw89: 8922d: increase firmware format to 1

[Ping-Ke Shih]

The firmware commands/events formats are changed since 0.35.119.0, and
BT-coxistence has much changes needed implementation in driver side.
Update the firmware format version to support newer formats and features.

v2:
 - add patch 2/3 to support NZ/BR/AR specific regulation.
 - in patch 3/3, mention the changes of patch 2/3 is one of reason
   to increase the fw version.

Ching-Te Ku (1):
  wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to
    9.24.2

Ping-Ke Shih (1):
  wifi: rtw89: 8922d: update supported firmware format to 1

Zong-Zhe Yang (1):
  wifi: rtw89: regd: add NZ/BR/AR for individual TX power settings

 drivers/net/wireless/realtek/rtw89/coex.c     | 2 +-
 drivers/net/wireless/realtek/rtw89/core.h     | 3 +++
 drivers/net/wireless/realtek/rtw89/regd.c     | 3 +++
 drivers/net/wireless/realtek/rtw89/rtw8922d.c | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)


base-commit: 7cde94dab0e74434ccc0a387d7ad373fb3becda0
-- 
2.25.1

[PATCH v2 rtw-next 1/3] wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 9.24.2

[Ping-Ke Shih]

From: Ching-Te Ku <ku920601@realtek.com>

Update 0.35.119.3 Wi-Fi firmware support. Fix dual BT, dual MAC,
MLO mechanism binding control not working issue. Fix AX/BE serial
chips logic mixing error.

Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
v2: no change
---
 drivers/net/wireless/realtek/rtw89/coex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 6b72e2c80d14..4fa9632649d1 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -11,7 +11,7 @@
 #include "ps.h"
 #include "reg.h"
 
-#define RTW89_COEX_VERSION 0x09180113
+#define RTW89_COEX_VERSION 0x09180213
 #define FCXDEF_STEP 50 /* MUST <= FCXMAX_STEP and match with wl fw*/
 #define BTC_E2G_LIMIT_DEF 80
 
-- 
2.25.1

[PATCH v2 rtw-next 2/3] wifi: rtw89: regd: add NZ/BR/AR for individual TX power settings

[Ping-Ke Shih]

From: Zong-Zhe Yang <kevin_yang@realtek.com>

Add NZ (New Zealand), BR (Brazil) and Add AR (Argentina) into Realtek
regulatory enum. Some chipsets may need individual TX power settings
for them.

Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
v2: new in v2
---
 drivers/net/wireless/realtek/rtw89/core.h | 3 +++
 drivers/net/wireless/realtek/rtw89/regd.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 7e74b5c9ed49..f17717ac2036 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -791,6 +791,9 @@ enum rtw89_regulation_type {
 	RTW89_QATAR	= 13,
 	RTW89_UK	= 14,
 	RTW89_THAILAND	= 15,
+	RTW89_NZ	= 16,
+	RTW89_BR	= 17,
+	RTW89_AR	= 18,
 	RTW89_REGD_NUM,
 };
 
diff --git a/drivers/net/wireless/realtek/rtw89/regd.c b/drivers/net/wireless/realtek/rtw89/regd.c
index 942f55633942..f0d47c313bb0 100644
--- a/drivers/net/wireless/realtek/rtw89/regd.c
+++ b/drivers/net/wireless/realtek/rtw89/regd.c
@@ -666,6 +666,9 @@ static const char * const rtw89_regd_string[] = {
 	RTW89_DEF_REGD_STR(QATAR),
 	RTW89_DEF_REGD_STR(UK),
 	RTW89_DEF_REGD_STR(THAILAND),
+	RTW89_DEF_REGD_STR(NZ),
+	RTW89_DEF_REGD_STR(BR),
+	RTW89_DEF_REGD_STR(AR),
 };
 
 static_assert(ARRAY_SIZE(rtw89_regd_string) == RTW89_REGD_NUM);
-- 
2.25.1

[PATCH v2 rtw-next 3/3] wifi: rtw89: 8922d: update supported firmware format to 1

[Ping-Ke Shih]

The firmware version 0.35.119.0 changes hw_scan format, which isn't
compatible with old driver. The BT-coexistence also implements much
features in firmware side until 0.35.119.3, which needs driver side
implementation accordingly. The REGD table included in firmware
file add NZ/BR/AR countries. Increase format to 1 to prevent old driver
load the new firmware.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
v2: mention the changes of patch 2/3 is one of reason to have this.
---
 drivers/net/wireless/realtek/rtw89/rtw8922d.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw89/rtw8922d.c b/drivers/net/wireless/realtek/rtw89/rtw8922d.c
index 41e2aa1c8f78..b703762f4680 100644
--- a/drivers/net/wireless/realtek/rtw89/rtw8922d.c
+++ b/drivers/net/wireless/realtek/rtw89/rtw8922d.c
@@ -14,12 +14,12 @@
 #include "sar.h"
 #include "util.h"
 
-#define RTW8922D_FW_FORMAT_MAX 0
+#define RTW8922D_FW_FORMAT_MAX 1
 #define RTW8922D_FW_BASENAME "rtw89/rtw8922d_fw"
 #define RTW8922D_MODULE_FIRMWARE \
 	RTW89_GEN_MODULE_FWNAME(RTW8922D_FW_BASENAME, RTW8922D_FW_FORMAT_MAX)
 
-#define RTW8922DS_FW_FORMAT_MAX 0
+#define RTW8922DS_FW_FORMAT_MAX 1
 #define RTW8922DS_FW_BASENAME "rtw89/rtw8922ds_fw"
 #define RTW8922DS_MODULE_FIRMWARE \
 	RTW89_GEN_MODULE_FWNAME(RTW8922DS_FW_BASENAME, RTW8922DS_FW_FORMAT_MAX)
-- 
2.25.1

Re: [PATCH v2 rtw-next 1/3] wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 9.24.2

[Ping-Ke Shih]

Ping-Ke Shih <pkshih@realtek.com> wrote:

> From: Ching-Te Ku <ku920601@realtek.com>
> 
> Update 0.35.119.3 Wi-Fi firmware support. Fix dual BT, dual MAC,
> MLO mechanism binding control not working issue. Fix AX/BE serial
> chips logic mixing error.
> 
> Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>

3 patch(es) applied to rtw-next branch of rtw.git, thanks.

19354c4b346a wifi: rtw89: coex: Update Wi-Fi/Bluetooth coexistence version to 9.24.2
52f00f0c99ef wifi: rtw89: regd: add NZ/BR/AR for individual TX power settings
b706b5f2fd24 wifi: rtw89: 8922d: update supported firmware format to 1

---
https://github.com/pkshih/rtw.git