Commit 6cf5e906 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for v6.1. Major changes:

ath11k

* cold boot calibration support on WCN6750

* Target Wake Time (TWT) debugfs support for STA interface

* support to connect to a non-transmit MBSSID AP profile

* enable remain-on-channel support on WCN6750

* implement SRAM dump debugfs interface

* enable threaded NAPI on all hardware

* WoW support for WCN6750

* support to provide transmit power from firmware via nl80211

* support to get power save duration for each client

* spectral scan support for 160 MHz

wcn36xx

* add SNR from a received frame as a source of system entropy
parents a373f38c d78c8b71

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

+14 −0
Original line number Diff line number Diff line
@@ -66,6 +66,18 @@ properties: 
    required:

      - iommus



  qcom,smem-states:

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

    description: State bits used by the AP to signal the WLAN Q6.

    items:

      - description: Signal bits used to enable/disable low power mode

                     on WCN6750 in the case of WoW (Wake on Wireless).



  qcom,smem-state-names:

    description: The names of the state bits used for SMP2P output.

    items:

      - const: wlan-smp2p-out



required:

  - compatible

  - reg
@@ -448,6 +460,8 @@ examples: 
                     <GIC_SPI 799 IRQ_TYPE_EDGE_RISING>;

        qcom,rproc = <&remoteproc_wpss>;

        memory-region = <&wlan_fw_mem>, <&wlan_ce_mem>;

        qcom,smem-states = <&wlan_smp2p_out 0>;

        qcom,smem-state-names = "wlan-smp2p-out";

        wifi-firmware {

                iommus = <&apps_smmu 0x1c02 0x1>;

        };

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

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int ath10k_bmi_get_target_info_sdio(struct ath10k *ar, 
	cmd.id = __cpu_to_le32(BMI_GET_TARGET_INFO);



	/* Step 1: Read 4 bytes of the target info and check if it is

	 * the special sentinal version word or the first word in the

	 * the special sentinel version word or the first word in the

	 * version response.

	 */

	resplen = sizeof(u32);
@@ -111,7 +111,7 @@ int ath10k_bmi_get_target_info_sdio(struct ath10k *ar, 
		return ret;

	}



	/* Some SDIO boards have a special sentinal byte before the real

	/* Some SDIO boards have a special sentinel byte before the real

	 * version response.

	 */

	if (__le32_to_cpu(tmp) == TARGET_VERSION_SENTINAL) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ EXPORT_SYMBOL(ath10k_ce_per_engine_service); 
/*

 * Handler for per-engine interrupts on ALL active CEs.

 * This is used in cases where the system is sharing a

 * single interrput for all CEs

 * single interrupt for all CEs

 */



void ath10k_ce_per_engine_service_any(struct ath10k *ar)

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

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
/* The magic used by QCA spec */

#define ATH10K_SMBIOS_BDF_EXT_MAGIC "BDF_"



/* Default Airtime weight multipler (Tuned for multiclient performance) */

/* Default Airtime weight multiplier (Tuned for multiclient performance) */

#define ATH10K_AIRTIME_WEIGHT_MULTIPLIER  4



#define ATH10K_MAX_RETRY_COUNT 30
@@ -857,7 +857,7 @@ enum ath10k_dev_flags { 
	/* Disable HW crypto engine */

	ATH10K_FLAG_HW_CRYPTO_DISABLED,



	/* Bluetooth coexistance enabled */

	/* Bluetooth coexistence enabled */

	ATH10K_FLAG_BTCOEX,



	/* Per Station statistics service */

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

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ static const struct ath10k_mem_section qca6174_hw30_sdio_register_sections[] = { 


	{0x40000, 0x400A4},



	/* SI register is skiped here.

	/* SI register is skipped here.

	 * Because it will cause bus hang

	 *

	 * {0x50000, 0x50018},