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

Merge tag 'wireless-drivers-next-2021-12-07' of... 

Merge tag 'wireless-drivers-next-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for v5.17

First set of patches for v5.17. The biggest change is the iwlmei
driver for Intel's AMT devices. Also now WCN6855 support in ath11k
should be usable.

Major changes:

ath10k
 * fetch (pre-)calibration data via nvmem subsystem

ath11k
 * enable 802.11 power save mode in station mode for qca6390 and wcn6855
 * trace log support
 * proper board file detection for WCN6855 based on PCI ids
 * BSS color change support

rtw88
 * add debugfs file to force lowest basic rate
 * add quirk to disable PCI ASPM on HP 250 G7 Notebook PC

mwifiex
 * add quirk to disable deep sleep with certain hardware revision in
  Surface Book 2 devices

iwlwifi
 * add iwlmei driver for co-operating with Intel's Active Management
   Technology (AMT) devices

* tag 'wireless-drivers-next-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next: (87 commits)
  iwlwifi: mei: fix linking when tracing is not enabled
  rtlwifi: rtl8192de: Style clean-ups
  mwl8k: Use named struct for memcpy() region
  intersil: Use struct_group() for memcpy() region
  libertas_tf: Use struct_group() for memcpy() region
  libertas: Use struct_group() for memcpy() region
  wlcore: no need to initialise statics to false
  rsi: Fix out-of-bounds read in rsi_read_pkt()
  rsi: Fix use-after-free in rsi_rx_done_handler()
  brcmfmac: Configure keep-alive packet on suspend
  wilc1000: remove '-Wunused-but-set-variable' warning in chip_wakeup()
  iwlwifi: mvm: read the rfkill state and feed it to iwlmei
  iwlwifi: mvm: add vendor commands needed for iwlmei
  iwlwifi: integrate with iwlmei
  iwlwifi: mei: add debugfs hooks
  iwlwifi: mei: add the driver to allow cooperation with CSME
  mei: bus: add client dma interface
  mwifiex: Ignore BTCOEX events from the 88W8897 firmware
  mwifiex: Ensure the version string from the firmware is 0-terminated
  mwifiex: Add quirk to disable deep sleep with certain hardware revision
  ...
====================

Link: https://lore.kernel.org/r/20211207144211.A9949C341C1@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents adc76fc9 fe6db7ed

drivers/misc/mei/bus.c

+64 −3
Original line number Diff line number Diff line
@@ -643,6 +643,64 @@ static void mei_cl_bus_vtag_free(struct mei_cl_device *cldev) 
	kfree(cl_vtag);

}



void *mei_cldev_dma_map(struct mei_cl_device *cldev, u8 buffer_id, size_t size)

{

	struct mei_device *bus;

	struct mei_cl *cl;

	int ret;



	if (!cldev || !buffer_id || !size)

		return ERR_PTR(-EINVAL);



	if (!IS_ALIGNED(size, MEI_FW_PAGE_SIZE)) {

		dev_err(&cldev->dev, "Map size should be aligned to %lu\n",

			MEI_FW_PAGE_SIZE);

		return ERR_PTR(-EINVAL);

	}



	cl = cldev->cl;

	bus = cldev->bus;



	mutex_lock(&bus->device_lock);

	if (cl->state == MEI_FILE_UNINITIALIZED) {

		ret = mei_cl_link(cl);

		if (ret)

			goto out;

		/* update pointers */

		cl->cldev = cldev;

	}



	ret = mei_cl_dma_alloc_and_map(cl, NULL, buffer_id, size);

out:

	mutex_unlock(&bus->device_lock);

	if (ret)

		return ERR_PTR(ret);

	return cl->dma.vaddr;

}

EXPORT_SYMBOL_GPL(mei_cldev_dma_map);



int mei_cldev_dma_unmap(struct mei_cl_device *cldev)

{

	struct mei_device *bus;

	struct mei_cl *cl;

	int ret;



	if (!cldev)

		return -EINVAL;



	cl = cldev->cl;

	bus = cldev->bus;



	mutex_lock(&bus->device_lock);

	ret = mei_cl_dma_unmap(cl, NULL);



	mei_cl_flush_queues(cl, NULL);

	mei_cl_unlink(cl);

	mutex_unlock(&bus->device_lock);

	return ret;

}

EXPORT_SYMBOL_GPL(mei_cldev_dma_unmap);



/**

 * mei_cldev_enable - enable me client device

 *     create connection with me client
@@ -753,9 +811,11 @@ int mei_cldev_disable(struct mei_cl_device *cldev) 
		dev_err(bus->dev, "Could not disconnect from the ME client\n");



out:

	/* Flush queues and remove any pending read */

	/* Flush queues and remove any pending read unless we have mapped DMA */

	if (!cl->dma_mapped) {

		mei_cl_flush_queues(cl, NULL);

		mei_cl_unlink(cl);

	}



	mutex_unlock(&bus->device_lock);

	return err;
@@ -1052,6 +1112,7 @@ static void mei_cl_bus_dev_release(struct device *dev) 
	if (!cldev)

		return;



	mei_cl_flush_queues(cldev->cl, NULL);

	mei_me_cl_put(cldev->me_cl);

	mei_dev_bus_put(cldev->bus);

	mei_cl_unlink(cldev->cl);

