Commit 5562d5f6 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7915: rely on mt76_connac definitions 



Remove duplicated mcu definitions in mt7915 mcu.h and reused connac
ones.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent ffc2198d

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+2 −2
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ mt7615_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 


	bss = (struct bss_info_basic *)tlv;

	bss->network_type = cpu_to_le32(type);

	bss->bmc_tx_wlan_idx = wlan_idx;

	bss->bmc_wcid_lo = wlan_idx;

	bss->wmm_idx = mvif->mt76.wmm_idx;

	bss->active = enable;
@@ -1622,7 +1622,7 @@ static int mt7615_load_firmware(struct mt7615_dev *dev) 


	if (!mt76_poll_msec(dev, MT_TOP_MISC2, MT_TOP_MISC2_FW_STATE,

			    FIELD_PREP(MT_TOP_MISC2_FW_STATE,

				       FW_STATE_CR4_RDY), 500)) {

				       FW_STATE_RDY), 500)) {

		dev_err(dev->mt76.dev, "Timeout for initializing firmware\n");

		return -EIO;

	}

drivers/net/wireless/mediatek/mt76/mt7615/mcu.h

+0 −127
Original line number Diff line number Diff line
@@ -76,35 +76,6 @@ struct mt7615_uni_txd { 
	u8 reserved2[4];

} __packed __aligned(4);



/* event table */

enum {

	MCU_EVENT_TARGET_ADDRESS_LEN = 0x01,

	MCU_EVENT_FW_START = 0x01,

	MCU_EVENT_GENERIC = 0x01,

	MCU_EVENT_ACCESS_REG = 0x02,

	MCU_EVENT_MT_PATCH_SEM = 0x04,

	MCU_EVENT_REG_ACCESS = 0x05,

	MCU_EVENT_SCAN_DONE = 0x0d,

	MCU_EVENT_ROC = 0x10,

	MCU_EVENT_BSS_ABSENCE  = 0x11,

	MCU_EVENT_BSS_BEACON_LOSS = 0x13,

	MCU_EVENT_CH_PRIVILEGE = 0x18,

	MCU_EVENT_SCHED_SCAN_DONE = 0x23,

	MCU_EVENT_EXT = 0xed,

	MCU_EVENT_RESTART_DL = 0xef,

	MCU_EVENT_COREDUMP = 0xf0,

};



/* ext event table */

enum {

	MCU_EXT_EVENT_PS_SYNC = 0x5,

	MCU_EXT_EVENT_FW_LOG_2_HOST = 0x13,

	MCU_EXT_EVENT_THERMAL_PROTECT = 0x22,

	MCU_EXT_EVENT_ASSERT_DUMP = 0x23,

	MCU_EXT_EVENT_RDD_REPORT = 0x3a,

	MCU_EXT_EVENT_CSA_NOTIFY = 0x4f,

};



enum {

    MT_SKU_CCK_1_2 = 0,

