Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1375da47 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2019-06-29' of... 

Merge tag 'iwlwifi-next-for-kalle-2019-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Patches intended for v5.3

* Work on the new debugging framework continues;
* Update the FW API for CSI;
* Special SAR implementation for South Korea;
* Fixes in the module init error paths;
* Debugging infra work continues;
* A bunch of RF-kill fixes by Emmanuel;
* A fix for AP mode, also related to RF-kill, by Johannes.
* A few clean-ups;
* Other small fixes and improvements;
parents 9829a0bd 94022562

drivers/net/wireless/intel/iwlwifi/dvm/lib.c

+1 −2
Original line number Diff line number Diff line
@@ -1009,8 +1009,7 @@ int iwlagn_send_patterns(struct iwl_priv *priv, 
	if (!wowlan->n_patterns)

		return 0;



	cmd.len[0] = sizeof(*pattern_cmd) +

		wowlan->n_patterns * sizeof(struct iwlagn_wowlan_pattern);

	cmd.len[0] = struct_size(pattern_cmd, patterns, wowlan->n_patterns);



	pattern_cmd = kmalloc(cmd.len[0], GFP_KERNEL);

	if (!pattern_cmd)

drivers/net/wireless/intel/iwlwifi/fw/acpi.c

+17 −11
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_object); 


union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

					 union acpi_object *data,

					 int data_size)

					 int data_size, int *tbl_rev)

{

	int i;

	union acpi_object *wifi_pkg;
@@ -113,16 +113,19 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, 
	/*

	 * We need at least two packages, one for the revision and one

	 * for the data itself.  Also check that the revision is valid

	 * (i.e. it is an integer set to 0).

	 * (i.e. it is an integer smaller than 2, as we currently support only

	 * 2 revisions).

	 */

	if (data->type != ACPI_TYPE_PACKAGE ||

	    data->package.count < 2 ||

	    data->package.elements[0].type != ACPI_TYPE_INTEGER ||

	    data->package.elements[0].integer.value != 0) {

	    data->package.elements[0].integer.value > 1) {

		IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n");

		return ERR_PTR(-EINVAL);

	}



	*tbl_rev = data->package.elements[0].integer.value;



	/* loop through all the packages to find the one for WiFi */

	for (i = 1; i < data->package.count; i++) {

		union acpi_object *domain;
@@ -151,14 +154,15 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc) 
{

	union acpi_object *wifi_pkg, *data;

	u32 mcc_val;

	int ret;

	int ret, tbl_rev;



	data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD);

	if (IS_ERR(data))

		return PTR_ERR(data);



	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE);

	if (IS_ERR(wifi_pkg)) {

	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE,

					 &tbl_rev);

	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {

		ret = PTR_ERR(wifi_pkg);

		goto out_free;

	}
@@ -185,6 +189,7 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev) 
{

	union acpi_object *data, *wifi_pkg;

	u64 dflt_pwr_limit;

	int tbl_rev;



	data = iwl_acpi_get_object(dev, ACPI_SPLC_METHOD);

	if (IS_ERR(data)) {
@@ -193,8 +198,8 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev) 
	}



	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data,

					 ACPI_SPLC_WIFI_DATA_SIZE);

	if (IS_ERR(wifi_pkg) ||

					 ACPI_SPLC_WIFI_DATA_SIZE, &tbl_rev);

	if (IS_ERR(wifi_pkg) || tbl_rev != 0 ||

	    wifi_pkg->package.elements[1].integer.value != ACPI_TYPE_INTEGER) {

		dflt_pwr_limit = 0;

		goto out_free;
@@ -211,14 +216,15 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit); 
int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk)

{

	union acpi_object *wifi_pkg, *data;

	int ret;

	int ret, tbl_rev;



	data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD);

	if (IS_ERR(data))

		return PTR_ERR(data);



	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE);

	if (IS_ERR(wifi_pkg)) {

	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE,

					 &tbl_rev);

	if (IS_ERR(wifi_pkg) || tbl_rev != 0) {

		ret = PTR_ERR(wifi_pkg);

		goto out_free;

	}

drivers/net/wireless/intel/iwlwifi/fw/acpi.h

+3 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
void *iwl_acpi_get_object(struct device *dev, acpi_string method);

union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

					 union acpi_object *data,

					 int data_size);

					 int data_size, int *tbl_rev);



/**

 * iwl_acpi_get_mcc - read MCC from ACPI, if available
@@ -131,7 +131,8 @@ static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method) 


static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,

						       union acpi_object *data,

						       int data_size)

						       int data_size,

						       int *tbl_rev)

{

	return ERR_PTR(-ENOENT);

}

drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h

+22 −0
Original line number Diff line number Diff line
@@ -291,6 +291,28 @@ struct iwl_fw_ini_trigger_tlv { 
	struct iwl_fw_ini_trigger trigger_config[];

} __packed; /* FW_TLV_DEBUG_TRIGGERS_API_S_VER_1 */



#define IWL_FW_INI_MAX_IMG_NAME_LEN 32

#define IWL_FW_INI_MAX_DBG_CFG_NAME_LEN 64



/**

 * struct iwl_fw_ini_debug_info_tlv - (IWL_UCODE_TLV_TYPE_DEBUG_INFO)

 *

 * holds image name and debug configuration name

 *

 * @header: header

 * @img_name_len: length of the image name string

 * @img_name: image name string

 * @dbg_cfg_name_len : length of the debug configuration name string

 * @dbg_cfg_name: debug configuration name string

 */

struct iwl_fw_ini_debug_info_tlv {

	struct iwl_fw_ini_header header;

	__le32 img_name_len;

	u8 img_name[IWL_FW_INI_MAX_IMG_NAME_LEN];

	__le32 dbg_cfg_name_len;

	u8 dbg_cfg_name[IWL_FW_INI_MAX_DBG_CFG_NAME_LEN];

} __packed; /* FW_DEBUG_TLV_INFO_API_S_VER_1 */



/**

 * enum iwl_fw_ini_trigger_id

 *

drivers/net/wireless/intel/iwlwifi/fw/api/location.h

+8 −3
Original line number Diff line number Diff line
@@ -937,8 +937,13 @@ struct iwl_ftm_responder_stats { 
	__le16 reserved;

} __packed; /* TOF_RESPONDER_STATISTICS_NTFY_S_VER_2 */



#define IWL_CSI_CHUNK_CTL_NUM_MASK	0x3

#define IWL_CSI_CHUNK_CTL_IDX_MASK	0xc

#define IWL_CSI_MAX_EXPECTED_CHUNKS		16



#define IWL_CSI_CHUNK_CTL_NUM_MASK_VER_1	0x0003

#define IWL_CSI_CHUNK_CTL_IDX_MASK_VER_1	0x000c



#define IWL_CSI_CHUNK_CTL_NUM_MASK_VER_2	0x00ff

#define IWL_CSI_CHUNK_CTL_IDX_MASK_VER_2	0xff00



struct iwl_csi_chunk_notification {

	__le32 token;
@@ -946,6 +951,6 @@ struct iwl_csi_chunk_notification { 
	__le16 ctl;

	__le32 size;

	u8 data[];

} __packed; /* CSI_CHUNKS_HDR_NTFY_API_S_VER_1 */

} __packed; /* CSI_CHUNKS_HDR_NTFY_API_S_VER_1/VER_2 */



#endif /* __iwl_fw_api_location_h__ */