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

mt76: mt76x02u: move mt76x02u_mac_start in mt76x02-usb module 



Unify mt76x02u_mac_start between mt76x2u and mt76x0u since the
code is shared between both drivers

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

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

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

}



int mt76x0_mac_start(struct mt76x02_dev *dev)

{

	mt76x02_mac_reset_counters(dev);

	mt76_wr(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_ENABLE_TX);



	if (!mt76x02_wait_for_wpdma(&dev->mt76, 200000))

		return -ETIMEDOUT;



	mt76_wr(dev, MT_RX_FILTR_CFG, dev->mt76.rxfilter);

	mt76_wr(dev, MT_MAC_SYS_CTRL,

		MT_MAC_SYS_CTRL_ENABLE_TX | MT_MAC_SYS_CTRL_ENABLE_RX);



	return !mt76x02_wait_for_wpdma(&dev->mt76, 50) ? -ETIMEDOUT : 0;

}

EXPORT_SYMBOL_GPL(mt76x0_mac_start);



void mt76x0_mac_stop(struct mt76x02_dev *dev)

{

	int i = 200, ok = 0;

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

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ int mt76x0_init_hardware(struct mt76x02_dev *dev); 
int mt76x0_register_device(struct mt76x02_dev *dev);

void mt76x0_chip_onoff(struct mt76x02_dev *dev, bool enable, bool reset);



int mt76x0_mac_start(struct mt76x02_dev *dev);

void mt76x0_mac_stop(struct mt76x02_dev *dev);



int mt76x0_config(struct ieee80211_hw *hw, u32 changed);

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int mt76x0u_start(struct ieee80211_hw *hw) 
	struct mt76x02_dev *dev = hw->priv;

	int ret;



	ret = mt76x0_mac_start(dev);

	ret = mt76x02u_mac_start(dev);

	if (ret)

		return ret;

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include "mt76x02.h"



int mt76x02u_mac_start(struct mt76x02_dev *dev);

void mt76x02u_init_mcu(struct mt76_dev *dev);

void mt76x02u_mcu_fw_reset(struct mt76x02_dev *dev);

int mt76x02u_mcu_fw_send_data(struct mt76x02_dev *dev, const void *data,

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

+21 −0
Original line number Diff line number Diff line
@@ -23,6 +23,27 @@ void mt76x02u_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid, 
}

EXPORT_SYMBOL_GPL(mt76x02u_tx_complete_skb);



int mt76x02u_mac_start(struct mt76x02_dev *dev)

{

	mt76x02_mac_reset_counters(dev);



	mt76_wr(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_ENABLE_TX);

	if (!mt76x02_wait_for_wpdma(&dev->mt76, 200000))

		return -ETIMEDOUT;



	mt76_wr(dev, MT_RX_FILTR_CFG, dev->mt76.rxfilter);



	mt76_wr(dev, MT_MAC_SYS_CTRL,

		MT_MAC_SYS_CTRL_ENABLE_TX |

		MT_MAC_SYS_CTRL_ENABLE_RX);



	if (!mt76x02_wait_for_wpdma(&dev->mt76, 50))

		return -ETIMEDOUT;



	return 0;

}

EXPORT_SYMBOL_GPL(mt76x02u_mac_start);



int mt76x02u_skb_dma_info(struct sk_buff *skb, int port, u32 flags)

{

	struct sk_buff *iter, *last = skb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE