Skip to contentSkip to conversation

mt76: add driver callback for when a sta is associated

PATCH New Felix Fietkau 1 participant 3 messages Feb 26, 2019

Subsystems (4)
lore
Share & tools
lore

Felix Fietkau

author maintainer
#0 lore raw

PATCH v2 1/3 mt76: add driver callback for when a sta is associated

MT7603 needs this to update the HT/VHT capabilities

---
 drivers/net/wireless/mediatek/mt76/mac80211.c | 5 +++++
 drivers/net/wireless/mediatek/mt76/mt76.h     | 3 +++
 2 files changed, 8 insertions(+)
drivers/net/wireless/mediatek/mt76/mac80211.c +5 -0
index 82e9f78ef328..a033745adb2f 100644
@@ -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 +3 -0
index 3b674228542d..3555ed931dd0 100644
@@ -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);
 };
Signature · 1 line
2.17.0
author maintainer
#1 lore raw

PATCH v2 2/3 dt-bindings: net: mt76: update binding for mt7603 driver

In addition to MT7603E PCI devices, the driver supports the WLAN core on MT7628/MT7688, which needs to be defined in DT.

---
 .../bindings/net/wireless/mediatek,mt76.txt   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt +19 -0
index 0c17a0ec9b7b..7b9a776230c0 100644
@@ -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>;
+};
Signature · 1 line
2.17.0
author maintainer
#2 lore raw

PATCH v2 3/3 mt76: add driver for MT7603E and MT7628/7688

In reply to Felix Fietkau

This driver is for a newer generation of 2x2 MediaTek 802.11n chipsets. MT7603E is a PCIe chip.
MT7628 and MT7688 are MIPS SoC devices with built-in WLAN. MT7688 is limited to 1x1

This driver fully supports AP, station, mesh, ad-hoc and monitor mode.

---
Changes since v1:
- sync with mt76 API changes
- remove copyright headers (replaced by SPDX)
- fix encryption issues
- fix BA window size selection

 drivers/net/wireless/mediatek/mt76/Kconfig    |    1 +
 drivers/net/wireless/mediatek/mt76/Makefile   |    1 +
 .../net/wireless/mediatek/mt76/mt7603/Kconfig |    9 +
 .../wireless/mediatek/mt76/mt7603/Makefile    |    6 +
 .../wireless/mediatek/mt76/mt7603/beacon.c    |  186 ++
 .../net/wireless/mediatek/mt76/mt7603/core.c  |   73 +
 .../wireless/mediatek/mt76/mt7603/debugfs.c   |   56 +
 .../net/wireless/mediatek/mt76/mt7603/dma.c   |  215 ++
 .../wireless/mediatek/mt76/mt7603/eeprom.c    |  168 ++
 .../wireless/mediatek/mt76/mt7603/eeprom.h    |   86 +
 .../net/wireless/mediatek/mt76/mt7603/init.c  |  578 ++++++
 .../net/wireless/mediatek/mt76/mt7603/mac.c   | 1749 +++++++++++++++++
 .../net/wireless/mediatek/mt76/mt7603/mac.h   |  242 +++
 .../net/wireless/mediatek/mt76/mt7603/main.c  |  709 +++++++
 .../net/wireless/mediatek/mt76/mt7603/mcu.c   |  483 +++++
 .../net/wireless/mediatek/mt76/mt7603/mcu.h   |  110 ++
 .../wireless/mediatek/mt76/mt7603/mt7603.h    |  253 +++
 .../net/wireless/mediatek/mt76/mt7603/pci.c   |   80 +
 .../net/wireless/mediatek/mt76/mt7603/regs.h  |  774 ++++++++
 .../net/wireless/mediatek/mt76/mt7603/soc.c   |   85 +
 20 files changed, 5864 insertions(+)
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/Kconfig
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/Makefile
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/beacon.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/core.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/dma.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/init.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mac.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mac.h
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/main.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mcu.h
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/pci.c
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/regs.h
 create mode 100644 drivers/net/wireless/mediatek/mt76/mt7603/soc.c
drivers/net/wireless/mediatek/mt76/Kconfig +1 -0
index c30d8f5bbf2a..dbe8c70a8f73 100644
@@ -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 +1 -0
index 0d6a76f6e2ba..3fd1b64b4aa7 100644
@@ -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/mt7603/Kconfig new file +9 -0
new file mode 100644
index 000000000000..087945c3d8f3
@@ -0,0 +1,9 @@
+config MT7603E
+	tristate "MediaTek MT7603E (PCIe) and MT76x8 WLAN support"
+	select MT76_CORE
+	depends on MAC80211
+	depends on PCI
+	help
+	  This adds support for MT7603E wireless PCIe devices and the WLAN core on
+	  MT7628/MT7688 SoC devices
+
drivers/net/wireless/mediatek/mt76/mt7603/Makefile new file +6 -0
new file mode 100644
index 000000000000..d95a30421c62
@@ -0,0 +1,6 @@
+obj-$(CONFIG_MT7603E) += mt7603e.o
+
+mt7603e-y := \
+	pci.o soc.o main.o init.o mcu.o \
+	core.o dma.o mac.o eeprom.o \
+	beacon.o debugfs.o
drivers/net/wireless/mediatek/mt76/mt7603/beacon.c new file +186 -0

186 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/core.c new file +73 -0

73 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c new file +56 -0

56 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/dma.c new file +215 -0

215 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c new file +168 -0

168 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h new file +86 -0

86 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/init.c new file +578 -0

578 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/mac.c new file +1749 -0

1,615 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/mac.h new file +242 -0

242 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/main.c new file +709 -0

709 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/mcu.c new file +483 -0

483 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/mcu.h new file +110 -0

110 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h new file +253 -0

253 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/pci.c new file +80 -0

80 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/regs.h new file +774 -0

774 lines not on this page · raw message

drivers/net/wireless/mediatek/mt76/mt7603/soc.c new file +85 -0

85 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.0

Part of the diff is not shown here. View the raw message.