    MT_SKU_CCK_55_11,
@@ -233,20 +204,6 @@ struct mt7615_mcu_rdd_report { 
#define MCU_PQ_ID(p, q)		(((p) << 15) | ((q) << 10))

#define MCU_PKT_ID		0xa0



enum {

	MCU_Q_QUERY,

	MCU_Q_SET,

	MCU_Q_RESERVED,

	MCU_Q_NA

};



enum {

	MCU_S2D_H2N,

	MCU_S2D_C2N,

	MCU_S2D_H2C,

	MCU_S2D_H2CN

};



enum {

	MCU_ATE_SET_FREQ_OFFSET = 0xa,

	MCU_ATE_SET_TX_POWER_CONTROL = 0x15,
@@ -280,21 +237,6 @@ struct mt7615_roc_tlv { 
	u8 rsv1[8];

} __packed;



enum {

	PATCH_NOT_DL_SEM_FAIL	 = 0x0,

	PATCH_IS_DL		 = 0x1,

	PATCH_NOT_DL_SEM_SUCCESS = 0x2,

	PATCH_REL_SEM_SUCCESS	 = 0x3

};



enum {

	FW_STATE_INITIAL          = 0,

	FW_STATE_FW_DOWNLOAD      = 1,

	FW_STATE_NORMAL_OPERATION = 2,

	FW_STATE_NORMAL_TRX       = 3,

	FW_STATE_CR4_RDY          = 7

};



enum {

	FW_STATE_PWR_ON = 1,

	FW_STATE_N9_RDY = 2,
@@ -312,73 +254,4 @@ enum { 
	__DBDC_TYPE_MAX,

};



struct bss_info_omac {

	__le16 tag;

	__le16 len;

	u8 hw_bss_idx;

	u8 omac_idx;

	u8 band_idx;

	u8 rsv0;

	__le32 conn_type;

	u32 rsv1;

} __packed;



struct bss_info_basic {

	__le16 tag;

	__le16 len;

	__le32 network_type;

	u8 active;

	u8 rsv0;

	__le16 bcn_interval;

	u8 bssid[ETH_ALEN];

	u8 wmm_idx;

	u8 dtim_period;

	u8 bmc_tx_wlan_idx;

	u8 cipher; /* not used */

	u8 phymode; /* not used */

	u8 rsv1[5];

} __packed;



struct bss_info_rf_ch {

	__le16 tag;

	__le16 len;

	u8 pri_ch;

	u8 central_ch0;

	u8 central_ch1;

	u8 bw;

} __packed;



struct bss_info_ext_bss {

	__le16 tag;

	__le16 len;

	__le32 mbss_tsf_offset; /* in unit of us */

	u8 rsv[8];

} __packed;



enum {

	BSS_INFO_OMAC,

	BSS_INFO_BASIC,

	BSS_INFO_RF_CH, /* optional, for BT/LTE coex */

	BSS_INFO_PM, /* sta only */

	BSS_INFO_UAPSD, /* sta only */

	BSS_INFO_ROAM_DETECTION, /* obsoleted */

	BSS_INFO_LQ_RM, /* obsoleted */

	BSS_INFO_EXT_BSS,

	BSS_INFO_BMC_INFO, /* for bmc rate control in CR4 */

	BSS_INFO_SYNC_MODE, /* obsoleted */

	BSS_INFO_RA,

	BSS_INFO_MAX_NUM

};



enum {

	CH_SWITCH_NORMAL = 0,

	CH_SWITCH_SCAN = 3,

	CH_SWITCH_MCC = 4,

	CH_SWITCH_DFS = 5,

	CH_SWITCH_BACKGROUND_SCAN_START = 6,

	CH_SWITCH_BACKGROUND_SCAN_RUNNING = 7,

	CH_SWITCH_BACKGROUND_SCAN_STOP = 8,

	CH_SWITCH_SCAN_BYPASS_DPD = 9

};



#endif

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

+398 −2
Original line number Diff line number Diff line
@@ -11,6 +11,76 @@ struct tlv { 
	__le16 len;

} __packed;



struct bss_info_omac {

	__le16 tag;

	__le16 len;

	u8 hw_bss_idx;

	u8 omac_idx;

	u8 band_idx;

	u8 rsv0;

	__le32 conn_type;

	u32 rsv1;

} __packed;



struct bss_info_basic {

	__le16 tag;

	__le16 len;

	__le32 network_type;

	u8 active;

	u8 rsv0;

	__le16 bcn_interval;

	u8 bssid[ETH_ALEN];

	u8 wmm_idx;

	u8 dtim_period;

	u8 bmc_wcid_lo;

	u8 cipher;

	u8 phy_mode;

	u8 max_bssid;	/* max BSSID. range: 1 ~ 8, 0: MBSSID disabled */

	u8 non_tx_bssid;/* non-transmitted BSSID, 0: transmitted BSSID */

	u8 bmc_wcid_hi;	/* high Byte and version */

	u8 rsv[2];

} __packed;



struct bss_info_rf_ch {

	__le16 tag;

	__le16 len;

	u8 pri_ch;

	u8 center_ch0;

	u8 center_ch1;

	u8 bw;

	u8 he_ru26_block;	/* 1: don't send HETB in RU26, 0: allow */

	u8 he_all_disable;	/* 1: disallow all HETB, 0: allow */

	u8 rsv[2];

} __packed;



struct bss_info_ext_bss {

	__le16 tag;

	__le16 len;

	__le32 mbss_tsf_offset; /* in unit of us */

	u8 rsv[8];

} __packed;



enum {

	BSS_INFO_OMAC,

	BSS_INFO_BASIC,

	BSS_INFO_RF_CH,		/* optional, for BT/LTE coex */

	BSS_INFO_PM,		/* sta only */

	BSS_INFO_UAPSD,		/* sta only */

	BSS_INFO_ROAM_DETECT,	/* obsoleted */

	BSS_INFO_LQ_RM,		/* obsoleted */

	BSS_INFO_EXT_BSS,

	BSS_INFO_BMC_RATE,	/* for bmc rate control in CR4 */

	BSS_INFO_SYNC_MODE,	/* obsoleted */

	BSS_INFO_RA,

	BSS_INFO_HW_AMSDU,

	BSS_INFO_BSS_COLOR,

	BSS_INFO_HE_BASIC,

	BSS_INFO_PROTECT_INFO,

	BSS_INFO_OFFLOAD,

	BSS_INFO_11V_MBSSID,

	BSS_INFO_MAX_NUM

};



/* sta_rec */



struct sta_ntlv_hdr {
@@ -54,7 +124,7 @@ struct sta_rec_vht { 
	__le32 vht_cap;

	__le16 vht_rx_mcs_map;

	__le16 vht_tx_mcs_map;

	/* mt7921 */

	/* mt7915 - mt7921 */

	u8 rts_bw_sig;

	u8 rsv[3];

} __packed;
@@ -152,6 +222,191 @@ struct sta_rec_he_6g_capa { 
	u8 rsv[2];

} __packed;



struct sec_key {

	u8 cipher_id;

	u8 cipher_len;

	u8 key_id;

	u8 key_len;

	u8 key[32];

} __packed;



struct sta_rec_sec {

	__le16 tag;

	__le16 len;

	u8 add;

	u8 n_cipher;

	u8 rsv[2];



	struct sec_key key[2];

} __packed;



struct sta_rec_bf {

	__le16 tag;

	__le16 len;



	__le16 pfmu;		/* 0xffff: no access right for PFMU */

	bool su_mu;		/* 0: SU, 1: MU */

	u8 bf_cap;		/* 0: iBF, 1: eBF */

	u8 sounding_phy;	/* 0: legacy, 1: OFDM, 2: HT, 4: VHT */

	u8 ndpa_rate;

	u8 ndp_rate;

	u8 rept_poll_rate;

	u8 tx_mode;		/* 0: legacy, 1: OFDM, 2: HT, 4: VHT ... */

	u8 ncol;

	u8 nrow;

	u8 bw;			/* 0: 20M, 1: 40M, 2: 80M, 3: 160M */



	u8 mem_total;

	u8 mem_20m;

	struct {

		u8 row;

		u8 col: 6, row_msb: 2;

	} mem[4];



	__le16 smart_ant;

	u8 se_idx;

	u8 auto_sounding;	/* b7: low traffic indicator

				 * b6: Stop sounding for this entry

				 * b5 ~ b0: postpone sounding

				 */

	u8 ibf_timeout;

	u8 ibf_dbw;

	u8 ibf_ncol;

	u8 ibf_nrow;

	u8 nrow_bw160;

	u8 ncol_bw160;

	u8 ru_start_idx;

	u8 ru_end_idx;



	bool trigger_su;

	bool trigger_mu;

	bool ng16_su;

	bool ng16_mu;

	bool codebook42_su;

	bool codebook75_mu;



	u8 he_ltf;

	u8 rsv[3];

} __packed;



struct sta_rec_bfee {

	__le16 tag;

	__le16 len;

	bool fb_identity_matrix;	/* 1: feedback identity matrix */

	bool ignore_feedback;		/* 1: ignore */

	u8 rsv[2];

} __packed;



struct sta_rec_muru {

	__le16 tag;

	__le16 len;



	struct {

		bool ofdma_dl_en;

		bool ofdma_ul_en;

		bool mimo_dl_en;

		bool mimo_ul_en;

		u8 rsv[4];

	} cfg;



	struct {

		u8 punc_pream_rx;

		bool he_20m_in_40m_2g;

		bool he_20m_in_160m;

		bool he_80m_in_160m;

		bool lt16_sigb;

		bool rx_su_comp_sigb;

		bool rx_su_non_comp_sigb;

		u8 rsv;

	} ofdma_dl;



	struct {

		u8 t_frame_dur;

		u8 mu_cascading;

		u8 uo_ra;

		u8 he_2x996_tone;

		u8 rx_t_frame_11ac;

		u8 rsv[3];

	} ofdma_ul;



	struct {

		bool vht_mu_bfee;

		bool partial_bw_dl_mimo;

		u8 rsv[2];

	} mimo_dl;



	struct {

		bool full_ul_mimo;

		bool partial_ul_mimo;

		u8 rsv[2];

	} mimo_ul;

} __packed;



struct sta_phy {

	u8 type;

	u8 flag;

	u8 stbc;

	u8 sgi;

	u8 bw;

	u8 ldpc;

	u8 mcs;

	u8 nss;

	u8 he_ltf;

};



struct sta_rec_ra {

	__le16 tag;

	__le16 len;



	u8 valid;

	u8 auto_rate;

	u8 phy_mode;

	u8 channel;

	u8 bw;

	u8 disable_cck;

	u8 ht_mcs32;

	u8 ht_gf;

	u8 ht_mcs[4];

	u8 mmps_mode;

	u8 gband_256;

	u8 af;

	u8 auth_wapi_mode;

	u8 rate_len;



	u8 supp_mode;

	u8 supp_cck_rate;

	u8 supp_ofdm_rate;

	__le32 supp_ht_mcs;

	__le16 supp_vht_mcs[4];



	u8 op_mode;

	u8 op_vht_chan_width;

	u8 op_vht_rx_nss;

	u8 op_vht_rx_nss_type;



	__le32 sta_cap;



	struct sta_phy phy;

} __packed;



struct sta_rec_ra_fixed {

	__le16 tag;

	__le16 len;



	__le32 field;

	u8 op_mode;

	u8 op_vht_chan_width;

	u8 op_vht_rx_nss;

	u8 op_vht_rx_nss_type;



	struct sta_phy phy;



	u8 spe_en;

	u8 short_preamble;

	u8 is_5g;

	u8 mmps_mode;

} __packed;



/* wtbl_rec */



struct wtbl_req_hdr {
@@ -234,6 +489,7 @@ struct wtbl_ba { 
	__le16 sn;

	u8 ba_en;

	u8 ba_winsize_idx;

	/* originator & recipient */

	__le16 ba_winsize;

	/* recipient only */

	u8 peer_addr[ETH_ALEN];
@@ -304,12 +560,17 @@ struct wtbl_raw { 


#define MT76_CONNAC_STA_UPDATE_MAX_SIZE	(sizeof(struct sta_req_hdr) +	\

					 sizeof(struct sta_rec_basic) +	\

					 sizeof(struct sta_rec_bf) +	\

					 sizeof(struct sta_rec_ht) +	\

					 sizeof(struct sta_rec_he) +	\

					 sizeof(struct sta_rec_ba) +	\

					 sizeof(struct sta_rec_vht) +	\

					 sizeof(struct sta_rec_uapsd) + \

					 sizeof(struct sta_rec_amsdu) +	\

					 sizeof(struct sta_rec_muru) +	\

					 sizeof(struct sta_rec_bfee) +	\

					 sizeof(struct sta_rec_ra) +	\

					 sizeof(struct sta_rec_ra_fixed) + \

					 sizeof(struct sta_rec_he_6g_capa) + \

					 sizeof(struct tlv) +		\

					 MT76_CONNAC_WTBL_UPDATE_MAX_SIZE)
@@ -432,6 +693,21 @@ enum { 
#define MODE_VHT				BIT(3)

#define MODE_HE					BIT(4)



#define STA_CAP_WMM				BIT(0)

#define STA_CAP_SGI_20				BIT(4)

#define STA_CAP_SGI_40				BIT(5)

#define STA_CAP_TX_STBC				BIT(6)

#define STA_CAP_RX_STBC				BIT(7)

#define STA_CAP_VHT_SGI_80			BIT(16)

#define STA_CAP_VHT_SGI_160			BIT(17)

#define STA_CAP_VHT_TX_STBC			BIT(18)

#define STA_CAP_VHT_RX_STBC			BIT(19)

#define STA_CAP_VHT_LDPC			BIT(23)

#define STA_CAP_LDPC				BIT(24)

#define STA_CAP_HT				BIT(26)

#define STA_CAP_VHT				BIT(27)

#define STA_CAP_HE				BIT(28)



enum {

	PHY_TYPE_HR_DSSS_INDEX = 0,

	PHY_TYPE_ERP_INDEX,
@@ -490,6 +766,120 @@ enum { 
	DEV_INFO_MAX_NUM

};



/* event table */

enum {

	MCU_EVENT_TARGET_ADDRESS_LEN = 0x01,

	MCU_EVENT_FW_START = 0x01,

	MCU_EVENT_GENERIC = 0x01,

	MCU_EVENT_ACCESS_REG = 0x02,

	MCU_EVENT_MT_PATCH_SEM = 0x04,

	MCU_EVENT_REG_ACCESS = 0x05,

	MCU_EVENT_LP_INFO = 0x07,

	MCU_EVENT_SCAN_DONE = 0x0d,

	MCU_EVENT_TX_DONE = 0x0f,

	MCU_EVENT_ROC = 0x10,

	MCU_EVENT_BSS_ABSENCE  = 0x11,

	MCU_EVENT_BSS_BEACON_LOSS = 0x13,

	MCU_EVENT_CH_PRIVILEGE = 0x18,

	MCU_EVENT_SCHED_SCAN_DONE = 0x23,

	MCU_EVENT_DBG_MSG = 0x27,

	MCU_EVENT_TXPWR = 0xd0,

	MCU_EVENT_EXT = 0xed,

	MCU_EVENT_RESTART_DL = 0xef,

	MCU_EVENT_COREDUMP = 0xf0,

};



/* ext event table */

enum {

	MCU_EXT_EVENT_PS_SYNC = 0x5,

	MCU_EXT_EVENT_FW_LOG_2_HOST = 0x13,

	MCU_EXT_EVENT_THERMAL_PROTECT = 0x22,

	MCU_EXT_EVENT_ASSERT_DUMP = 0x23,

	MCU_EXT_EVENT_RDD_REPORT = 0x3a,

	MCU_EXT_EVENT_CSA_NOTIFY = 0x4f,

	MCU_EXT_EVENT_BCC_NOTIFY = 0x75,

};



enum {

	MCU_Q_QUERY,

	MCU_Q_SET,

	MCU_Q_RESERVED,

	MCU_Q_NA

};



enum {

	MCU_S2D_H2N,

	MCU_S2D_C2N,

	MCU_S2D_H2C,

	MCU_S2D_H2CN

};



enum {

	PATCH_NOT_DL_SEM_FAIL,

	PATCH_IS_DL,

	PATCH_NOT_DL_SEM_SUCCESS,

	PATCH_REL_SEM_SUCCESS

};



enum {

	FW_STATE_INITIAL,

	FW_STATE_FW_DOWNLOAD,

	FW_STATE_NORMAL_OPERATION,

	FW_STATE_NORMAL_TRX,

	FW_STATE_RDY = 7

};



enum {

	CH_SWITCH_NORMAL = 0,

	CH_SWITCH_SCAN = 3,

	CH_SWITCH_MCC = 4,

	CH_SWITCH_DFS = 5,

	CH_SWITCH_BACKGROUND_SCAN_START = 6,

	CH_SWITCH_BACKGROUND_SCAN_RUNNING = 7,

	CH_SWITCH_BACKGROUND_SCAN_STOP = 8,

	CH_SWITCH_SCAN_BYPASS_DPD = 9

};



enum {

	THERMAL_SENSOR_TEMP_QUERY,

	THERMAL_SENSOR_MANUAL_CTRL,

	THERMAL_SENSOR_INFO_QUERY,

	THERMAL_SENSOR_TASK_CTRL,

};



enum mcu_cipher_type {

	MCU_CIPHER_NONE = 0,

	MCU_CIPHER_WEP40,

	MCU_CIPHER_WEP104,

	MCU_CIPHER_WEP128,

	MCU_CIPHER_TKIP,

	MCU_CIPHER_AES_CCMP,

	MCU_CIPHER_CCMP_256,

	MCU_CIPHER_GCMP,

	MCU_CIPHER_GCMP_256,

	MCU_CIPHER_WAPI,

	MCU_CIPHER_BIP_CMAC_128,

};



enum {

	EE_MODE_EFUSE,

	EE_MODE_BUFFER,

};



enum {

	EE_FORMAT_BIN,

	EE_FORMAT_WHOLE,

	EE_FORMAT_MULTIPLE,

};



enum {

	MCU_PHY_STATE_TX_RATE,

	MCU_PHY_STATE_RX_RATE,

	MCU_PHY_STATE_RSSI,

	MCU_PHY_STATE_CONTENTION_RX_RATE,

	MCU_PHY_STATE_OFDMLQ_CNINFO,

};



#define MCU_CMD_ACK				BIT(0)

#define MCU_CMD_UNI				BIT(1)

#define MCU_CMD_QUERY				BIT(2)
@@ -502,6 +892,7 @@ enum { 
#define __MCU_CMD_FIELD_QUERY			BIT(16)

#define __MCU_CMD_FIELD_UNI			BIT(17)

#define __MCU_CMD_FIELD_CE			BIT(18)

#define __MCU_CMD_FIELD_WA			BIT(19)



#define MCU_CMD(_t)				FIELD_PREP(__MCU_CMD_FIELD_ID,		\

							   MCU_CMD_##_t)
@@ -517,6 +908,12 @@ enum { 
							   MCU_CE_CMD_##_t))

#define MCU_CE_QUERY(_t)			(MCU_CE_CMD(_t) | __MCU_CMD_FIELD_QUERY)



#define MCU_WA_CMD(_t)				(MCU_CMD(_t) | __MCU_CMD_FIELD_WA)

#define MCU_WA_EXT_CMD(_t)			(MCU_EXT_CMD(_t) | __MCU_CMD_FIELD_WA)

#define MCU_WA_PARAM_CMD(_t)			(MCU_WA_CMD(WA_PARAM) | \

						 FIELD_PREP(__MCU_CMD_FIELD_EXT_ID, \

							    MCU_WA_PARAM_CMD_##_t))



enum {

	MCU_EXT_CMD_EFUSE_ACCESS = 0x01,

	MCU_EXT_CMD_RF_REG_ACCESS = 0x02,
@@ -558,7 +955,6 @@ enum { 
	MCU_EXT_CMD_SCS_CTRL = 0x82,

	MCU_EXT_CMD_TWT_AGRT_UPDATE = 0x94,

	MCU_EXT_CMD_FW_DBG_CTRL = 0x95,

	MCU_EXT_CMD_OFFCH_SCAN_CTRL = 0x9a,

	MCU_EXT_CMD_SET_RDD_TH = 0x9d,

	MCU_EXT_CMD_MURU_CTRL = 0x9f,

	MCU_EXT_CMD_SET_SPR = 0xa8,

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+9 −8
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ mt7915_mcu_alloc_wtbl_req(struct mt7915_dev *dev, struct mt7915_sta *msta, 


	if (!nskb) {

		nskb = mt76_mcu_msg_alloc(&dev->mt76, NULL,

					  MT7915_WTBL_UPDATE_MAX_SIZE);

					  MT76_CONNAC_WTBL_UPDATE_MAX_SIZE);

		if (!nskb)

			return ERR_PTR(-ENOMEM);
@@ -1204,7 +1204,7 @@ mt7915_mcu_sta_ba(struct mt7915_dev *dev, 
		msta->wcid.amsdu = false;



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

				       MT76_CONNAC_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);
@@ -1223,7 +1223,7 @@ mt7915_mcu_sta_ba(struct mt7915_dev *dev, 
		return ret;



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

				       MT76_CONNAC_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);
@@ -1738,7 +1738,8 @@ int mt7915_mcu_sta_update_hdr_trans(struct mt7915_dev *dev, 
	struct wtbl_req_hdr *wtbl_hdr;

	struct sk_buff *skb;



	skb = mt76_mcu_msg_alloc(&dev->mt76, NULL, MT7915_WTBL_UPDATE_MAX_SIZE);

	skb = mt76_mcu_msg_alloc(&dev->mt76, NULL,

				 MT76_CONNAC_WTBL_UPDATE_MAX_SIZE);

	if (!skb)

		return -ENOMEM;
@@ -2090,7 +2091,7 @@ int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
	int ret;



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

				       MT76_CONNAC_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);
@@ -2303,7 +2304,7 @@ int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
	int ret;



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

				       MT76_CONNAC_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);
@@ -2370,7 +2371,7 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
	msta = sta ? (struct mt7915_sta *)sta->drv_priv : &mvif->sta;



	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

				       MT76_CONNAC_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);
@@ -2945,7 +2946,7 @@ static int mt7915_load_firmware(struct mt7915_dev *dev) 


	if (!mt76_poll_msec(dev, MT_TOP_MISC, MT_TOP_MISC_FW_STATE,

			    FIELD_PREP(MT_TOP_MISC_FW_STATE,

				       FW_STATE_WACPU_RDY), 1000)) {

				       FW_STATE_RDY), 1000)) {

		dev_err(dev->mt76.dev, "Timeout for initializing firmware\n");

		return -EIO;

	}

drivers/net/wireless/mediatek/mt76/mt7915/mcu.h

+2 −794

File changed.

Preview size limit exceeded, changes collapsed.