Commit 074b145a authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2018-11-30' of https://github.com/nbd168/wireless 

first batch of mt76 patches for 4.21

* use the same firmware for mt76x2e and mt76x2u
* mt76x2 fixes
* mt76x0 fixes
* mt76x0e survey support
* more unification between mt76x2 and mt76x0
* mt76x0e AP mode support
* mt76x0e DFS support
* rework and fix tx status handling for mt76x0 and mt76x2

kvalo: fixed a conflict in drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
and a build problem in drivers/net/wireless/mediatek/mt76/mt76x02_util.c
parents d9bbd6a1 e28487ea

drivers/net/wireless/mediatek/mt76/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ CFLAGS_mt76x02_trace.o := -I$(src) 


mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \

		 mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o \

		 mt76x02_txrx.o mt76x02_trace.o

		 mt76x02_txrx.o mt76x02_trace.o mt76x02_debugfs.o \

		 mt76x02_dfs.o



mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o

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

+9 −5
Original line number Diff line number Diff line
@@ -157,17 +157,20 @@ mt76_dma_tx_cleanup(struct mt76_dev *dev, enum mt76_txq_id qid, bool flush) 
		if (entry.schedule)

			q->swq_queued--;



		if (entry.skb)

		q->tail = (q->tail + 1) % q->ndesc;

		q->queued--;



		if (entry.skb) {

			spin_unlock_bh(&q->lock);

			dev->drv->tx_complete_skb(dev, q, &entry, flush);

			spin_lock_bh(&q->lock);

		}



		if (entry.txwi) {

			mt76_put_txwi(dev, entry.txwi);

			wake = true;

			wake = !flush;

		}



		q->tail = (q->tail + 1) % q->ndesc;

		q->queued--;



		if (!flush && q->tail == last)

			last = ioread32(&q->regs->dma_idx);

	}
@@ -258,6 +261,7 @@ int mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 
		return -ENOMEM;

	}



	skb->prev = skb->next = NULL;

	dma_sync_single_for_cpu(dev->dev, t->dma_addr, sizeof(t->txwi),

				DMA_TO_DEVICE);

	ret = dev->drv->tx_prepare_skb(dev, &t->txwi, skb, q, wcid, sta,

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

+80 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ mt76_alloc_device(unsigned int size, const struct ieee80211_ops *ops) 
	spin_lock_init(&dev->cc_lock);

	mutex_init(&dev->mutex);

	init_waitqueue_head(&dev->tx_wait);

	skb_queue_head_init(&dev->status_list);



	return dev;

}
@@ -326,6 +327,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, 
	ieee80211_hw_set(hw, TX_FRAG_LIST);

	ieee80211_hw_set(hw, MFP_CAPABLE);

	ieee80211_hw_set(hw, AP_LINK_PS);

	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);



	wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
@@ -359,6 +361,7 @@ void mt76_unregister_device(struct mt76_dev *dev) 
{

	struct ieee80211_hw *hw = dev->hw;



	mt76_tx_status_check(dev, NULL, true);

	ieee80211_unregister_hw(hw);

	mt76_tx_free(dev);

}
@@ -629,3 +632,80 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q, 
	mt76_rx_complete(dev, &frames, napi);

}

EXPORT_SYMBOL_GPL(mt76_rx_poll_complete);



static int

mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,

	     struct ieee80211_sta *sta)

{

	struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;

	int ret;

	int i;



	mutex_lock(&dev->mutex);



	ret = dev->drv->sta_add(dev, vif, sta);

	if (ret)

		goto out;



	for (i = 0; i < ARRAY_SIZE(sta->txq); i++) {

		struct mt76_txq *mtxq;



		if (!sta->txq[i])

			continue;



		mtxq = (struct mt76_txq *)sta->txq[i]->drv_priv;

		mtxq->wcid = wcid;



		mt76_txq_init(dev, sta->txq[i]);

	}



	rcu_assign_pointer(dev->wcid[wcid->idx], wcid);



out:

	mutex_unlock(&dev->mutex);



	return ret;

}



static void

mt76_sta_remove(struct mt76_dev *dev, struct ieee80211_vif *vif,

	        struct ieee80211_sta *sta)

{

	struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;

	int idx = wcid->idx;

	int i;



	rcu_assign_pointer(dev->wcid[idx], NULL);

	synchronize_rcu();



	mutex_lock(&dev->mutex);



	if (dev->drv->sta_remove)

		dev->drv->sta_remove(dev, vif, sta);



	mt76_tx_status_check(dev, wcid, true);

	for (i = 0; i < ARRAY_SIZE(sta->txq); i++)

		mt76_txq_remove(dev, sta->txq[i]);

	mt76_wcid_free(dev->wcid_mask, idx);



	mutex_unlock(&dev->mutex);

}



int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		   struct ieee80211_sta *sta,

		   enum ieee80211_sta_state old_state,

		   enum ieee80211_sta_state new_state)

{

	struct mt76_dev *dev = hw->priv;



	if (old_state == IEEE80211_STA_NOTEXIST &&

	    new_state == IEEE80211_STA_NONE)

		return mt76_sta_add(dev, vif, sta);



	if (old_state == IEEE80211_STA_NONE &&

		 new_state == IEEE80211_STA_NOTEXIST)

		mt76_sta_remove(dev, vif, sta);



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_sta_state);

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

+54 −6
Original line number Diff line number Diff line
@@ -135,9 +135,8 @@ struct mt76_queue { 
};



struct mt76_mcu_ops {

	struct sk_buff *(*mcu_msg_alloc)(const void *data, int len);

	int (*mcu_send_msg)(struct mt76_dev *dev, struct sk_buff *skb,

			    int cmd, bool wait_resp);

	int (*mcu_send_msg)(struct mt76_dev *dev, int cmd, const void *data,

			    int len, bool wait_resp);

	int (*mcu_wr_rp)(struct mt76_dev *dev, u32 base,

			 const struct mt76_reg_pair *rp, int len);

