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

mt76: unify rxwi parsing between mt76x2 and mt76x0 drivers 



Unify rxwi parsing between mt76x2 and mt76x0. Remove the following
routines:
- mt76x0_phy_get_rssi
- mt76x0_queue_rx_skb
- mt76x0_mac_process_rx
Moreover remove mt76x2/common.c and mt76x0/mac.h since are empty files
Enable CCMP PN sw validation

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent d9f8934e

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

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static const struct mt76_reg_pair mt76x0_mac_reg_table[] = { 
	{ MT_LDO_CTRL_1,		0x6B006464 },

	{ MT_HT_BASIC_RATE,		0x00004003 },

	{ MT_HT_CTRL_CFG,		0x000001FF },

	{ MT_TXOP_HLDR_ET,		0x00000000 }

	{ MT_TXOP_HLDR_ET,		0x00000000 },

	{ MT_PN_PAD_MODE,		0x00000003 },

};



static const struct mt76_reg_pair mt76x0_bbp_init_tab[] = {

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

+0 −43
Original line number Diff line number Diff line
@@ -195,46 +195,3 @@ void mt76x0_mac_set_ampdu_factor(struct mt76x02_dev *dev) 
	mt76_wr(dev, MT_MAX_LEN_CFG, 0xa0fff |

		   FIELD_PREP(MT_MAX_LEN_CFG_AMPDU, min_factor));

}
 


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

			  void *rxi)

{

	struct mt76_rx_status *status = (struct mt76_rx_status *) skb->cb;

	struct mt76x02_rxwi *rxwi = rxi;

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

	u16 rate = le16_to_cpu(rxwi->rate);

	struct mt76x02_sta *sta;

	int rssi, pad_len = 0;

	u8 wcid;



	len = FIELD_GET(MT_RXWI_CTL_MPDU_LEN, ctl);

	if (WARN_ON(len < 10))

		return 0;



	if (rxwi->rxinfo & cpu_to_le32(MT_RXINFO_DECRYPT)) {

		status->flag |= RX_FLAG_DECRYPTED;

		status->flag |= RX_FLAG_IV_STRIPPED | RX_FLAG_MMIC_STRIPPED;

	}



	if (rxwi->rxinfo & MT_RXINFO_L2PAD)

		pad_len += 2;



	wcid = FIELD_GET(MT_RXWI_CTL_WCID, ctl);

	sta = mt76x02_rx_get_sta(&dev->mt76, wcid);



	mt76x02_remove_hdr_pad(skb, pad_len);



	pskb_trim(skb, len);

	status->chains = BIT(0);

	rssi = mt76x0_phy_get_rssi(dev, rxwi);

	status->chain_signal[0] = status->signal = rssi;

	status->freq = dev->mt76.chandef.chan->center_freq;

	status->band = dev->mt76.chandef.chan->band;



	if (sta) {

		ewma_signal_add(&sta->rssi, status->signal);

		sta->inactive_count = 0;

	}



	return mt76x02_mac_process_rate(status, rate);

}

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

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>

 * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2

 * as published by the Free Software Foundation

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __MT76_MAC_H

#define __MT76_MAC_H



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

			  void *rxi);

#endif

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

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 */



#include "mt76x0.h"

#include "mac.h"

#include "../mt76x02_util.h"

#include <linux/etherdevice.h>

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

+0 −3
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ void mt76x0_agc_restore(struct mt76x02_dev *dev); 
int mt76x0_phy_set_channel(struct mt76x02_dev *dev,

			    struct cfg80211_chan_def *chandef);

void mt76x0_phy_recalibrate_after_assoc(struct mt76x02_dev *dev);

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

void mt76x0_phy_set_txpower(struct mt76x02_dev *dev);



/* MAC */
@@ -88,7 +87,5 @@ void mt76x0_mac_set_ampdu_factor(struct mt76x02_dev *dev); 
/* TX */

void mt76x0_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,

		struct sk_buff *skb);

void mt76x0_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

			 struct sk_buff *skb);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE