Commit 81083076 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2023-08-04' of... 

Merge tag 'wireless-next-2023-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

====================
wireless-next patches for v6.6

The first pull request for v6.6 and only driver patches this time.
Nothing special really standing out, it has been quiet most likely due
to vacations.

Major changes:

rtl8xxxu
 - enable AP mode for: RTL8192FU, RTL8710BU (RTL8188GU),
   RTL8192EU and RTL8723BU

mwifiex
 - allow moving to a different namespace

mt76
 - preparation for mt7925 support
 - mt7981 support

ath12k
 - Extremely High Throughput (EHT) PHY support for Wi-Fi 7

* tag 'wireless-next-2023-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next: (172 commits)
  wifi: rtw89: return failure if needed firmware elements are not recognized
  wifi: rtw89: add to parse firmware elements of BB and RF tables
  wifi: rtw89: introduce infrastructure of firmware elements
  wifi: rtw89: add firmware suit for BB MCU 0/1
  wifi: rtw89: add firmware parser for v1 format
  wifi: rtw89: introduce v1 format of firmware header
  wifi: rtw89: support firmware log with formatted text
  wifi: rtw89: recognize log format from firmware file
  wifi: ath12k: avoid deadlock by change ieee80211_queue_work for regd_update_work
  wifi: ath12k: add handler for scan event WMI_SCAN_EVENT_DEQUEUED
  wifi: ath12k: relax list iteration in ath12k_mac_vif_unref()
  wifi: ath12k: configure puncturing bitmap
  wifi: ath12k: parse WMI service ready ext2 event
  wifi: ath12k: add MLO header in peer association
  wifi: ath12k: peer assoc for 320 MHz
  wifi: ath12k: add WMI support for EHT peer
  wifi: ath12k: prepare EHT peer assoc parameters
  wifi: ath12k: add EHT PHY modes
  wifi: ath12k: propagate EHT capabilities to userspace
  wifi: ath12k: WMI support to process EHT capabilities
  ...
====================

Link: https://lore.kernel.org/r/87msz7j942.fsf@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 90cd5467 904b102f

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

+12 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
      - mediatek,mt76

      - mediatek,mt7628-wmac

      - mediatek,mt7622-wmac

      - mediatek,mt7981-wmac

      - mediatek,mt7986-wmac



  reg:
@@ -71,6 +72,14 @@ properties: 


  ieee80211-freq-limit: true



  nvmem-cells:

    items:

      - description: NVMEM cell with EEPROM



  nvmem-cell-names:

    items:

      - const: eeprom



  mediatek,eeprom-data:

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

    description:
@@ -84,6 +93,7 @@ properties: 
          - description: offset containing EEPROM data

    description:

      Phandle to a MTD partition + offset containing EEPROM data

    deprecated: true



  big-endian:

    $ref: /schemas/types.yaml#/definitions/flag
@@ -258,7 +268,8 @@ examples: 
      interrupt-parent = <&cpuintc>;

      interrupts = <6>;



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

      nvmem-cells = <&eeprom>;

      nvmem-cell-names = "eeprom";

    };



  - |

drivers/net/wireless/ath/ath10k/ahb.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 */

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/clk.h>

#include <linux/reset.h>

#include "core.h"

drivers/net/wireless/ath/ath11k/ahb.c

+2 −27
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "ahb.h"

#include "debug.h"

#include "hif.h"

#include "qmi.h"

#include <linux/remoteproc.h>

#include "pcic.h"

#include <linux/soc/qcom/smem.h>
@@ -418,32 +419,6 @@ static void ath11k_ahb_power_down(struct ath11k_base *ab) 
	rproc_shutdown(ab_ahb->tgt_rproc);

}



static int ath11k_ahb_fwreset_from_cold_boot(struct ath11k_base *ab)

{

	int timeout;



	if (ath11k_cold_boot_cal == 0 || ab->qmi.cal_done ||

	    ab->hw_params.cold_boot_calib == 0 ||

	    ab->hw_params.cbcal_restart_fw == 0)

		return 0;



	ath11k_dbg(ab, ATH11K_DBG_AHB, "wait for cold boot done\n");

	timeout = wait_event_timeout(ab->qmi.cold_boot_waitq,

				     (ab->qmi.cal_done  == 1),

				     ATH11K_COLD_BOOT_FW_RESET_DELAY);

	if (timeout <= 0) {

		ath11k_cold_boot_cal = 0;

		ath11k_warn(ab, "Coldboot Calibration failed timed out\n");

	}



	/* reset the firmware */

	ath11k_ahb_power_down(ab);

	ath11k_ahb_power_up(ab);



	ath11k_dbg(ab, ATH11K_DBG_AHB, "exited from cold boot mode\n");

	return 0;

}



static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab)

{

	struct ath11k_qmi_ce_cfg *cfg = &ab->qmi.ce_cfg;
@@ -1226,7 +1201,7 @@ static int ath11k_ahb_probe(struct platform_device *pdev) 
		goto err_ce_free;

	}



	ath11k_ahb_fwreset_from_cold_boot(ab);

	ath11k_qmi_fwreset_from_cold_boot(ab);



	return 0;

drivers/net/wireless/ath/ath11k/core.c

+29 −9
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_shadow_regs = false,

		.idle_ps = false,

		.supports_sta_ps = false,

		.cold_boot_calib = true,

		.coldboot_cal_mm = true,

		.coldboot_cal_ftm = true,

		.cbcal_restart_fw = true,

		.fw_mem_mode = 0,

		.num_vdevs = 16 + 1,
@@ -167,7 +168,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_shadow_regs = false,

		.idle_ps = false,

		.supports_sta_ps = false,

		.cold_boot_calib = true,

		.coldboot_cal_mm = true,

		.coldboot_cal_ftm = true,

		.cbcal_restart_fw = true,

		.fw_mem_mode = 0,

		.num_vdevs = 16 + 1,
@@ -248,7 +250,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_shadow_regs = true,

		.idle_ps = true,

		.supports_sta_ps = true,

		.cold_boot_calib = false,

		.coldboot_cal_mm = false,

		.coldboot_cal_ftm = false,

		.cbcal_restart_fw = false,

		.fw_mem_mode = 0,

		.num_vdevs = 16 + 1,
@@ -332,8 +335,9 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_shadow_regs = false,

		.idle_ps = false,

		.supports_sta_ps = false,

		.cold_boot_calib = false,

		.cbcal_restart_fw = false,

		.coldboot_cal_mm = false,

		.coldboot_cal_ftm = true,

		.cbcal_restart_fw = true,

		.fw_mem_mode = 2,

		.num_vdevs = 8,

		.num_peers = 128,
@@ -413,7 +417,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_shadow_regs = true,

		.idle_ps = true,

		.supports_sta_ps = true,

		.cold_boot_calib = false,

		.coldboot_cal_mm = false,

		.coldboot_cal_ftm = false,

		.cbcal_restart_fw = false,

		.fw_mem_mode = 0,

		.num_vdevs = 16 + 1,
@@ -495,7 +500,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_shadow_regs = true,

		.idle_ps = true,

		.supports_sta_ps = true,

		.cold_boot_calib = false,

		.coldboot_cal_mm = false,

		.coldboot_cal_ftm = false,

		.cbcal_restart_fw = false,

		.fw_mem_mode = 0,

		.num_vdevs = 16 + 1,
@@ -578,7 +584,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_shadow_regs = true,

		.idle_ps = true,

		.supports_sta_ps = true,

		.cold_boot_calib = true,

		.coldboot_cal_mm = true,

		.coldboot_cal_ftm = true,

		.cbcal_restart_fw = false,

		.fw_mem_mode = 0,

		.num_vdevs = 16 + 1,
@@ -667,7 +674,8 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.supports_suspend = false,

		.hal_params = &ath11k_hw_hal_params_ipq8074,

		.single_pdev_only = false,

		.cold_boot_calib = true,

		.coldboot_cal_mm = true,

		.coldboot_cal_ftm = true,

		.cbcal_restart_fw = true,

		.fix_l1ss = true,

		.supports_dynamic_smps_6ghz = false,
@@ -749,6 +757,18 @@ void ath11k_fw_stats_free(struct ath11k_fw_stats *stats) 
	ath11k_fw_stats_bcn_free(&stats->bcn);

}



bool ath11k_core_coldboot_cal_support(struct ath11k_base *ab)

{

	if (!ath11k_cold_boot_cal)

		return false;



	if (ath11k_ftm_mode)

		return ab->hw_params.coldboot_cal_ftm;



	else

		return ab->hw_params.coldboot_cal_mm;

}



int ath11k_core_suspend(struct ath11k_base *ab)

{

	int ret;

drivers/net/wireless/ath/ath11k/core.h

+1 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,7 @@ void ath11k_core_halt(struct ath11k *ar); 
int ath11k_core_resume(struct ath11k_base *ab);

int ath11k_core_suspend(struct ath11k_base *ab);

void ath11k_core_pre_reconfigure_recovery(struct ath11k_base *ab);

bool ath11k_core_coldboot_cal_support(struct ath11k_base *ab);



const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab,

						    const char *filename);