	int (*mcu_rd_rp)(struct mt76_dev *dev, u32 base,
@@ -195,6 +194,8 @@ struct mt76_wcid { 
	u8 tx_rate_nss;

	s8 max_txpwr_adj;

	bool sw_iv;



	u8 packet_id;

};



struct mt76_txq {
@@ -233,6 +234,22 @@ struct mt76_rx_tid { 
	struct sk_buff *reorder_buf[];

};



#define MT_TX_CB_DMA_DONE		BIT(0)

#define MT_TX_CB_TXS_DONE		BIT(1)

#define MT_TX_CB_TXS_FAILED		BIT(2)



#define MT_PACKET_ID_MASK		GENMASK(7, 0)

#define MT_PACKET_ID_NO_ACK		MT_PACKET_ID_MASK



#define MT_TX_STATUS_SKB_TIMEOUT	HZ



struct mt76_tx_cb {

	unsigned long jiffies;

	u8 wcid;

	u8 pktid;

	u8 flags;

};



enum {

	MT76_STATE_INITIALIZED,

	MT76_STATE_RUNNING,
@@ -271,6 +288,12 @@ struct mt76_driver_ops { 


	void (*sta_ps)(struct mt76_dev *dev, struct ieee80211_sta *sta,

		       bool ps);



	int (*sta_add)(struct mt76_dev *dev, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta);



	void (*sta_remove)(struct mt76_dev *dev, struct ieee80211_vif *vif,

			   struct ieee80211_sta *sta);

};



struct mt76_channel_state {
@@ -400,6 +423,7 @@ struct mt76_dev { 
	const struct mt76_queue_ops *queue_ops;



	wait_queue_head_t tx_wait;

	struct sk_buff_head status_list;



	unsigned long wcid_mask[MT76_N_WCIDS / BITS_PER_LONG];
@@ -484,7 +508,6 @@ struct mt76_rx_status { 
#define mt76_wr_rp(dev, ...)	(dev)->mt76.bus->wr_rp(&((dev)->mt76), __VA_ARGS__)

#define mt76_rd_rp(dev, ...)	(dev)->mt76.bus->rd_rp(&((dev)->mt76), __VA_ARGS__)



#define mt76_mcu_msg_alloc(dev, ...)	(dev)->mt76.mcu_ops->mcu_msg_alloc(__VA_ARGS__)

#define mt76_mcu_send_msg(dev, ...)	(dev)->mt76.mcu_ops->mcu_send_msg(&((dev)->mt76), __VA_ARGS__)



#define mt76_set(dev, offset, val)	mt76_rmw(dev, offset, 0, val)
@@ -594,6 +617,13 @@ wcid_to_sta(struct mt76_wcid *wcid) 
	return container_of(ptr, struct ieee80211_sta, drv_priv);

}



static inline struct mt76_tx_cb *mt76_tx_skb_cb(struct sk_buff *skb)

{

	BUILD_BUG_ON(sizeof(struct mt76_tx_cb) >

		     sizeof(IEEE80211_SKB_CB(skb)->status.status_driver_data));

	return ((void *) IEEE80211_SKB_CB(skb)->status.status_driver_data);

}



int mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,

			  struct sk_buff *skb, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta);
@@ -625,6 +655,26 @@ void mt76_rx_aggr_stop(struct mt76_dev *dev, struct mt76_wcid *wcid, u8 tid); 
void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid,

			 struct ieee80211_key_conf *key);



void mt76_tx_status_lock(struct mt76_dev *dev, struct sk_buff_head *list)

			 __acquires(&dev->status_list.lock);

void mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list)

			   __releases(&dev->status_list.lock);



int mt76_tx_status_skb_add(struct mt76_dev *dev, struct mt76_wcid *wcid,

			   struct sk_buff *skb);

struct sk_buff *mt76_tx_status_skb_get(struct mt76_dev *dev,

				       struct mt76_wcid *wcid, int pktid,

				       struct sk_buff_head *list);

void mt76_tx_status_skb_done(struct mt76_dev *dev, struct sk_buff *skb,

			     struct sk_buff_head *list);

void mt76_tx_complete_skb(struct mt76_dev *dev, struct sk_buff *skb);

void mt76_tx_status_check(struct mt76_dev *dev, struct mt76_wcid *wcid,

			  bool flush);

int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		   struct ieee80211_sta *sta,

		   enum ieee80211_sta_state old_state,

		   enum ieee80211_sta_state new_state);



struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb);



/* internal */
@@ -668,8 +718,6 @@ int mt76u_vendor_request(struct mt76_dev *dev, u8 req, 
			 void *buf, size_t len);

void mt76u_single_wr(struct mt76_dev *dev, const u8 req,

		     const u16 offset, const u32 val);

u32 mt76u_rr(struct mt76_dev *dev, u32 addr);

void mt76u_wr(struct mt76_dev *dev, u32 addr, u32 val);

int mt76u_init(struct mt76_dev *dev, struct usb_interface *intf);

void mt76u_deinit(struct mt76_dev *dev);

int mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf,

drivers/net/wireless/mediatek/mt76/mt76x0/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -2,11 +2,9 @@ obj-$(CONFIG_MT76x0U) += mt76x0u.o 
obj-$(CONFIG_MT76x0E) += mt76x0e.o

obj-$(CONFIG_MT76x0_COMMON) += mt76x0-common.o



mt76x0-common-y := \

	init.o main.o trace.o eeprom.o phy.o \

	mac.o debugfs.o

mt76x0-common-y := init.o main.o eeprom.o phy.o



mt76x0u-y := usb.o usb_mcu.o

mt76x0e-y := pci.o pci_mcu.o



# ccflags-y := -DDEBUG
 
CFLAGS_trace.o := -I$(src)

CRA Git | Maintained and supported by SUSTech CRA and CCSE