Commit c220d08e authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

wifi: rtw89: mac: add mac_gen_def::band1_offset to map MAC band1 register address 



There are two copies of MAC hardware called band0 and band1. Basically,
the only difference between them is base address, so we can share functions
with a 'band' (or 'mac_idx') argument.

The offset of base address of WiFi 6 and 7 are 0x2000 and 0x4000
respectively, so add band1_offset field to new introduced struct
mac_gen_def to possibly reuse functions.

Using below spatch script to convert callers:

  @@
  expression reg, band;
  @@
  - rtw89_mac_reg_by_idx(reg, band)
  + rtw89_mac_reg_by_idx(rtwdev, reg, band)

  @@
  expression reg, port, band;
  @@
  - rtw89_mac_reg_by_port(reg, port, band)
  + rtw89_mac_reg_by_port(rtwdev, reg, port, band)

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230822125822.23817-2-pkshih@realtek.com
parent 98fdd77d

drivers/net/wireless/realtek/rtw89/core.c

+2 −2
Original line number Diff line number Diff line
@@ -2504,7 +2504,7 @@ void rtw89_roc_start(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) 
	rtw89_config_roc_chandef(rtwdev, rtwvif->sub_entity_idx, &roc_chan);

	rtw89_set_channel(rtwdev);

	rtw89_write32_clr(rtwdev,

			  rtw89_mac_reg_by_idx(R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			  rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			  B_AX_A_UC_CAM_MATCH | B_AX_A_BC_CAM_MATCH);



	ieee80211_ready_on_channel(hw);
@@ -2525,7 +2525,7 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) 
	rtw89_leave_lps(rtwdev);



	rtw89_write32_mask(rtwdev,

			   rtw89_mac_reg_by_idx(R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   B_AX_RX_FLTR_CFG_MASK,

			   rtwdev->hal.rx_fltr);

drivers/net/wireless/realtek/rtw89/core.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


struct rtw89_dev;

struct rtw89_pci_info;

struct rtw89_mac_gen_def;



extern const struct ieee80211_ops rtw89_ops;
@@ -3435,6 +3436,7 @@ struct rtw89_chip_info { 
	enum rtw89_core_chip_id chip_id;

	enum rtw89_chip_gen chip_gen;

	const struct rtw89_chip_ops *ops;

	const struct rtw89_mac_gen_def *mac_def;

	const char *fw_basename;

	u8 fw_format_max;

	bool try_ce_fw;

drivers/net/wireless/realtek/rtw89/fw.c

+2 −2
Original line number Diff line number Diff line
@@ -3885,7 +3885,7 @@ void rtw89_hw_scan_start(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, 
	rx_fltr &= ~B_AX_A_BC;

	rx_fltr &= ~B_AX_A_A1_MATCH;

	rtw89_write32_mask(rtwdev,

			   rtw89_mac_reg_by_idx(R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   B_AX_RX_FLTR_CFG_MASK,

			   rx_fltr);

}
@@ -3903,7 +3903,7 @@ void rtw89_hw_scan_complete(struct rtw89_dev *rtwdev, struct ieee80211_vif *vif, 
		return;



	rtw89_write32_mask(rtwdev,

			   rtw89_mac_reg_by_idx(R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   rtw89_mac_reg_by_idx(rtwdev, R_AX_RX_FLTR_OPT, RTW89_MAC_0),

			   B_AX_RX_FLTR_CFG_MASK,

			   rtwdev->hal.rx_fltr);

drivers/net/wireless/realtek/rtw89/mac.c

+89 −82

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/realtek/rtw89/mac.h

+24 −12

File changed.

Preview size limit exceeded, changes collapsed.