Commit 5944cd02 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: unify txwi and rxwi structures 



txwi and rxwi are the same for mt76x0 and mt76x2.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5327b5ea

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

+6 −6
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static unsigned int ieee80211_get_hdrlen_from_buf(const u8 *data, unsigned len) 
}



static struct sk_buff *

mt76x0_rx_skb_from_seg(struct mt76x0_dev *dev, struct mt76x0_rxwi *rxwi,

mt76x0_rx_skb_from_seg(struct mt76x0_dev *dev, struct mt76x02_rxwi *rxwi,

			void *data, u32 seg_len, u32 truesize, struct page *p)

{

	struct sk_buff *skb;
@@ -86,7 +86,7 @@ static void mt76x0_rx_process_seg(struct mt76x0_dev *dev, u8 *data, 
				   u32 seg_len, struct page *p)

{

	struct sk_buff *skb;

	struct mt76x0_rxwi *rxwi;

	struct mt76x02_rxwi *rxwi;

	u32 fce_info, truesize = seg_len;



	/* DMA_INFO field at the beginning of the segment contains only some of
@@ -98,9 +98,9 @@ static void mt76x0_rx_process_seg(struct mt76x0_dev *dev, u8 *data, 
	data += MT_DMA_HDR_LEN;

	seg_len -= MT_DMA_HDR_LEN;



	rxwi = (struct mt76x0_rxwi *) data;

	data += sizeof(struct mt76x0_rxwi);

	seg_len -= sizeof(struct mt76x0_rxwi);

	rxwi = (struct mt76x02_rxwi *) data;

	data += sizeof(struct mt76x02_rxwi);

	seg_len -= sizeof(struct mt76x02_rxwi);



	if (unlikely(FIELD_GET(MT_RXD_INFO_TYPE, fce_info)))

		dev_err_once(dev->mt76.dev, "Error: RX path seen a non-pkt urb\n");
@@ -119,7 +119,7 @@ static void mt76x0_rx_process_seg(struct mt76x0_dev *dev, u8 *data, 
static u16 mt76x0_rx_next_seg_len(u8 *data, u32 data_len)

{

	u32 min_seg_len = MT_DMA_HDR_LEN + MT_RX_INFO_LEN +

		sizeof(struct mt76x0_rxwi) + MT_FCE_INFO_LEN;

		sizeof(struct mt76x02_rxwi) + MT_FCE_INFO_LEN;

	u16 dma_len = get_unaligned_le16(data);



	if (data_len < min_seg_len ||

drivers/net/wireless/mediatek/mt76/mt76x0/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ mt76_mac_process_rate(struct ieee80211_rx_status *status, u16 rate) 
}



static void

mt76x0_rx_monitor_beacon(struct mt76x0_dev *dev, struct mt76x0_rxwi *rxwi,

mt76x0_rx_monitor_beacon(struct mt76x0_dev *dev, struct mt76x02_rxwi *rxwi,

			  u16 rate, int rssi)

{

	dev->bcn_phy_mode = FIELD_GET(MT_RXWI_RATE_PHY, rate);
@@ -451,7 +451,7 @@ u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb, 
			u8 *data, void *rxi)

{

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

	struct mt76x0_rxwi *rxwi = rxi;

	struct mt76x02_rxwi *rxwi = rxi;

	u32 len, ctl = le32_to_cpu(rxwi->ctl);

	u16 rate = le16_to_cpu(rxwi->rate);

	int rssi;

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

+0 −67
Original line number Diff line number Diff line
@@ -15,73 +15,6 @@ 
#ifndef __MT76_MAC_H

#define __MT76_MAC_H



/* Note: values in original "RSSI" and "SNR" fields are not actually what they

 *	 are called for MT76X0U, names used by this driver are educated guesses

 *	 (see vendor mac/ral_omac.c).

 */

struct mt76x0_rxwi {

	__le32 rxinfo;



	__le32 ctl;



	__le16 tid_sn;

	__le16 rate;



	s8 rssi[4];



	__le32 bbp_rxinfo[4];

} __packed __aligned(4);



enum mt76_phy_bandwidth {

	MT_PHY_BW_20,

	MT_PHY_BW_40,

	MT_PHY_BW_80,

};



struct mt76_txwi {

	__le16 flags;

	__le16 rate_ctl;

	u8 ack_ctl;

	u8 wcid;

	__le16 len_ctl;

	__le32 iv;

	__le32 eiv;

	u8 aid;

	u8 txstream;

	u8 ctl2;

	u8 pktid;

} __packed __aligned(4);



#define MT_TXWI_FLAGS_FRAG		BIT(0)

#define MT_TXWI_FLAGS_MMPS		BIT(1)

#define MT_TXWI_FLAGS_CFACK		BIT(2)

#define MT_TXWI_FLAGS_TS		BIT(3)

#define MT_TXWI_FLAGS_AMPDU		BIT(4)

#define MT_TXWI_FLAGS_MPDU_DENSITY	GENMASK(7, 5)

#define MT_TXWI_FLAGS_TXOP		GENMASK(9, 8)

#define MT_TXWI_FLAGS_CWMIN		GENMASK(12, 10)

#define MT_TXWI_FLAGS_NO_RATE_FALLBACK	BIT(13)

#define MT_TXWI_FLAGS_TX_RPT		BIT(14)

#define MT_TXWI_FLAGS_TX_RATE_LUT	BIT(15)



#define MT_TXWI_RATE_MCS		GENMASK(6, 0)

#define MT_TXWI_RATE_BW			BIT(7)

#define MT_TXWI_RATE_SGI		BIT(8)

#define MT_TXWI_RATE_STBC		GENMASK(10, 9)

#define MT_TXWI_RATE_PHY_MODE		GENMASK(15, 14)



#define MT_TXWI_ACK_CTL_REQ		BIT(0)

#define MT_TXWI_ACK_CTL_NSEQ		BIT(1)

#define MT_TXWI_ACK_CTL_BA_WINDOW	GENMASK(7, 2)



#define MT_TXWI_LEN_BYTE_CNT		GENMASK(11, 0)



#define MT_TXWI_CTL_TX_POWER_ADJ	GENMASK(3, 0)

#define MT_TXWI_CTL_CHAN_CHECK_PKT	BIT(4)

#define MT_TXWI_CTL_PIFS_REV		BIT(6)



#define MT_TXWI_PKTID_PROBE             BIT(7)



u32 mt76x0_mac_process_rx(struct mt76x0_dev *dev, struct sk_buff *skb,

			u8 *data, void *rxi);

struct mt76x02_tx_status

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

+1 −3
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ struct mt76x0_wcid { 
	u8 tx_rate_nss;

};



struct mt76x0_rxwi;



extern const struct ieee80211_ops mt76x0_ops;



static inline bool is_mt7610e(struct mt76x0_dev *dev)
@@ -229,7 +227,7 @@ void mt76x0_agc_restore(struct mt76x0_dev *dev); 
int mt76x0_phy_set_channel(struct mt76x0_dev *dev,

			    struct cfg80211_chan_def *chandef);

void mt76x0_phy_recalibrate_after_assoc(struct mt76x0_dev *dev);

int mt76x0_phy_get_rssi(struct mt76x0_dev *dev, struct mt76x0_rxwi *rxwi);

int mt76x0_phy_get_rssi(struct mt76x0_dev *dev, struct mt76x02_rxwi *rxwi);

void mt76x0_phy_con_cal_onoff(struct mt76x0_dev *dev,

			       struct ieee80211_bss_conf *info);

drivers/net/wireless/mediatek/mt76/mt76x0/phy.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ mt76x0_bbp_set_ctrlch(struct mt76x0_dev *dev, enum nl80211_chan_width width, 
	mt76_rmw_field(dev, MT_BBP(TXBE, 0), MT_BBP_TXBE_R0_CTRL_CHAN, ctrl);

}



int mt76x0_phy_get_rssi(struct mt76x0_dev *dev, struct mt76x0_rxwi *rxwi)

int mt76x0_phy_get_rssi(struct mt76x0_dev *dev, struct mt76x02_rxwi *rxwi)

{

	s8 lna_gain, rssi_offset;

	int val;

CRA Git | Maintained and supported by SUSTech CRA and CCSE