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

mt76: mt76x02: move mac_reset_counter in mt76x02_lib module 



Unify mac_reset_counter routine and move it in mt76x02_lib module
since it is shared by all mt76x02 drivers (pci/usb)

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

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

+1 −11
Original line number Diff line number Diff line
@@ -150,16 +150,6 @@ static void mt76x0_init_mac_registers(struct mt76x02_dev *dev) 
	mt76_rmw(dev, MT_WMM_CTRL, 0x3ff, 0x201);

}



static void mt76x0_reset_counters(struct mt76x02_dev *dev)

{

	mt76_rr(dev, MT_RX_STAT_0);

	mt76_rr(dev, MT_RX_STAT_1);

	mt76_rr(dev, MT_RX_STAT_2);

	mt76_rr(dev, MT_TX_STA_0);

	mt76_rr(dev, MT_TX_STA_1);

	mt76_rr(dev, MT_TX_STA_2);

}



int mt76x0_mac_start(struct mt76x02_dev *dev)

{

	mt76_wr(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_ENABLE_TX);
@@ -244,7 +234,7 @@ int mt76x0_init_hardware(struct mt76x02_dev *dev) 
	for (i = 0; i < 256; i++)

		mt76x02_mac_wcid_setup(dev, i, 0, NULL);



	mt76x0_reset_counters(dev);

	mt76x02_mac_reset_counters(dev);



	ret = mt76x0_eeprom_init(dev);

	if (ret)

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

+21 −0
Original line number Diff line number Diff line
@@ -7,6 +7,27 @@ 
#include "mt76x02.h"

#include "mt76x02_trace.h"



void mt76x02_mac_reset_counters(struct mt76x02_dev *dev)

{

	int i;



	mt76_rr(dev, MT_RX_STAT_0);

	mt76_rr(dev, MT_RX_STAT_1);

	mt76_rr(dev, MT_RX_STAT_2);

	mt76_rr(dev, MT_TX_STA_0);

	mt76_rr(dev, MT_TX_STA_1);

	mt76_rr(dev, MT_TX_STA_2);



	for (i = 0; i < 16; i++)

		mt76_rr(dev, MT_TX_AGG_CNT(i));



	for (i = 0; i < 16; i++)

		mt76_rr(dev, MT_TX_STAT_FIFO);



	memset(dev->aggr_stats, 0, sizeof(dev->aggr_stats));

}

EXPORT_SYMBOL_GPL(mt76x02_mac_reset_counters);



static enum mt76x02_cipher_type

mt76x02_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static inline bool mt76x02_wait_for_mac(struct mt76_dev *dev) 
	return false;

}



void mt76x02_mac_reset_counters(struct mt76x02_dev *dev);

void mt76x02_mac_set_short_preamble(struct mt76x02_dev *dev, bool enable);

int mt76x02_mac_shared_key_setup(struct mt76x02_dev *dev, u8 vif_idx,

				 u8 key_idx, struct ieee80211_key_conf *key);

drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c

+1 −9
Original line number Diff line number Diff line
@@ -148,15 +148,7 @@ int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard) 


int mt76x2_mac_start(struct mt76x02_dev *dev)

{

	int i;



	for (i = 0; i < 16; i++)

		mt76_rr(dev, MT_TX_AGG_CNT(i));



	for (i = 0; i < 16; i++)

		mt76_rr(dev, MT_TX_STAT_FIFO);



	memset(dev->aggr_stats, 0, sizeof(dev->aggr_stats));

	mt76x02_mac_reset_counters(dev);

	mt76x02_mac_start(dev);



	return 0;

drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c

+1 −11
Original line number Diff line number Diff line
@@ -6,16 +6,6 @@ 
#include "mt76x2u.h"

#include "eeprom.h"



static void mt76x2u_mac_reset_counters(struct mt76x02_dev *dev)

{

	mt76_rr(dev, MT_RX_STAT_0);

	mt76_rr(dev, MT_RX_STAT_1);

	mt76_rr(dev, MT_RX_STAT_2);

	mt76_rr(dev, MT_TX_STA_0);

	mt76_rr(dev, MT_TX_STA_1);

	mt76_rr(dev, MT_TX_STA_2);

}



static void mt76x2u_mac_fixup_xtal(struct mt76x02_dev *dev)

{

	s8 offset = 0;
@@ -104,7 +94,7 @@ int mt76x2u_mac_reset(struct mt76x02_dev *dev) 


int mt76x2u_mac_start(struct mt76x02_dev *dev)

{

	mt76x2u_mac_reset_counters(dev);

	mt76x02_mac_reset_counters(dev);



	mt76_wr(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_ENABLE_TX);

	mt76x02_wait_for_wpdma(&dev->mt76, 1000);

CRA Git | Maintained and supported by SUSTech CRA and CCSE