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

wifi: rtw89: use struct instead of macros to set H2C command of hardware scan 



Remove macros that set H2C data. Instead, use struct and
le32_encode_bits() with mask definition to make it clean.

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/20230415034900.15679-4-pkshih@realtek.com
parent e7399db2

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

+26 −19
Original line number Diff line number Diff line
@@ -2546,44 +2546,51 @@ int rtw89_fw_h2c_scan_list_offload(struct rtw89_dev *rtwdev, int len, 
	return ret;

}



#define H2C_LEN_SCAN_OFFLOAD 28

int rtw89_fw_h2c_scan_offload(struct rtw89_dev *rtwdev,

			      struct rtw89_scan_option *option,

			      struct rtw89_vif *rtwvif)

{

	struct rtw89_chan *op = &rtwdev->scan_info.op_chan;

	struct rtw89_h2c_scanofld *h2c;

	u32 len = sizeof(*h2c);

	struct sk_buff *skb;

	u8 *cmd;

	int ret;



	skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, H2C_LEN_SCAN_OFFLOAD);

	skb = rtw89_fw_h2c_alloc_skb_with_hdr(rtwdev, len);

	if (!skb) {

		rtw89_err(rtwdev, "failed to alloc skb for h2c scan offload\n");

		return -ENOMEM;

	}

	skb_put(skb, H2C_LEN_SCAN_OFFLOAD);

	cmd = skb->data;

	skb_put(skb, len);

	h2c = (struct rtw89_h2c_scanofld *)skb->data;



	h2c->w0 = le32_encode_bits(rtwvif->mac_id, RTW89_H2C_SCANOFLD_W0_MACID) |

		  le32_encode_bits(rtwvif->port, RTW89_H2C_SCANOFLD_W0_PORT_ID) |

		  le32_encode_bits(RTW89_PHY_0, RTW89_H2C_SCANOFLD_W0_BAND) |

		  le32_encode_bits(option->enable, RTW89_H2C_SCANOFLD_W0_OPERATION);



	h2c->w1 = le32_encode_bits(true, RTW89_H2C_SCANOFLD_W1_NOTIFY_END) |

		  le32_encode_bits(option->target_ch_mode,

				   RTW89_H2C_SCANOFLD_W1_TARGET_CH_MODE) |

		  le32_encode_bits(RTW89_SCAN_IMMEDIATE,

				   RTW89_H2C_SCANOFLD_W1_START_MODE) |

		  le32_encode_bits(RTW89_SCAN_ONCE, RTW89_H2C_SCANOFLD_W1_SCAN_TYPE);



	RTW89_SET_FWCMD_SCANOFLD_MACID(cmd, rtwvif->mac_id);

	RTW89_SET_FWCMD_SCANOFLD_PORT_ID(cmd, rtwvif->port);

	RTW89_SET_FWCMD_SCANOFLD_BAND(cmd, RTW89_PHY_0);

	RTW89_SET_FWCMD_SCANOFLD_OPERATION(cmd, option->enable);

	RTW89_SET_FWCMD_SCANOFLD_NOTIFY_END(cmd, true);

	RTW89_SET_FWCMD_SCANOFLD_TARGET_CH_MODE(cmd, option->target_ch_mode);

	RTW89_SET_FWCMD_SCANOFLD_START_MODE(cmd, RTW89_SCAN_IMMEDIATE);

	RTW89_SET_FWCMD_SCANOFLD_SCAN_TYPE(cmd, RTW89_SCAN_ONCE);

	if (option->target_ch_mode) {

		RTW89_SET_FWCMD_SCANOFLD_TARGET_CH_BW(cmd, op->band_width);

		RTW89_SET_FWCMD_SCANOFLD_TARGET_PRI_CH(cmd,

						       op->primary_channel);

		RTW89_SET_FWCMD_SCANOFLD_TARGET_CENTRAL_CH(cmd, op->channel);

		RTW89_SET_FWCMD_SCANOFLD_TARGET_CH_BAND(cmd, op->band_type);

		h2c->w1 |= le32_encode_bits(op->band_width,

					    RTW89_H2C_SCANOFLD_W1_TARGET_CH_BW) |

			   le32_encode_bits(op->primary_channel,

					    RTW89_H2C_SCANOFLD_W1_TARGET_PRI_CH) |

			   le32_encode_bits(op->channel,

					    RTW89_H2C_SCANOFLD_W1_TARGET_CENTRAL_CH);

		h2c->w0 |= le32_encode_bits(op->band_type,

					    RTW89_H2C_SCANOFLD_W0_TARGET_CH_BAND);

	}



	rtw89_h2c_pkt_set_hdr(rtwdev, skb, FWCMD_TYPE_H2C,

			      H2C_CAT_MAC, H2C_CL_MAC_FW_OFLD,

			      H2C_FUNC_SCANOFLD, 1, 1,

			      H2C_LEN_SCAN_OFFLOAD);

			      len);



	ret = rtw89_h2c_tx(rtwdev, skb, false);

	if (ret) {

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

+25 −89
Original line number Diff line number Diff line
@@ -2731,96 +2731,32 @@ static inline void RTW89_SET_FWCMD_CHINFO_POWER_IDX(void *cmd, u32 val) 
	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 16), val, GENMASK(15, 0));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_MACID(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd)), val, GENMASK(7, 0));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_NORM_CY(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd)), val, GENMASK(15, 8));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_PORT_ID(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd)), val, GENMASK(18, 16));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_BAND(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd)), val, BIT(19));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_OPERATION(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd)), val, GENMASK(21, 20));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_TARGET_CH_BAND(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd)), val, GENMASK(23, 22));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_NOTIFY_END(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 4), val, BIT(0));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_TARGET_CH_MODE(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 4), val, BIT(1));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_START_MODE(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 4), val, BIT(2));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_SCAN_TYPE(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 4), val, GENMASK(4, 3));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_TARGET_CH_BW(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 4), val, GENMASK(7, 5));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_TARGET_PRI_CH(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 4), val, GENMASK(15, 8));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_TARGET_CENTRAL_CH(void *cmd,

							      u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 4), val, GENMASK(23, 16));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_PROBE_REQ_PKT_ID(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 4), val, GENMASK(31, 24));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_NORM_PD(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 8), val, GENMASK(15, 0));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_SLOW_PD(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 8), val, GENMASK(23, 16));

}