drivers/misc/mei/client.c

+3 −0
Original line number Diff line number Diff line
@@ -700,6 +700,9 @@ int mei_cl_unlink(struct mei_cl *cl) 


	cl_dbg(dev, cl, "unlink client");



	if (cl->state == MEI_FILE_UNINITIALIZED)

		return 0;



	if (dev->open_handle_count > 0)

		dev->open_handle_count--;

drivers/misc/mei/hw.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
#define MEI_D0I3_TIMEOUT            5  /* D0i3 set/unset max response time */

#define MEI_HBM_TIMEOUT             1  /* 1 second */



/*

 * FW page size for DMA allocations

 */

#define MEI_FW_PAGE_SIZE 4096UL



/*

 * MEI Version

 */

drivers/net/wireless/ath/ar5523/ar5523.c

+4 −0
Original line number Diff line number Diff line
@@ -153,6 +153,10 @@ static void ar5523_cmd_rx_cb(struct urb *urb) 
			ar5523_err(ar, "Invalid reply to WDCMSG_TARGET_START");

			return;

		}

		if (!cmd->odata) {

			ar5523_err(ar, "Unexpected WDCMSG_TARGET_START reply");

			return;

		}

		memcpy(cmd->odata, hdr + 1, sizeof(u32));

		cmd->olen = sizeof(u32);

		cmd->res = 0;

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

+62 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/dmi.h>

#include <linux/ctype.h>

#include <linux/pm_qos.h>

#include <linux/nvmem-consumer.h>

#include <asm/byteorder.h>



#include "core.h"
@@ -935,7 +936,8 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar) 
	}



	if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||

	    ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE)

	    ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE ||

	    ar->cal_mode == ATH10K_PRE_CAL_MODE_NVMEM)

		bmi_board_id_param = BMI_PARAM_GET_FLASH_BOARD_ID;

	else

		bmi_board_id_param = BMI_PARAM_GET_EEPROM_BOARD_ID;
@@ -1726,7 +1728,8 @@ static int ath10k_download_and_run_otp(struct ath10k *ar) 


	/* As of now pre-cal is valid for 10_4 variants */

	if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||

	    ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE)

	    ar->cal_mode == ATH10K_PRE_CAL_MODE_FILE ||

	    ar->cal_mode == ATH10K_PRE_CAL_MODE_NVMEM)

		bmi_otp_exe_param = BMI_PARAM_FLASH_SECTION_ALL;



	ret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &result);
@@ -1853,6 +1856,39 @@ static int ath10k_download_cal_eeprom(struct ath10k *ar) 
	return ret;

}



static int ath10k_download_cal_nvmem(struct ath10k *ar, const char *cell_name)

{

	struct nvmem_cell *cell;

	void *buf;

	size_t len;

	int ret;



	cell = devm_nvmem_cell_get(ar->dev, cell_name);

	if (IS_ERR(cell)) {

		ret = PTR_ERR(cell);

		return ret;

	}



	buf = nvmem_cell_read(cell, &len);

	if (IS_ERR(buf))

		return PTR_ERR(buf);



	if (ar->hw_params.cal_data_len != len) {

		kfree(buf);

		ath10k_warn(ar, "invalid calibration data length in nvmem-cell '%s': %zu != %u\n",

			    cell_name, len, ar->hw_params.cal_data_len);

		return -EMSGSIZE;

	}



	ret = ath10k_download_board_data(ar, buf, len);

	kfree(buf);

	if (ret)

		ath10k_warn(ar, "failed to download calibration data from nvmem-cell '%s': %d\n",

			    cell_name, ret);



	return ret;

}



int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name,

				     struct ath10k_fw_file *fw_file)

{
@@ -2087,6 +2123,18 @@ static int ath10k_core_pre_cal_download(struct ath10k *ar) 
{

	int ret;



	ret = ath10k_download_cal_nvmem(ar, "pre-calibration");

	if (ret == 0) {

		ar->cal_mode = ATH10K_PRE_CAL_MODE_NVMEM;

		goto success;

	} else if (ret == -EPROBE_DEFER) {

		return ret;

	}



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot did not find a pre-calibration nvmem-cell, try file next: %d\n",

		   ret);



	ret = ath10k_download_cal_file(ar, ar->pre_cal_file);

	if (ret == 0) {

		ar->cal_mode = ATH10K_PRE_CAL_MODE_FILE;
@@ -2153,6 +2201,18 @@ static int ath10k_download_cal_data(struct ath10k *ar) 
		   "pre cal download procedure failed, try cal file: %d\n",

		   ret);



	ret = ath10k_download_cal_nvmem(ar, "calibration");

	if (ret == 0) {

		ar->cal_mode = ATH10K_CAL_MODE_NVMEM;

		goto done;

	} else if (ret == -EPROBE_DEFER) {

		return ret;

	}



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "boot did not find a calibration nvmem-cell, try file next: %d\n",

		   ret);



	ret = ath10k_download_cal_file(ar, ar->cal_file);

	if (ret == 0) {

		ar->cal_mode = ATH10K_CAL_MODE_FILE;