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

mt76: Introduce mt76_mcu data structure 



Introduce mt76_mcu data structure to contain common fields between
mt76u_mcu and mt76e_mcu.
Initialize mcu common fields in mt76_alloc_device().
Rely on mt76_mcu in mt76_mcu_rx_event and in mt76_mcu_get_response
in order to reuse them in usb code

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

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

+4 −0
Original line number Diff line number Diff line
@@ -420,6 +420,10 @@ mt76_alloc_device(struct device *pdev, unsigned int size, 
	init_waitqueue_head(&dev->tx_wait);

	skb_queue_head_init(&dev->status_list);



	skb_queue_head_init(&dev->mcu.res_q);

	init_waitqueue_head(&dev->mcu.wait);

	mutex_init(&dev->mcu.mutex);



	INIT_LIST_HEAD(&dev->txwi_cache);



	for (i = 0; i < ARRAY_SIZE(dev->q_rx); i++)

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

+5 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ mt76_mcu_msg_alloc(const void *data, int head_len, 
}

EXPORT_SYMBOL_GPL(mt76_mcu_msg_alloc);



/* mmio */

struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,

				      unsigned long expires)

{
@@ -34,17 +33,17 @@ struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev, 
		return NULL;



	timeout = expires - jiffies;

	wait_event_timeout(dev->mmio.mcu.wait,

			   (!skb_queue_empty(&dev->mmio.mcu.res_q) ||

	wait_event_timeout(dev->mcu.wait,

			   (!skb_queue_empty(&dev->mcu.res_q) ||

			    test_bit(MT76_MCU_RESET, &dev->phy.state)),

			   timeout);

	return skb_dequeue(&dev->mmio.mcu.res_q);

	return skb_dequeue(&dev->mcu.res_q);

}

EXPORT_SYMBOL_GPL(mt76_mcu_get_response);



void mt76_mcu_rx_event(struct mt76_dev *dev, struct sk_buff *skb)

{

	skb_queue_tail(&dev->mmio.mcu.res_q, skb);

	wake_up(&dev->mmio.mcu.wait);

	skb_queue_tail(&dev->mcu.res_q, skb);

	wake_up(&dev->mcu.wait);

}

EXPORT_SYMBOL_GPL(mt76_mcu_rx_event);

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

+0 −3
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ void mt76_mmio_init(struct mt76_dev *dev, void __iomem *regs) 
	dev->bus = &mt76_mmio_ops;

	dev->mmio.regs = regs;



	skb_queue_head_init(&dev->mmio.mcu.res_q);

	init_waitqueue_head(&dev->mmio.mcu.wait);

	spin_lock_init(&dev->mmio.irq_lock);

	mutex_init(&dev->mmio.mcu.mutex);

}

EXPORT_SYMBOL_GPL(mt76_mmio_init);

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

+10 −11
Original line number Diff line number Diff line
@@ -388,6 +388,14 @@ enum mt76u_out_ep { 
	__MT_EP_OUT_MAX,

};



struct mt76_mcu {

	struct mutex mutex;

	u32 msg_seq;



	struct sk_buff_head res_q;

	wait_queue_head_t wait;

};



#define MT_TX_SG_MAX_SIZE	8

#define MT_RX_SG_MAX_SIZE	4

#define MT_NUM_TX_ENTRIES	256
@@ -408,10 +416,7 @@ struct mt76_usb { 
	bool sg_en;



	struct mt76u_mcu {

		struct mutex mutex;

		u8 *data;

		u32 msg_seq;



		/* multiple reads */

		struct mt76_reg_pair *rp;

		int rp_len;
@@ -421,14 +426,6 @@ struct mt76_usb { 
};



struct mt76_mmio {

	struct mt76e_mcu {

		struct mutex mutex;



		wait_queue_head_t wait;

		struct sk_buff_head res_q;



		u32 msg_seq;

	} mcu;

	void __iomem *regs;

	spinlock_t irq_lock;

	u32 irqmask;
@@ -506,6 +503,8 @@ struct mt76_dev { 
	const struct mt76_mcu_ops *mcu_ops;

	struct device *dev;



	struct mt76_mcu mcu;



	struct net_device napi_dev;

	spinlock_t rx_lock;

	struct napi_struct napi[__MT_RXQ_MAX];

drivers/net/wireless/mediatek/mt76/mt7603/mcu.c

+5 −5
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ __mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, 
	struct mt7603_mcu_txd *txd;

	u8 seq;



	seq = ++mdev->mmio.mcu.msg_seq & 0xf;

	seq = ++mdev->mcu.msg_seq & 0xf;

	if (!seq)

		seq = ++mdev->mmio.mcu.msg_seq & 0xf;

		seq = ++mdev->mcu.msg_seq & 0xf;



	txd = (struct mt7603_mcu_txd *)skb_push(skb, hdrlen);

	memset(txd, 0, hdrlen);
@@ -67,7 +67,7 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, 
	if (!skb)

		return -ENOMEM;



	mutex_lock(&mdev->mmio.mcu.mutex);

	mutex_lock(&mdev->mcu.mutex);



	ret = __mt7603_mcu_msg_send(dev, skb, cmd, &seq);

	if (ret)
@@ -97,7 +97,7 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, 
	}



out:

	mutex_unlock(&mdev->mmio.mcu.mutex);

	mutex_unlock(&mdev->mcu.mutex);



	return ret;

}
@@ -277,7 +277,7 @@ int mt7603_mcu_init(struct mt7603_dev *dev) 
void mt7603_mcu_exit(struct mt7603_dev *dev)

{

	__mt76_mcu_restart(&dev->mt76);

	skb_queue_purge(&dev->mt76.mmio.mcu.res_q);

	skb_queue_purge(&dev->mt76.mcu.res_q);

}



int mt7603_mcu_set_eeprom(struct mt7603_dev *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE