| Message ID | 20230106120844.17441-2-pkshih@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 72f8b0461b4aa1b90248c36f3d2ea4a58074672e |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: rtw89: coex: third patchset to adopt BTC version | expand |
Ping-Ke Shih <pkshih@realtek.com> wrote: > From: Ching-Te Ku <ku920601@realtek.com> > > The newer Wi-Fi firmware are all changed to "Not to send H2C to > mention firmware how many call flow step should firmware trace". > The structure had removed the member, and define the steps number > at newer version firmware. > > Signed-off-by: Ching-Te Ku <ku920601@realtek.com> > Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> 7 patches applied to wireless-next.git, thanks. 72f8b0461b4a wifi: rtw89: coex: Add version code for Wi-Fi firmware coexistence control 3d929f075d3b wifi: rtw89: coex: Change Wi-Fi Null data report to version separate 2626ccefe615 wifi: rtw89: coex: Change firmware steps report to version separate 2ce43be34850 wifi: rtw89: coex: refactor debug log of slot list ae4e1adbb1be wifi: rtw89: coex: Packet traffic arbitration hardware owner monitor 447a3267cbed wifi: rtw89: coex: Change RTL8852B use v1 TDMA policy fbc2caf19914 wifi: rtw89: coex: Change Wi-Fi role info related logic to version separate
diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index 19a49ef243fa4..543c10b8349d9 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -1992,8 +1992,8 @@ int rtw89_fw_h2c_cxdrv_role_v1(struct rtw89_dev *rtwdev) #define H2C_LEN_CXDRVINFO_CTRL (4 + H2C_LEN_CXDRVHDR) int rtw89_fw_h2c_cxdrv_ctrl(struct rtw89_dev *rtwdev) { - const struct rtw89_chip_info *chip = rtwdev->chip; struct rtw89_btc *btc = &rtwdev->btc; + const struct rtw89_btc_ver *ver = btc->ver; struct rtw89_btc_ctrl *ctrl = &btc->ctrl; struct sk_buff *skb; u8 *cmd; @@ -2013,7 +2013,7 @@ int rtw89_fw_h2c_cxdrv_ctrl(struct rtw89_dev *rtwdev) RTW89_SET_FWCMD_CXCTRL_MANUAL(cmd, ctrl->manual); RTW89_SET_FWCMD_CXCTRL_IGNORE_BT(cmd, ctrl->igno_bt); RTW89_SET_FWCMD_CXCTRL_ALWAYS_FREERUN(cmd, ctrl->always_freerun); - if (chip->chip_id == RTL8852A) + if (ver->fcxctrl == 0) RTW89_SET_FWCMD_CXCTRL_TRACE_STEP(cmd, ctrl->trace_step); rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,