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

Commit 0ddcf3e7 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git 

To fix a conflict reported by Stephen Rothwell <sfr@canb.auug.org.au>:

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in:

  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

between commit:

  77e30e10 ("iwlwifi: mvm: query regdb for wmm rule if needed")

from the wireless-drivers tree and commits:

  9c4f7d51 ("iwlwifi: move all NVM parsing code to the common files")
  4c625c56 ("iwlwifi: get rid of fw/nvm.c")

from the wireless-drivers-next tree.
parents 51c12756 af8a41cc

drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c

+20 −16
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static void brcmf_fw_free_request(struct brcmf_fw_request *req) 
	kfree(req);

}



static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)

static int brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)

{

	struct brcmf_fw *fwctx = ctx;

	struct brcmf_fw_item *cur;
@@ -498,13 +498,10 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) 
	brcmf_dbg(TRACE, "nvram %p len %d\n", nvram, nvram_length);

	cur->nv_data.data = nvram;

	cur->nv_data.len = nvram_length;

	return;

	return 0;



fail:

	brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));

	fwctx->done(fwctx->dev, -ENOENT, NULL);

	brcmf_fw_free_request(fwctx->req);

	kfree(fwctx);

	return -ENOENT;

}



static int brcmf_fw_request_next_item(struct brcmf_fw *fwctx, bool async)
@@ -553,20 +550,27 @@ static void brcmf_fw_request_done(const struct firmware *fw, void *ctx) 
	brcmf_dbg(TRACE, "enter: firmware %s %sfound\n", cur->path,

		  fw ? "" : "not ");



	if (fw) {

		if (cur->type == BRCMF_FW_TYPE_BINARY)

	if (!fw)

		ret = -ENOENT;



	switch (cur->type) {

	case BRCMF_FW_TYPE_NVRAM:

		ret = brcmf_fw_request_nvram_done(fw, fwctx);

		break;

	case BRCMF_FW_TYPE_BINARY:

		cur->binary = fw;

		else if (cur->type == BRCMF_FW_TYPE_NVRAM)

			brcmf_fw_request_nvram_done(fw, fwctx);

		else

		break;

	default:

		/* something fishy here so bail out early */

		brcmf_err("unknown fw type: %d\n", cur->type);

		release_firmware(fw);

	} else if (cur->type == BRCMF_FW_TYPE_NVRAM) {

		brcmf_fw_request_nvram_done(NULL, fwctx);

	} else if (!(cur->flags & BRCMF_FW_REQF_OPTIONAL)) {

		ret = -ENOENT;

		ret = -EINVAL;

		goto fail;

	}



	if (ret < 0 && !(cur->flags & BRCMF_FW_REQF_OPTIONAL))

		goto fail;



	do {

		if (++fwctx->curpos == fwctx->req->n_items) {

			ret = 0;

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

+5 −8
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -749,13 +750,9 @@ struct iwl_scan_req_umac { 
} __packed;



#define IWL_SCAN_REQ_UMAC_SIZE_V8 sizeof(struct iwl_scan_req_umac)

#define IWL_SCAN_REQ_UMAC_SIZE_V7 (sizeof(struct iwl_scan_req_umac) - \

					 4 * sizeof(u8))

#define IWL_SCAN_REQ_UMAC_SIZE_V6 (sizeof(struct iwl_scan_req_umac) - \

				   2 * sizeof(u8) - sizeof(__le16))

#define IWL_SCAN_REQ_UMAC_SIZE_V1 (sizeof(struct iwl_scan_req_umac) - \

				   2 * sizeof(__le32) - 2 * sizeof(u8) - \

				   sizeof(__le16))

#define IWL_SCAN_REQ_UMAC_SIZE_V7 48

#define IWL_SCAN_REQ_UMAC_SIZE_V6 44

#define IWL_SCAN_REQ_UMAC_SIZE_V1 36



