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

wifi: mt76: move shared mac definitions in mt76_connac2_mac.h 



Move some mac shared definitions between mt7996, mt7921 and mt7915 in
mt76_connac2_mac.h.

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

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

+0 −12
Original line number Diff line number Diff line
@@ -19,18 +19,6 @@ 
#define MT_RXD0_NORMAL_GROUP_3		BIT(27)

#define MT_RXD0_NORMAL_GROUP_4		BIT(28)



enum rx_pkt_type {

	PKT_TYPE_TXS,

	PKT_TYPE_TXRXV,

	PKT_TYPE_NORMAL,

	PKT_TYPE_RX_DUP_RFB,

	PKT_TYPE_RX_TMR,

	PKT_TYPE_RETRIEVE,

	PKT_TYPE_TXRX_NOTIFY,

	PKT_TYPE_RX_EVENT,

	PKT_TYPE_NORMAL_MCU,

};



#define MT_RXD1_NORMAL_BSSID		GENMASK(31, 26)

#define MT_RXD1_NORMAL_PAYLOAD_FORMAT	GENMASK(25, 24)

#define MT_RXD1_FIRST_AMSDU_FRAME	GENMASK(1, 0)

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

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


#include "mt76.h"



enum rx_pkt_type {

	PKT_TYPE_TXS,

	PKT_TYPE_TXRXV,

	PKT_TYPE_NORMAL,

	PKT_TYPE_RX_DUP_RFB,

	PKT_TYPE_RX_TMR,

	PKT_TYPE_RETRIEVE,

	PKT_TYPE_TXRX_NOTIFY,

	PKT_TYPE_RX_EVENT,

	PKT_TYPE_NORMAL_MCU,

	PKT_TYPE_RX_FW_MONITOR	= 0x0c,

	PKT_TYPE_TXRX_NOTIFY_V0	= 0x18,

};



#define MT76_CONNAC_SCAN_IE_LEN			600

#define MT76_CONNAC_MAX_NUM_SCHED_SCAN_INTERVAL	 10

#define MT76_CONNAC_MAX_TIME_SCHED_SCAN_INTERVAL U16_MAX

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

+22 −0
Original line number Diff line number Diff line
@@ -32,6 +32,16 @@ enum { 
	MT_LMAC_PSMP0,

};



#define MT_TX_FREE_MSDU_CNT		GENMASK(9, 0)

#define MT_TX_FREE_WLAN_ID		GENMASK(23, 14)

#define MT_TX_FREE_LATENCY		GENMASK(12, 0)

/* 0: success, others: dropped */

#define MT_TX_FREE_STATUS		GENMASK(14, 13)

#define MT_TX_FREE_MSDU_ID		GENMASK(30, 16)

#define MT_TX_FREE_PAIR			BIT(31)

/* will support this field in further revision */

#define MT_TX_FREE_RATE			GENMASK(13, 0)



#define MT_TXD0_Q_IDX			GENMASK(31, 25)

#define MT_TXD0_PKT_FMT			GENMASK(24, 23)

#define MT_TXD0_ETH_TYPE_OFFSET		GENMASK(22, 16)
@@ -166,6 +176,15 @@ enum { 


#define MT_TXS7_MPDU_RETRY_CNT		GENMASK(31, 23)



/* RXD DW0 */

#define MT_RXD0_LENGTH			GENMASK(15, 0)

#define MT_RXD0_PKT_FLAG                GENMASK(19, 16)

#define MT_RXD0_PKT_TYPE		GENMASK(31, 27)



#define MT_RXD0_NORMAL_ETH_TYPE_OFS	GENMASK(22, 16)

#define MT_RXD0_NORMAL_IP_SUM		BIT(23)

#define MT_RXD0_NORMAL_UDP_TCP_SUM	BIT(24)



/* RXD DW1 */

#define MT_RXD1_NORMAL_WLAN_IDX		GENMASK(9, 0)

#define MT_RXD1_NORMAL_GROUP_1		BIT(11)
@@ -308,6 +327,9 @@ enum { 
#define MT_CRXV_FOE_HI		GENMASK(6, 0)

#define MT_CRXV_FOE_SHIFT	13



#define MT_CT_PARSE_LEN			72

#define MT_CT_DMA_BUF_NUM		2



#define MT_CT_INFO_APPLY_TXD		BIT(0)

#define MT_CT_INFO_COPY_HOST_TXD_ALL	BIT(1)

#define MT_CT_INFO_MGMT_FRAME		BIT(2)

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

+1 −32
Original line number Diff line number Diff line
@@ -6,43 +6,12 @@ 


#include "../mt76_connac2_mac.h"



#define MT_CT_PARSE_LEN			72

#define MT_CT_DMA_BUF_NUM		2



#define MT_RXD0_LENGTH			GENMASK(15, 0)

#define MT_RXD0_PKT_TYPE		GENMASK(31, 27)



#define MT_RXD0_NORMAL_ETH_TYPE_OFS	GENMASK(22, 16)

#define MT_RXD0_NORMAL_IP_SUM		BIT(23)

#define MT_RXD0_NORMAL_UDP_TCP_SUM	BIT(24)



enum rx_pkt_type {

	PKT_TYPE_TXS,

	PKT_TYPE_TXRXV,

	PKT_TYPE_NORMAL,

	PKT_TYPE_RX_DUP_RFB,

	PKT_TYPE_RX_TMR,

	PKT_TYPE_RETRIEVE,

	PKT_TYPE_TXRX_NOTIFY,

	PKT_TYPE_RX_EVENT,

	PKT_TYPE_RX_FW_MONITOR = 0x0c,

	PKT_TYPE_TXRX_NOTIFY_V0 = 0x18,

};



#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)

#define MT_TX_FREE_WLAN_ID		GENMASK(23, 14)

#define MT_TX_FREE_LATENCY		GENMASK(12, 0)

/* 0: success, others: dropped */

#define MT_TX_FREE_MSDU_ID		GENMASK(30, 16)

#define MT_TX_FREE_PAIR			BIT(31)

#define MT_TX_FREE_MPDU_HEADER		BIT(30)

#define MT_TX_FREE_MSDU_ID_V3		GENMASK(14, 0)



/* will support this field in further revision */

#define MT_TX_FREE_RATE			GENMASK(13, 0)



#define MT_TXS5_F0_FINAL_MPDU		BIT(31)

#define MT_TXS5_F0_QOS			BIT(30)

#define MT_TXS5_F0_TX_COUNT		GENMASK(29, 25)

drivers/net/wireless/mediatek/mt76/mt7921/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include "mt7921.h"

#include "../dma.h"

#include "mac.h"

#include "../mt76_connac2_mac.h"



static int mt7921_poll_tx(struct napi_struct *napi, int budget)

{