Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

mt76 patches for 4.20

* lots of mt76x0 cleanups / fixes
* mt76x2u fixes
* unify code between mt76x0, mt76x2e and mt76x2u
* rename mt76x0 to mt76x0u
* improve rx buffer allocation for all variants
* prepare for adding mt76x0e (pci-e variant) support
  add CONFIG_MT76x0E kconfig symbol
parents 43e2f290 bf3741ad

drivers/net/wireless/mediatek/mt76/Kconfig

+20 −7
Original line number Diff line number Diff line
@@ -7,25 +7,39 @@ config MT76_USB 


config MT76x02_LIB

	tristate

	depends on MT76_CORE

	select MT76_CORE



config MT76x02_USB

	tristate

	select MT76_USB



config MT76x0_COMMON

	tristate

	select MT76x02_LIB



config MT76x2_COMMON

	tristate

	select MT76x02_LIB

	depends on MT76_CORE



config MT76x0U

	tristate "MediaTek MT76x0U (USB) support"

	select MT76_CORE

	select MT76x0_COMMON

	select MT76x02_USB

	depends on MAC80211

	depends on USB

	select MT76x02_LIB

	help

	  This adds support for MT7610U-based wireless USB dongles.



config MT76x0E

	tristate "MediaTek MT76x0E (PCIe) support"

	select MT76x0_COMMON

	depends on MAC80211

	depends on PCI

	help

	  This adds support for MT7610/MT7630-based wireless PCIe devices.



config MT76x2E

	tristate "MediaTek MT76x2E (PCIe) support"

	select MT76_CORE

	select MT76x2_COMMON

	depends on MAC80211

	depends on PCI
@@ -34,9 +48,8 @@ config MT76x2E 


config MT76x2U

	tristate "MediaTek MT76x2U (USB) support"

	select MT76_CORE

	select MT76_USB

	select MT76x2_COMMON

	select MT76x02_USB

	depends on MAC80211

	depends on USB

	help

drivers/net/wireless/mediatek/mt76/Makefile

+6 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_MT76_CORE) += mt76.o

obj-$(CONFIG_MT76_USB) += mt76-usb.o

obj-$(CONFIG_MT76x0U) += mt76x0/

obj-$(CONFIG_MT76x0_COMMON) += mt76x0/

obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o

obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o

obj-$(CONFIG_MT76x2_COMMON) += mt76x2-common.o

obj-$(CONFIG_MT76x2E) += mt76x2e.o

obj-$(CONFIG_MT76x2U) += mt76x2u.o
@@ -14,12 +15,14 @@ mt76-usb-y := usb.o usb_trace.o usb_mcu.o 
CFLAGS_trace.o := -I$(src)

CFLAGS_usb_trace.o := -I$(src)



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

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



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



mt76x2-common-y := \

	mt76x2_eeprom.o mt76x2_tx_common.o mt76x2_mac_common.o \

	mt76x2_init_common.o mt76x2_common.o mt76x2_phy_common.o \

	mt76x2_debugfs.o

	mt76x2_debugfs.o mt76x2_mcu_common.o



mt76x2e-y := \

	mt76x2_pci.o mt76x2_dma.o \

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

+9 −7
Original line number Diff line number Diff line
@@ -322,19 +322,13 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q, bool napi) 
	int len = SKB_WITH_OVERHEAD(q->buf_size);

	int offset = q->buf_offset;

	int idx;

	void *(*alloc)(unsigned int fragsz);



	if (napi)

		alloc = napi_alloc_frag;

	else

		alloc = netdev_alloc_frag;



	spin_lock_bh(&q->lock);



	while (q->queued < q->ndesc - 1) {

		struct mt76_queue_buf qbuf;



		buf = alloc(q->buf_size);

		buf = page_frag_alloc(&q->rx_page, q->buf_size, GFP_ATOMIC);

		if (!buf)

			break;
@@ -361,6 +355,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q, bool napi) 
static void

mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q)

{

	struct page *page;

	void *buf;

	bool more;
@@ -373,6 +368,13 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q) 
		skb_free_frag(buf);

	} while (1);

	spin_unlock_bh(&q->lock);



	if (!q->rx_page.va)

		return;



	page = virt_to_page(q->rx_page.va);

	__page_frag_cache_drain(page, q->rx_page.pagecnt_bias);

	memset(&q->rx_page, 0, sizeof(q->rx_page));

}



static void

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

+5 −36
Original line number Diff line number Diff line
@@ -25,34 +25,6 @@ 
#define MT_DMA_CTL_LAST_SEC0		BIT(30)

#define MT_DMA_CTL_DMA_DONE		BIT(31)



#define MT_TXD_INFO_LEN			GENMASK(15, 0)

#define MT_TXD_INFO_NEXT_VLD		BIT(16)

#define MT_TXD_INFO_TX_BURST		BIT(17)

#define MT_TXD_INFO_80211		BIT(19)

#define MT_TXD_INFO_TSO			BIT(20)

#define MT_TXD_INFO_CSO			BIT(21)

#define MT_TXD_INFO_WIV			BIT(24)

#define MT_TXD_INFO_QSEL		GENMASK(26, 25)

#define MT_TXD_INFO_DPORT		GENMASK(29, 27)

#define MT_TXD_INFO_TYPE		GENMASK(31, 30)



#define MT_RX_FCE_INFO_LEN		GENMASK(13, 0)

#define MT_RX_FCE_INFO_SELF_GEN		BIT(15)

#define MT_RX_FCE_INFO_CMD_SEQ		GENMASK(19, 16)

#define MT_RX_FCE_INFO_EVT_TYPE		GENMASK(23, 20)

#define MT_RX_FCE_INFO_PCIE_INTR	BIT(24)

#define MT_RX_FCE_INFO_QSEL		GENMASK(26, 25)

#define MT_RX_FCE_INFO_D_PORT		GENMASK(29, 27)

#define MT_RX_FCE_INFO_TYPE		GENMASK(31, 30)



/* MCU request message header  */

#define MT_MCU_MSG_LEN			GENMASK(15, 0)

#define MT_MCU_MSG_CMD_SEQ		GENMASK(19, 16)

#define MT_MCU_MSG_CMD_TYPE		GENMASK(26, 20)

#define MT_MCU_MSG_PORT			GENMASK(29, 27)

#define MT_MCU_MSG_TYPE			GENMASK(31, 30)

#define MT_MCU_MSG_TYPE_CMD		BIT(30)



#define MT_DMA_HDR_LEN			4

#define MT_RX_INFO_LEN			4

#define MT_FCE_INFO_LEN			4
@@ -65,14 +37,11 @@ struct mt76_desc { 
	__le32 info;

} __packed __aligned(4);



enum dma_msg_port {

	WLAN_PORT,

	CPU_RX_PORT,

	CPU_TX_PORT,

	HOST_PORT,

	VIRTUAL_CPU_RX_PORT,

	VIRTUAL_CPU_TX_PORT,

	DISCARD,

enum mt76_qsel {

	MT_QSEL_MGMT,

	MT_QSEL_HCCA,

	MT_QSEL_EDCA,

	MT_QSEL_EDCA_2,

};



enum mt76_mcu_evt_type {

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

+2 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ void mt76_wcid_key_setup(struct mt76_dev *dev, struct mt76_wcid *wcid, 
}

EXPORT_SYMBOL(mt76_wcid_key_setup);



static struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb)

struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb)

{

	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);

	struct mt76_rx_status mstat;
@@ -500,6 +500,7 @@ static struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb) 


	return wcid_to_sta(mstat.wcid);

}

EXPORT_SYMBOL(mt76_rx_convert);



static int

mt76_check_ccmp_pn(struct sk_buff *skb)