Commit af5399b2 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2019-02-18' of https://github.com/nbd168/wireless 

mt76 patches for 5.1

* beacon support for USB devices (mesh+ad-hoc only)
* mt76x0 tx power fixes
* fixes for encryption, calibration and ED/CCA
* more code unification
* USB fixes
* fix for using the correct hweight8 function
parents f77ecde5 9f688473

drivers/net/wireless/mediatek/mt76/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o 
obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o



mt76-y := \

	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o tx.o agg-rx.o

	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \

	tx.o agg-rx.o mcu.o



mt76-usb-y := usb.o usb_trace.o usb_mcu.o

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

+26 −3
Original line number Diff line number Diff line
@@ -242,6 +242,30 @@ mt76_dma_kick_queue(struct mt76_dev *dev, struct mt76_queue *q) 
	iowrite32(q->head, &q->regs->cpu_idx);

}



static int

mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid,

			  struct sk_buff *skb, u32 tx_info)

{

	struct mt76_queue *q = &dev->q_tx[qid];

	struct mt76_queue_buf buf;

	dma_addr_t addr;



	addr = dma_map_single(dev->dev, skb->data, skb->len,

			      DMA_TO_DEVICE);

	if (dma_mapping_error(dev->dev, addr))

		return -ENOMEM;



	buf.addr = addr;

	buf.len = skb->len;



	spin_lock_bh(&q->lock);

	mt76_dma_add_buf(dev, q, &buf, 1, tx_info, skb, NULL);

	mt76_dma_kick_queue(dev, q);

	spin_unlock_bh(&q->lock);



	return 0;

}



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)
@@ -522,17 +546,16 @@ mt76_dma_init(struct mt76_dev *dev) 
static const struct mt76_queue_ops mt76_dma_ops = {

	.init = mt76_dma_init,

	.alloc = mt76_dma_alloc_queue,

	.add_buf = mt76_dma_add_buf,

	.tx_queue_skb_raw = mt76_dma_tx_queue_skb_raw,

	.tx_queue_skb = mt76_dma_tx_queue_skb,

	.tx_cleanup = mt76_dma_tx_cleanup,

	.rx_reset = mt76_dma_rx_reset,

	.kick = mt76_dma_kick_queue,

};



int mt76_dma_attach(struct mt76_dev *dev)

void mt76_dma_attach(struct mt76_dev *dev)

{

	dev->queue_ops = &mt76_dma_ops;

	return 0;

}

EXPORT_SYMBOL_GPL(mt76_dma_attach);

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ enum mt76_mcu_evt_type { 
	EVT_EVENT_DFS_DETECT_RSP,

};



int mt76_dma_attach(struct mt76_dev *dev);

void mt76_dma_attach(struct mt76_dev *dev);

void mt76_dma_cleanup(struct mt76_dev *dev);



#endif

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

+8 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void mt76_init_stream_cap(struct mt76_dev *dev, 
				 bool vht)

{

	struct ieee80211_sta_ht_cap *ht_cap = &sband->ht_cap;

	int i, nstream = __sw_hweight8(dev->antenna_mask);

	int i, nstream = hweight8(dev->antenna_mask);

	struct ieee80211_sta_vht_cap *vht_cap;

	u16 mcs_map = 0;
@@ -269,7 +269,9 @@ mt76_check_sband(struct mt76_dev *dev, int band) 
}



struct mt76_dev *

mt76_alloc_device(unsigned int size, const struct ieee80211_ops *ops)

mt76_alloc_device(struct device *pdev, unsigned int size,

		  const struct ieee80211_ops *ops,

		  const struct mt76_driver_ops *drv_ops)

{

	struct ieee80211_hw *hw;

	struct mt76_dev *dev;
@@ -280,6 +282,9 @@ mt76_alloc_device(unsigned int size, const struct ieee80211_ops *ops) 


	dev = hw->priv;

	dev->hw = hw;

	dev->dev = pdev;

	dev->drv = drv_ops;



	spin_lock_init(&dev->rx_lock);

	spin_lock_init(&dev->lock);

	spin_lock_init(&dev->cc_lock);
@@ -721,7 +726,7 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
		     int *dbm)

{

	struct mt76_dev *dev = hw->priv;

	int n_chains = __sw_hweight8(dev->antenna_mask);

	int n_chains = hweight8(dev->antenna_mask);



	*dbm = dev->txpower_cur / 2;

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

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include "mt76.h"



struct sk_buff *

mt76_mcu_msg_alloc(const void *data, int head_len,

		   int data_len, int tail_len)

{

	struct sk_buff *skb;



	skb = alloc_skb(head_len + data_len + tail_len,

			GFP_KERNEL);

	if (!skb)

		return NULL;



	skb_reserve(skb, head_len);

	if (data && data_len)

		skb_put_data(skb, data, data_len);



	return skb;

}

EXPORT_SYMBOL_GPL(mt76_mcu_msg_alloc);



/* mmio */

struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,

				      unsigned long expires)

{

	unsigned long timeout;



	if (!time_is_after_jiffies(expires))

		return NULL;



	timeout = expires - jiffies;

	wait_event_timeout(dev->mmio.mcu.wait,

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

			   timeout);

	return skb_dequeue(&dev->mmio.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);

}

EXPORT_SYMBOL_GPL(mt76_mcu_rx_event);