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

mt76: move mt76_connac2_mcu_fill_message in mt76_connac module 



Move mt76_connac2_mcu_fill_message routine in shared module in order to
reuse it for mt7921 and mt7915e drivers. This is a preliminary patch to
add mt7990 driver support.

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

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

+0 −3
Original line number Diff line number Diff line
@@ -201,9 +201,6 @@ struct mt7615_mcu_rdd_report { 
	} hw_pulse[32];

};



#define MCU_PQ_ID(p, q)		(((p) << 15) | ((q) << 10))

#define MCU_PKT_ID		0xa0



enum {

	MCU_ATE_SET_FREQ_OFFSET = 0xa,

	MCU_ATE_SET_TX_POWER_CONTROL = 0x15,

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

+13 −0
Original line number Diff line number Diff line
@@ -307,4 +307,17 @@ enum { 
#define MT_CT_INFO_HSR2_TX		BIT(4)

#define MT_CT_INFO_FROM_HOST		BIT(7)



enum tx_mcu_port_q_idx {

	MT_TX_MCU_PORT_RX_Q0 = 0x20,

	MT_TX_MCU_PORT_RX_Q1,

	MT_TX_MCU_PORT_RX_Q2,

	MT_TX_MCU_PORT_RX_Q3,

	MT_TX_MCU_PORT_RX_FWDL = 0x3e

};



enum tx_port_idx {

	MT_TX_PORT_IDX_LMAC,

	MT_TX_PORT_IDX_MCU

};



#endif /* __MT76_CONNAC2_MAC_H */

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

+77 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright (C) 2020 MediaTek Inc. */



#include <linux/firmware.h>

#include "mt76_connac2_mac.h"

#include "mt76_connac_mcu.h"



int mt76_connac_mcu_start_firmware(struct mt76_dev *dev, u32 addr, u32 option)
@@ -3034,5 +3035,81 @@ int mt76_connac2_load_patch(struct mt76_dev *dev, const char *fw_name) 
}

EXPORT_SYMBOL_GPL(mt76_connac2_load_patch);



int mt76_connac2_mcu_fill_message(struct mt76_dev *dev, struct sk_buff *skb,

				  int cmd, int *wait_seq)

{

	int txd_len, mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);

	struct mt76_connac2_mcu_uni_txd *uni_txd;

	struct mt76_connac2_mcu_txd *mcu_txd;

	__le32 *txd;

	u32 val;

	u8 seq;



	/* TODO: make dynamic based on msg type */

	dev->mcu.timeout = 20 * HZ;



	seq = ++dev->mcu.msg_seq & 0xf;

	if (!seq)

		seq = ++dev->mcu.msg_seq & 0xf;



	if (cmd == MCU_CMD(FW_SCATTER))

		goto exit;



	txd_len = cmd & __MCU_CMD_FIELD_UNI ? sizeof(*uni_txd) : sizeof(*mcu_txd);

	txd = (__le32 *)skb_push(skb, txd_len);



	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb->len) |

	      FIELD_PREP(MT_TXD0_PKT_FMT, MT_TX_TYPE_CMD) |

	      FIELD_PREP(MT_TXD0_Q_IDX, MT_TX_MCU_PORT_RX_Q0);

	txd[0] = cpu_to_le32(val);



	val = MT_TXD1_LONG_FORMAT |

	      FIELD_PREP(MT_TXD1_HDR_FORMAT, MT_HDR_FORMAT_CMD);

	txd[1] = cpu_to_le32(val);



	if (cmd & __MCU_CMD_FIELD_UNI) {

		uni_txd = (struct mt76_connac2_mcu_uni_txd *)txd;

		uni_txd->len = cpu_to_le16(skb->len - sizeof(uni_txd->txd));

		uni_txd->option = MCU_CMD_UNI_EXT_ACK;

		uni_txd->cid = cpu_to_le16(mcu_cmd);

		uni_txd->s2d_index = MCU_S2D_H2N;

		uni_txd->pkt_type = MCU_PKT_ID;

		uni_txd->seq = seq;



		goto exit;

	}



	mcu_txd = (struct mt76_connac2_mcu_txd *)txd;

	mcu_txd->len = cpu_to_le16(skb->len - sizeof(mcu_txd->txd));

	mcu_txd->pq_id = cpu_to_le16(MCU_PQ_ID(MT_TX_PORT_IDX_MCU,

					       MT_TX_MCU_PORT_RX_Q0));

	mcu_txd->pkt_type = MCU_PKT_ID;

	mcu_txd->seq = seq;

	mcu_txd->cid = mcu_cmd;

	mcu_txd->ext_cid = FIELD_GET(__MCU_CMD_FIELD_EXT_ID, cmd);



	if (mcu_txd->ext_cid || (cmd & __MCU_CMD_FIELD_CE)) {

		if (cmd & __MCU_CMD_FIELD_QUERY)

			mcu_txd->set_query = MCU_Q_QUERY;

		else

			mcu_txd->set_query = MCU_Q_SET;

		mcu_txd->ext_cid_ack = !!mcu_txd->ext_cid;

	} else {

		mcu_txd->set_query = MCU_Q_NA;

	}



	if (cmd & __MCU_CMD_FIELD_WA)

		mcu_txd->s2d_index = MCU_S2D_H2C;

	else

		mcu_txd->s2d_index = MCU_S2D_H2N;



exit:

	if (wait_seq)

		*wait_seq = seq;



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_connac2_mcu_fill_message);



MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");

MODULE_LICENSE("Dual BSD/GPL");

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

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
#define PATCH_SEC_ENC_SCRAMBLE_INFO_MASK	GENMASK(15, 0)

#define PATCH_SEC_ENC_AES_KEY_MASK		GENMASK(7, 0)



#define MCU_PQ_ID(p, q)		(((p) << 15) | ((q) << 10))

#define MCU_PKT_ID		0xa0



struct mt76_connac2_mcu_txd {

	__le32 txd[8];
@@ -1804,4 +1807,6 @@ int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index, 
int mt76_connac2_load_ram(struct mt76_dev *dev, const char *fw_wm,

			  const char *fw_wa);

int mt76_connac2_load_patch(struct mt76_dev *dev, const char *fw_name);

int mt76_connac2_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,

				  int cmd, int *wait_seq);

#endif /* __MT76_CONNAC_MCU_H */

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

+0 −12
Original line number Diff line number Diff line
@@ -29,18 +29,6 @@ enum rx_pkt_type { 
	PKT_TYPE_TXRX_NOTIFY_V0 = 0x18,

};



enum tx_port_idx {

	MT_TX_PORT_IDX_LMAC,

	MT_TX_PORT_IDX_MCU

};



enum tx_mcu_port_q_idx {

	MT_TX_MCU_PORT_RX_Q0 = 0x20,

	MT_TX_MCU_PORT_RX_Q1,

	MT_TX_MCU_PORT_RX_Q2,

	MT_TX_MCU_PORT_RX_Q3,

	MT_TX_MCU_PORT_RX_FWDL = 0x3e

};

#define MT_TX_FREE_VER			GENMASK(18, 16)

#define MT_TX_FREE_MSDU_CNT		GENMASK(9, 0)

#define MT_TX_FREE_MSDU_CNT_V0	GENMASK(6, 0)