/**

 * struct iwl_umac_scan_abort

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+87 −9
Original line number Diff line number Diff line
@@ -855,21 +855,31 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u8 *nvm_chan, 
	return flags;

}



struct regdb_ptrs {

	struct ieee80211_wmm_rule *rule;

	u32 token;

};



struct ieee80211_regdomain *

iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,

		       int num_of_ch, __le32 *channels, u16 fw_mcc)

		       int num_of_ch, __le32 *channels, u16 fw_mcc,

		       u16 geo_info)

{

	int ch_idx;

	u16 ch_flags;

	u32 reg_rule_flags, prev_reg_rule_flags = 0;

	const u8 *nvm_chan = cfg->nvm_type == IWL_NVM_EXT ?

			     iwl_ext_nvm_channels : iwl_nvm_channels;

	struct ieee80211_regdomain *regd;

	int size_of_regd;

	struct ieee80211_regdomain *regd, *copy_rd;

	int size_of_regd, regd_to_copy, wmms_to_copy;

	int size_of_wmms = 0;

	struct ieee80211_reg_rule *rule;

	struct ieee80211_wmm_rule *wmm_rule, *d_wmm, *s_wmm;

	struct regdb_ptrs *regdb_ptrs;

	enum nl80211_band band;

	int center_freq, prev_center_freq = 0;

	int valid_rules = 0;

	int valid_rules = 0, n_wmms = 0;

	int i;

	bool new_rule;

	int max_num_ch = cfg->nvm_type == IWL_NVM_EXT ?

			 IWL_NVM_NUM_CHANNELS_EXT : IWL_NVM_NUM_CHANNELS;
@@ -888,10 +898,26 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
		sizeof(struct ieee80211_regdomain) +

		num_of_ch * sizeof(struct ieee80211_reg_rule);



	regd = kzalloc(size_of_regd, GFP_KERNEL);

	if (geo_info & GEO_WMM_ETSI_5GHZ_INFO)

		size_of_wmms =

			num_of_ch * sizeof(struct ieee80211_wmm_rule);



	regd = kzalloc(size_of_regd + size_of_wmms, GFP_KERNEL);

	if (!regd)

		return ERR_PTR(-ENOMEM);



	regdb_ptrs = kcalloc(num_of_ch, sizeof(*regdb_ptrs), GFP_KERNEL);

	if (!regdb_ptrs) {

		copy_rd = ERR_PTR(-ENOMEM);

		goto out;

	}



	/* set alpha2 from FW. */

	regd->alpha2[0] = fw_mcc >> 8;

	regd->alpha2[1] = fw_mcc & 0xff;



	wmm_rule = (struct ieee80211_wmm_rule *)((u8 *)regd + size_of_regd);



	for (ch_idx = 0; ch_idx < num_of_ch; ch_idx++) {

		ch_flags = (u16)__le32_to_cpup(channels + ch_idx);

		band = (ch_idx < NUM_2GHZ_CHANNELS) ?
@@ -940,15 +966,67 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 


		iwl_nvm_print_channel_flags(dev, IWL_DL_LAR,

					    nvm_chan[ch_idx], ch_flags);



		if (!(geo_info & GEO_WMM_ETSI_5GHZ_INFO) ||

		    band == NL80211_BAND_2GHZ)

			continue;



		if (!reg_query_regdb_wmm(regd->alpha2, center_freq,

					 &regdb_ptrs[n_wmms].token, wmm_rule)) {

			/* Add only new rules */

			for (i = 0; i < n_wmms; i++) {

				if (regdb_ptrs[i].token ==

				    regdb_ptrs[n_wmms].token) {

					rule->wmm_rule = regdb_ptrs[i].rule;

					break;

				}

			}

			if (i == n_wmms) {

				rule->wmm_rule = wmm_rule;

				regdb_ptrs[n_wmms++].rule = wmm_rule;

				wmm_rule++;

			}

		}

	}



	regd->n_reg_rules = valid_rules;

	regd->n_wmm_rules = n_wmms;



	/* set alpha2 from FW. */

	regd->alpha2[0] = fw_mcc >> 8;

	regd->alpha2[1] = fw_mcc & 0xff;

	/*

	 * Narrow down regdom for unused regulatory rules to prevent hole

	 * between reg rules to wmm rules.

	 */

	regd_to_copy = sizeof(struct ieee80211_regdomain) +

		valid_rules * sizeof(struct ieee80211_reg_rule);



	wmms_to_copy = sizeof(struct ieee80211_wmm_rule) * n_wmms;



	return regd;

	copy_rd = kzalloc(regd_to_copy + wmms_to_copy, GFP_KERNEL);

	if (!copy_rd) {

		copy_rd = ERR_PTR(-ENOMEM);

		goto out;

	}



	memcpy(copy_rd, regd, regd_to_copy);

	memcpy((u8 *)copy_rd + regd_to_copy, (u8 *)regd + size_of_regd,

	       wmms_to_copy);



	d_wmm = (struct ieee80211_wmm_rule *)((u8 *)copy_rd + regd_to_copy);

	s_wmm = (struct ieee80211_wmm_rule *)((u8 *)regd + size_of_regd);



	for (i = 0; i < regd->n_reg_rules; i++) {

		if (!regd->reg_rules[i].wmm_rule)

			continue;



		copy_rd->reg_rules[i].wmm_rule = d_wmm +

			(regd->reg_rules[i].wmm_rule - s_wmm) /

			sizeof(struct ieee80211_wmm_rule);

	}



out:

	kfree(regdb_ptrs);

	kfree(regd);

	return copy_rd;

}

IWL_EXPORT_SYMBOL(iwl_parse_nvm_mcc_info);

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h

+4 −2
Original line number Diff line number Diff line
@@ -100,13 +100,15 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg, 
 *

 * This function parses the regulatory channel data received as a

 * MCC_UPDATE_CMD command. It returns a newly allocation regulatory domain,

 * to be fed into the regulatory core. An ERR_PTR is returned on error.

 * to be fed into the regulatory core. In case the geo_info is set handle

 * accordingly. An ERR_PTR is returned on error.

 * If not given to the regulatory core, the user is responsible for freeing

 * the regdomain returned here with kfree.

 */

struct ieee80211_regdomain *

iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,

		       int num_of_ch, __le32 *channels, u16 fw_mcc);

		       int num_of_ch, __le32 *channels, u16 fw_mcc,

		       u16 geo_info);



/**

 * struct iwl_nvm_section - describes an NVM section in memory.

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+2 −1
Original line number Diff line number Diff line
@@ -311,7 +311,8 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy, 
	regd = iwl_parse_nvm_mcc_info(mvm->trans->dev, mvm->cfg,

				      __le32_to_cpu(resp->n_channels),

				      resp->channels,

				      __le16_to_cpu(resp->mcc));

				      __le16_to_cpu(resp->mcc),

				      __le16_to_cpu(resp->geo_info));

	/* Store the return source id */

	src_id = resp->source_id;

	kfree(resp);