Commit cf1d7dc2 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'mt76-next-2025-11-24' of https://github.com/nbd168/wireless 

Felix Fietkau says:
===================
mt76 patches for 6.19

- relicense to BSD-3-Clause-Clear
- fixes
- support WED on devices which exceed 32-bit DMA
- airoha NPU support
- mt7925 regd improvements
- more mt7996 MLO work
===================

Link: https://patch.msgid.link/6b6d1033-dddf-4cc9-b240-93da7f8b8773@nbd.name


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents a8e5a110 53d15486

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

+66 −0
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ properties: 
              - ETSI

              - JP



          country:

            $ref: /schemas/types.yaml#/definitions/string

            pattern: '^[A-Z]{2}$'

            description:

              ISO 3166-1 alpha-2 country code for power limits



        patternProperties:

          "^txpower-[256]g$":

            type: object
@@ -210,6 +216,66 @@ properties: 
                      minItems: 13

                      maxItems: 13



                  paths-cck:

                    $ref: /schemas/types.yaml#/definitions/uint8-array

                    minItems: 4

                    maxItems: 4

                    description:

                      4 half-dBm backoff values (1 - 4 antennas, single spacial

                      stream)



                  paths-ofdm:

                    $ref: /schemas/types.yaml#/definitions/uint8-array

                    minItems: 4

                    maxItems: 4

                    description:

                      4 half-dBm backoff values (1 - 4 antennas, single spacial

                      stream)



                  paths-ofdm-bf:

                    $ref: /schemas/types.yaml#/definitions/uint8-array

                    minItems: 4

                    maxItems: 4

                    description:

                      4 half-dBm backoff values for beamforming

                      (1 - 4 antennas, single spacial stream)



                  paths-ru:

                    $ref: /schemas/types.yaml#/definitions/uint8-matrix

                    description:

                      Sets of half-dBm backoff values for 802.11ax rates for

                      1T1ss (aka 1 transmitting antenna with 1 spacial stream),

                      2T1ss, 3T1ss, 4T1ss, 2T2ss, 3T2ss, 4T2ss, 3T3ss, 4T3ss

                      and 4T4ss.

                      Each set starts with the number of channel bandwidth or

                      resource unit settings for which the rate set applies,

                      followed by 10 power limit values. The order of the

                      channel resource unit settings is RU26, RU52, RU106,

                      RU242/SU20, RU484/SU40, RU996/SU80 and RU2x996/SU160.

                    minItems: 1

                    maxItems: 7

                    items:

                      minItems: 11

                      maxItems: 11



                  paths-ru-bf:

                    $ref: /schemas/types.yaml#/definitions/uint8-matrix

                    description:

                      Sets of half-dBm backoff (beamforming) values for 802.11ax

                      rates for 1T1ss (aka 1 transmitting antenna with 1 spacial

                      stream), 2T1ss, 3T1ss, 4T1ss, 2T2ss, 3T2ss, 4T2ss, 3T3ss,

                      4T3ss and 4T4ss.

                      Each set starts with the number of channel bandwidth or

                      resource unit settings for which the rate set applies,

                      followed by 10 power limit values. The order of the

                      channel resource unit settings is RU26, RU52, RU106,

                      RU242/SU20, RU484/SU40, RU996/SU80 and RU2x996/SU160.

                    minItems: 1

                    maxItems: 7

                    items:

                      minItems: 11

                      maxItems: 11



                  txs-delta:

                    $ref: /schemas/types.yaml#/definitions/uint32-array

                    description:

drivers/net/wireless/mediatek/mt76/Kconfig

+5 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# SPDX-License-Identifier: BSD-3-Clause-Clear

config MT76_CORE

	tristate

	select PAGE_POOL
@@ -37,6 +37,10 @@ config MT792x_USB 
	tristate

	select MT76_USB



config MT76_NPU

	bool

	depends on MT76_CORE



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 
# SPDX-License-Identifier: GPL-2.0-only

# SPDX-License-Identifier: BSD-3-Clause-Clear

obj-$(CONFIG_MT76_CORE) += mt76.o

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

obj-$(CONFIG_MT76_SDIO) += mt76-sdio.o
@@ -12,6 +12,7 @@ mt76-y := \ 
	mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \

	tx.o agg-rx.o mcu.o wed.o scan.o channel.o



mt76-$(CONFIG_MT76_NPU) += npu.o

mt76-$(CONFIG_PCI) += pci.o

mt76-$(CONFIG_NL80211_TESTMODE) += testmode.o

drivers/net/wireless/mediatek/mt76/agg-rx.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

// SPDX-License-Identifier: BSD-3-Clause-Clear

/*

 * Copyright (C) 2018 Felix Fietkau <nbd@nbd.name>

 */

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

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ISC

// SPDX-License-Identifier: BSD-3-Clause-Clear

/*

 * Copyright (C) 2024 Felix Fietkau <nbd@nbd.name>

 */