static inline void RTW89_SET_FWCMD_SCANOFLD_TSF_HIGH(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 12), val, GENMASK(31, 0));

}

struct rtw89_h2c_scanofld {

	__le32 w0;

	__le32 w1;

	__le32 w2;

	__le32 tsf_high;

	__le32 tsf_low;

	__le32 w5;

	__le32 w6;

} __packed;



static inline void RTW89_SET_FWCMD_SCANOFLD_TSF_SLOW(void *cmd, u32 val)

{

	le32p_replace_bits((__le32 *)((u8 *)(cmd) + 16), val, GENMASK(31, 0));

}

#define RTW89_H2C_SCANOFLD_W0_MACID GENMASK(7, 0)

#define RTW89_H2C_SCANOFLD_W0_NORM_CY GENMASK(15, 8)

#define RTW89_H2C_SCANOFLD_W0_PORT_ID GENMASK(18, 16)

#define RTW89_H2C_SCANOFLD_W0_BAND BIT(19)

#define RTW89_H2C_SCANOFLD_W0_OPERATION GENMASK(21, 20)

#define RTW89_H2C_SCANOFLD_W0_TARGET_CH_BAND GENMASK(23, 22)

#define RTW89_H2C_SCANOFLD_W1_NOTIFY_END BIT(0)

#define RTW89_H2C_SCANOFLD_W1_TARGET_CH_MODE BIT(1)

#define RTW89_H2C_SCANOFLD_W1_START_MODE BIT(2)

#define RTW89_H2C_SCANOFLD_W1_SCAN_TYPE GENMASK(4, 3)

#define RTW89_H2C_SCANOFLD_W1_TARGET_CH_BW GENMASK(7, 5)

#define RTW89_H2C_SCANOFLD_W1_TARGET_PRI_CH GENMASK(15, 8)

#define RTW89_H2C_SCANOFLD_W1_TARGET_CENTRAL_CH GENMASK(23, 16)

#define RTW89_H2C_SCANOFLD_W1_PROBE_REQ_PKT_ID GENMASK(31, 24)

#define RTW89_H2C_SCANOFLD_W2_NORM_PD GENMASK(15, 0)

#define RTW89_H2C_SCANOFLD_W2_SLOW_PD GENMASK(23, 16)



static inline void RTW89_SET_FWCMD_P2P_MACID(void *cmd, u32 val)

{