Commit 71a1238b authored by Kalle Valo's avatar Kalle Valo
Browse files

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

mt76 patches for 5.1

* add driver for MT7603E/MT7628
* fix ED/CCA issues
* fix USB issues
* more code unification
* fix beacon timer issues
* fix recovery from MCU timeout issues
parents bd16693f c8846e10

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt

+19 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ This node provides properties for configuring the MediaTek mt76xx wireless 
device. The node is expected to be specified as a child node of the PCI

controller to which the wireless chip is connected.



Alternatively, it can specify the wireless part of the MT7628/MT7688 SoC.

For SoC, use the compatible string "mediatek,mt7628-wmac" and the following

properties:



- reg: Address and length of the register set for the device.

- interrupts: Main device interrupt



Optional properties:



- mac-address: See ethernet.txt in the parent directory
@@ -30,3 +37,15 @@ Optional nodes: 
		};

	};

};



MT7628 example:



wmac: wmac@10300000 {

	compatible = "mediatek,mt7628-wmac";

	reg = <0x10300000 0x100000>;



	interrupt-parent = <&cpuintc>;

	interrupts = <6>;



	mediatek,mtd-eeprom = <&factory 0x0000>;

};

drivers/net/wireless/mediatek/mt76/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,3 +21,4 @@ config MT76x02_USB 


source "drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig"

source "drivers/net/wireless/mediatek/mt76/mt7603/Kconfig"

drivers/net/wireless/mediatek/mt76/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ mt76-y := \ 
	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

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



CFLAGS_trace.o := -I$(src)

CFLAGS_usb_trace.o := -I$(src)
@@ -22,3 +22,4 @@ mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o 


obj-$(CONFIG_MT76x0_COMMON) += mt76x0/

obj-$(CONFIG_MT76x2_COMMON) += mt76x2/

obj-$(CONFIG_MT7603E) += mt7603/

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

+5 −0
Original line number Diff line number Diff line
@@ -714,6 +714,11 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	    new_state == IEEE80211_STA_NONE)

		return mt76_sta_add(dev, vif, sta);



	if (old_state == IEEE80211_STA_AUTH &&

	    new_state == IEEE80211_STA_ASSOC &&

	    dev->drv->sta_assoc)

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



	if (old_state == IEEE80211_STA_NONE &&

		 new_state == IEEE80211_STA_NOTEXIST)

		mt76_sta_remove(dev, vif, sta);

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

+12 −17
Original line number Diff line number Diff line
@@ -304,6 +304,9 @@ struct mt76_driver_ops { 
	int (*sta_add)(struct mt76_dev *dev, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta);



	void (*sta_assoc)(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);

};
@@ -384,8 +387,7 @@ struct mt76_usb { 


	struct mt76u_mcu {

		struct mutex mutex;

		struct completion cmpl;

		struct mt76u_buf res;

		u8 *data;

		u32 msg_seq;



		/* multiple reads */
@@ -729,16 +731,20 @@ static inline u8 q2ep(u8 qid) 
}



static inline int

mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int timeout)

mt76u_bulk_msg(struct mt76_dev *dev, void *data, int len, int *actual_len,

	       int timeout)

{

	struct usb_interface *intf = to_usb_interface(dev->dev);

	struct usb_device *udev = interface_to_usbdev(intf);

	struct mt76_usb *usb = &dev->usb;

	unsigned int pipe;

	int sent;



	if (actual_len)

		pipe = usb_rcvbulkpipe(udev, usb->in_ep[MT_EP_IN_CMD_RESP]);

	else

		pipe = usb_sndbulkpipe(udev, usb->out_ep[MT_EP_OUT_INBAND_CMD]);

	return usb_bulk_msg(udev, pipe, data, len, &sent, timeout);



	return usb_bulk_msg(udev, pipe, data, len, actual_len, timeout);

}



int mt76u_vendor_request(struct mt76_dev *dev, u8 req,
@@ -747,13 +753,6 @@ int mt76u_vendor_request(struct mt76_dev *dev, u8 req, 
void mt76u_single_wr(struct mt76_dev *dev, const u8 req,

		     const u16 offset, const 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,

		    int len, int data_len, gfp_t gfp);

void mt76u_buf_free(struct mt76u_buf *buf);

int mt76u_submit_buf(struct mt76_dev *dev, int dir, int index,

		     struct mt76u_buf *buf, gfp_t gfp,

		     usb_complete_t complete_fn, void *context);

int mt76u_submit_rx_buffers(struct mt76_dev *dev);

int mt76u_alloc_queues(struct mt76_dev *dev);

void mt76u_stop_queues(struct mt76_dev *dev);
@@ -767,8 +766,4 @@ void mt76_mcu_rx_event(struct mt76_dev *dev, struct sk_buff *skb); 
struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,

				      unsigned long expires);



void mt76u_mcu_complete_urb(struct urb *urb);

int mt76u_mcu_init_rx(struct mt76_dev *dev);

void mt76u_mcu_deinit(struct mt76_dev *dev);



#endif