Commit 06e03f8c authored by Don Fry's avatar Don Fry Committed by Wey-Yi Guy

iwlwifi: changes args to iwl_nic for firmware operations

Remove the references to iwl_priv from the firmware request and
parsing routines.  They are generic to the nic.
Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 69655ebf
...@@ -1262,7 +1262,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, ...@@ -1262,7 +1262,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
init_completion(&nic(priv)->request_firmware_complete); init_completion(&nic(priv)->request_firmware_complete);
err = iwl_request_firmware(priv, true); err = iwl_request_firmware(nic(priv), true);
if (err) if (err)
goto out_destroy_workqueue; goto out_destroy_workqueue;
......
...@@ -690,10 +690,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context); ...@@ -690,10 +690,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context);
#define UCODE_EXPERIMENTAL_INDEX 100 #define UCODE_EXPERIMENTAL_INDEX 100
#define UCODE_EXPERIMENTAL_TAG "exp" #define UCODE_EXPERIMENTAL_TAG "exp"
int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first) int __must_check iwl_request_firmware(struct iwl_nic *nic, bool first)
{ {
struct iwl_nic *nic = nic(priv); struct iwl_cfg *cfg = cfg(nic);
const char *name_pre = cfg(priv)->fw_name_pre; const char *name_pre = cfg->fw_name_pre;
char tag[8]; char tag[8];
if (first) { if (first) {
...@@ -702,28 +702,28 @@ int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first) ...@@ -702,28 +702,28 @@ int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first)
strcpy(tag, UCODE_EXPERIMENTAL_TAG); strcpy(tag, UCODE_EXPERIMENTAL_TAG);
} else if (nic->fw_index == UCODE_EXPERIMENTAL_INDEX) { } else if (nic->fw_index == UCODE_EXPERIMENTAL_INDEX) {
#endif #endif
nic->fw_index = cfg(priv)->ucode_api_max; nic->fw_index = cfg->ucode_api_max;
sprintf(tag, "%d", nic->fw_index); sprintf(tag, "%d", nic->fw_index);
} else { } else {
nic->fw_index--; nic->fw_index--;
sprintf(tag, "%d", nic->fw_index); sprintf(tag, "%d", nic->fw_index);
} }
if (nic->fw_index < cfg(priv)->ucode_api_min) { if (nic->fw_index < cfg->ucode_api_min) {
IWL_ERR(priv, "no suitable firmware found!\n"); IWL_ERR(nic, "no suitable firmware found!\n");
return -ENOENT; return -ENOENT;
} }
sprintf(nic->firmware_name, "%s%s%s", name_pre, tag, ".ucode"); sprintf(nic->firmware_name, "%s%s%s", name_pre, tag, ".ucode");
IWL_DEBUG_INFO(priv, "attempting to load firmware %s'%s'\n", IWL_DEBUG_INFO(nic, "attempting to load firmware %s'%s'\n",
(nic->fw_index == UCODE_EXPERIMENTAL_INDEX) (nic->fw_index == UCODE_EXPERIMENTAL_INDEX)
? "EXPERIMENTAL " : "", ? "EXPERIMENTAL " : "",
nic->firmware_name); nic->firmware_name);
return request_firmware_nowait(THIS_MODULE, 1, nic->firmware_name, return request_firmware_nowait(THIS_MODULE, 1, nic->firmware_name,
trans(priv)->dev, trans(nic)->dev,
GFP_KERNEL, priv, iwl_ucode_callback); GFP_KERNEL, nic, iwl_ucode_callback);
} }
struct iwlagn_firmware_pieces { struct iwlagn_firmware_pieces {
...@@ -737,11 +737,10 @@ struct iwlagn_firmware_pieces { ...@@ -737,11 +737,10 @@ struct iwlagn_firmware_pieces {
u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr; u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr;
}; };
static int iwlagn_load_legacy_firmware(struct iwl_priv *priv, static int iwl_parse_v1_v2_firmware(struct iwl_nic *nic,
const struct firmware *ucode_raw, const struct firmware *ucode_raw,
struct iwlagn_firmware_pieces *pieces) struct iwlagn_firmware_pieces *pieces)
{ {
struct iwl_nic *nic = nic(priv);
struct iwl_ucode_header *ucode = (void *)ucode_raw->data; struct iwl_ucode_header *ucode = (void *)ucode_raw->data;
u32 api_ver, hdr_size; u32 api_ver, hdr_size;
const u8 *src; const u8 *src;
...@@ -753,7 +752,7 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv, ...@@ -753,7 +752,7 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv,
default: default:
hdr_size = 28; hdr_size = 28;
if (ucode_raw->size < hdr_size) { if (ucode_raw->size < hdr_size) {
IWL_ERR(priv, "File size too small!\n"); IWL_ERR(nic, "File size too small!\n");
return -EINVAL; return -EINVAL;
} }
pieces->build = le32_to_cpu(ucode->u.v2.build); pieces->build = le32_to_cpu(ucode->u.v2.build);
...@@ -768,7 +767,7 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv, ...@@ -768,7 +767,7 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv,
case 2: case 2:
hdr_size = 24; hdr_size = 24;
if (ucode_raw->size < hdr_size) { if (ucode_raw->size < hdr_size) {
IWL_ERR(priv, "File size too small!\n"); IWL_ERR(nic, "File size too small!\n");
return -EINVAL; return -EINVAL;
} }
pieces->build = 0; pieces->build = 0;
...@@ -785,7 +784,7 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv, ...@@ -785,7 +784,7 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv,
pieces->data_size + pieces->init_size + pieces->data_size + pieces->init_size +
pieces->init_data_size) { pieces->init_data_size) {
IWL_ERR(priv, IWL_ERR(nic,
"uCode file size %d does not match expected size\n", "uCode file size %d does not match expected size\n",
(int)ucode_raw->size); (int)ucode_raw->size);
return -EINVAL; return -EINVAL;
...@@ -803,12 +802,11 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv, ...@@ -803,12 +802,11 @@ static int iwlagn_load_legacy_firmware(struct iwl_priv *priv,
return 0; return 0;
} }
static int iwlagn_load_firmware(struct iwl_priv *priv, static int iwl_parse_tlv_firmware(struct iwl_nic *nic,
const struct firmware *ucode_raw, const struct firmware *ucode_raw,
struct iwlagn_firmware_pieces *pieces, struct iwlagn_firmware_pieces *pieces,
struct iwlagn_ucode_capabilities *capa) struct iwlagn_ucode_capabilities *capa)
{ {
struct iwl_nic *nic = nic(priv);
struct iwl_tlv_ucode_header *ucode = (void *)ucode_raw->data; struct iwl_tlv_ucode_header *ucode = (void *)ucode_raw->data;
struct iwl_ucode_tlv *tlv; struct iwl_ucode_tlv *tlv;
size_t len = ucode_raw->size; size_t len = ucode_raw->size;
...@@ -821,12 +819,12 @@ static int iwlagn_load_firmware(struct iwl_priv *priv, ...@@ -821,12 +819,12 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
const u8 *tlv_data; const u8 *tlv_data;
if (len < sizeof(*ucode)) { if (len < sizeof(*ucode)) {
IWL_ERR(priv, "uCode has invalid length: %zd\n", len); IWL_ERR(nic, "uCode has invalid length: %zd\n", len);
return -EINVAL; return -EINVAL;
} }
if (ucode->magic != cpu_to_le32(IWL_TLV_UCODE_MAGIC)) { if (ucode->magic != cpu_to_le32(IWL_TLV_UCODE_MAGIC)) {
IWL_ERR(priv, "invalid uCode magic: 0X%x\n", IWL_ERR(nic, "invalid uCode magic: 0X%x\n",
le32_to_cpu(ucode->magic)); le32_to_cpu(ucode->magic));
return -EINVAL; return -EINVAL;
} }
...@@ -844,7 +842,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv, ...@@ -844,7 +842,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
while (wanted_alternative && !(alternatives & BIT(wanted_alternative))) while (wanted_alternative && !(alternatives & BIT(wanted_alternative)))
wanted_alternative--; wanted_alternative--;
if (wanted_alternative && wanted_alternative != tmp) if (wanted_alternative && wanted_alternative != tmp)
IWL_WARN(priv, IWL_WARN(nic,
"uCode alternative %d not available, choosing %d\n", "uCode alternative %d not available, choosing %d\n",
tmp, wanted_alternative); tmp, wanted_alternative);
...@@ -866,7 +864,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv, ...@@ -866,7 +864,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
tlv_data = tlv->data; tlv_data = tlv->data;
if (len < tlv_len) { if (len < tlv_len) {
IWL_ERR(priv, "invalid TLV len: %zd/%u\n", IWL_ERR(nic, "invalid TLV len: %zd/%u\n",
len, tlv_len); len, tlv_len);
return -EINVAL; return -EINVAL;
} }
...@@ -899,7 +897,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv, ...@@ -899,7 +897,7 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
pieces->init_data_size = tlv_len; pieces->init_data_size = tlv_len;
break; break;
case IWL_UCODE_TLV_BOOT: case IWL_UCODE_TLV_BOOT:
IWL_ERR(priv, "Found unexpected BOOT ucode\n"); IWL_ERR(nic, "Found unexpected BOOT ucode\n");
break; break;
case IWL_UCODE_TLV_PROBE_MAX_LEN: case IWL_UCODE_TLV_PROBE_MAX_LEN:
if (tlv_len != sizeof(u32)) if (tlv_len != sizeof(u32))
...@@ -984,22 +982,22 @@ static int iwlagn_load_firmware(struct iwl_priv *priv, ...@@ -984,22 +982,22 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
le32_to_cpup((__le32 *)tlv_data); le32_to_cpup((__le32 *)tlv_data);
break; break;
default: default:
IWL_DEBUG_INFO(priv, "unknown TLV: %d\n", tlv_type); IWL_DEBUG_INFO(nic, "unknown TLV: %d\n", tlv_type);
break; break;
} }
} }
if (len) { if (len) {
IWL_ERR(priv, "invalid TLV after parsing: %zd\n", len); IWL_ERR(nic, "invalid TLV after parsing: %zd\n", len);
iwl_print_hex_dump(priv, IWL_DL_FW, (u8 *)data, len); iwl_print_hex_dump(nic, IWL_DL_FW, (u8 *)data, len);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
invalid_tlv_len: invalid_tlv_len:
IWL_ERR(priv, "TLV %d has invalid size: %u\n", tlv_type, tlv_len); IWL_ERR(nic, "TLV %d has invalid size: %u\n", tlv_type, tlv_len);
iwl_print_hex_dump(priv, IWL_DL_FW, tlv_data, tlv_len); iwl_print_hex_dump(nic, IWL_DL_FW, tlv_data, tlv_len);
return -EINVAL; return -EINVAL;
} }
...@@ -1012,14 +1010,15 @@ static int iwlagn_load_firmware(struct iwl_priv *priv, ...@@ -1012,14 +1010,15 @@ static int iwlagn_load_firmware(struct iwl_priv *priv,
*/ */
static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
{ {
struct iwl_priv *priv = context; struct iwl_nic *nic = context;
struct iwl_nic *nic = nic(priv); struct iwl_cfg *cfg = cfg(nic);
struct iwl_priv *priv = priv(nic); /* temporary */
struct iwl_ucode_header *ucode; struct iwl_ucode_header *ucode;
int err; int err;
struct iwlagn_firmware_pieces pieces; struct iwlagn_firmware_pieces pieces;
const unsigned int api_max = cfg(priv)->ucode_api_max; const unsigned int api_max = cfg->ucode_api_max;
unsigned int api_ok = cfg(priv)->ucode_api_ok; unsigned int api_ok = cfg->ucode_api_ok;
const unsigned int api_min = cfg(priv)->ucode_api_min; const unsigned int api_min = cfg->ucode_api_min;
u32 api_ver; u32 api_ver;
char buildstr[25]; char buildstr[25];
u32 build; u32 build;
...@@ -1036,18 +1035,18 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1036,18 +1035,18 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
if (!ucode_raw) { if (!ucode_raw) {
if (nic->fw_index <= api_ok) if (nic->fw_index <= api_ok)
IWL_ERR(priv, IWL_ERR(nic,
"request for firmware file '%s' failed.\n", "request for firmware file '%s' failed.\n",
nic->firmware_name); nic->firmware_name);
goto try_again; goto try_again;
} }
IWL_DEBUG_INFO(priv, "Loaded firmware file '%s' (%zd bytes).\n", IWL_DEBUG_INFO(nic, "Loaded firmware file '%s' (%zd bytes).\n",
nic->firmware_name, ucode_raw->size); nic->firmware_name, ucode_raw->size);
/* Make sure that we got at least the API version number */ /* Make sure that we got at least the API version number */
if (ucode_raw->size < 4) { if (ucode_raw->size < 4) {
IWL_ERR(priv, "File size way too small!\n"); IWL_ERR(nic, "File size way too small!\n");
goto try_again; goto try_again;
} }
...@@ -1055,9 +1054,9 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1055,9 +1054,9 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
ucode = (struct iwl_ucode_header *)ucode_raw->data; ucode = (struct iwl_ucode_header *)ucode_raw->data;
if (ucode->ver) if (ucode->ver)
err = iwlagn_load_legacy_firmware(priv, ucode_raw, &pieces); err = iwl_parse_v1_v2_firmware(nic, ucode_raw, &pieces);
else else
err = iwlagn_load_firmware(priv, ucode_raw, &pieces, err = iwl_parse_tlv_firmware(nic, ucode_raw, &pieces,
&ucode_capa); &ucode_capa);
if (err) if (err)
...@@ -1074,7 +1073,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1074,7 +1073,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
/* no api version check required for experimental uCode */ /* no api version check required for experimental uCode */
if (nic->fw_index != UCODE_EXPERIMENTAL_INDEX) { if (nic->fw_index != UCODE_EXPERIMENTAL_INDEX) {
if (api_ver < api_min || api_ver > api_max) { if (api_ver < api_min || api_ver > api_max) {
IWL_ERR(priv, IWL_ERR(nic,
"Driver unable to support your firmware API. " "Driver unable to support your firmware API. "
"Driver supports v%u, firmware is v%u.\n", "Driver supports v%u, firmware is v%u.\n",
api_max, api_ver); api_max, api_ver);
...@@ -1083,14 +1082,14 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1083,14 +1082,14 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
if (api_ver < api_ok) { if (api_ver < api_ok) {
if (api_ok != api_max) if (api_ok != api_max)
IWL_ERR(priv, "Firmware has old API version, " IWL_ERR(nic, "Firmware has old API version, "
"expected v%u through v%u, got v%u.\n", "expected v%u through v%u, got v%u.\n",
api_ok, api_max, api_ver); api_ok, api_max, api_ver);
else else
IWL_ERR(priv, "Firmware has old API version, " IWL_ERR(nic, "Firmware has old API version, "
"expected v%u, got v%u.\n", "expected v%u, got v%u.\n",
api_max, api_ver); api_max, api_ver);
IWL_ERR(priv, "New firmware can be obtained from " IWL_ERR(nic, "New firmware can be obtained from "
"http://www.intellinuxwireless.org/.\n"); "http://www.intellinuxwireless.org/.\n");
} }
} }
...@@ -1102,7 +1101,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1102,7 +1101,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
else else
buildstr[0] = '\0'; buildstr[0] = '\0';
IWL_INFO(priv, "loaded firmware version %u.%u.%u.%u%s\n", IWL_INFO(nic, "loaded firmware version %u.%u.%u.%u%s\n",
IWL_UCODE_MAJOR(nic->fw.ucode_ver), IWL_UCODE_MAJOR(nic->fw.ucode_ver),
IWL_UCODE_MINOR(nic->fw.ucode_ver), IWL_UCODE_MINOR(nic->fw.ucode_ver),
IWL_UCODE_API(nic->fw.ucode_ver), IWL_UCODE_API(nic->fw.ucode_ver),
...@@ -1124,38 +1123,38 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1124,38 +1123,38 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
* user just got a corrupted version of the latest API. * user just got a corrupted version of the latest API.
*/ */
IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n", IWL_DEBUG_INFO(nic, "f/w package hdr ucode version raw = 0x%x\n",
nic->fw.ucode_ver); nic->fw.ucode_ver);
IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %Zd\n", IWL_DEBUG_INFO(nic, "f/w package hdr runtime inst size = %Zd\n",
pieces.inst_size); pieces.inst_size);
IWL_DEBUG_INFO(priv, "f/w package hdr runtime data size = %Zd\n", IWL_DEBUG_INFO(nic, "f/w package hdr runtime data size = %Zd\n",
pieces.data_size); pieces.data_size);
IWL_DEBUG_INFO(priv, "f/w package hdr init inst size = %Zd\n", IWL_DEBUG_INFO(nic, "f/w package hdr init inst size = %Zd\n",
pieces.init_size); pieces.init_size);
IWL_DEBUG_INFO(priv, "f/w package hdr init data size = %Zd\n", IWL_DEBUG_INFO(nic, "f/w package hdr init data size = %Zd\n",
pieces.init_data_size); pieces.init_data_size);
/* Verify that uCode images will fit in card's SRAM */ /* Verify that uCode images will fit in card's SRAM */
if (pieces.inst_size > hw_params(priv).max_inst_size) { if (pieces.inst_size > hw_params(nic).max_inst_size) {
IWL_ERR(priv, "uCode instr len %Zd too large to fit in\n", IWL_ERR(nic, "uCode instr len %Zd too large to fit in\n",
pieces.inst_size); pieces.inst_size);
goto try_again; goto try_again;
} }
if (pieces.data_size > hw_params(priv).max_data_size) { if (pieces.data_size > hw_params(nic).max_data_size) {
IWL_ERR(priv, "uCode data len %Zd too large to fit in\n", IWL_ERR(nic, "uCode data len %Zd too large to fit in\n",
pieces.data_size); pieces.data_size);
goto try_again; goto try_again;
} }
if (pieces.init_size > hw_params(priv).max_inst_size) { if (pieces.init_size > hw_params(nic).max_inst_size) {
IWL_ERR(priv, "uCode init instr len %Zd too large to fit in\n", IWL_ERR(nic, "uCode init instr len %Zd too large to fit in\n",
pieces.init_size); pieces.init_size);
goto try_again; goto try_again;
} }
if (pieces.init_data_size > hw_params(priv).max_data_size) { if (pieces.init_data_size > hw_params(nic).max_data_size) {
IWL_ERR(priv, "uCode init data len %Zd too large to fit in\n", IWL_ERR(nic, "uCode init data len %Zd too large to fit in\n",
pieces.init_data_size); pieces.init_data_size);
goto try_again; goto try_again;
} }
...@@ -1165,34 +1164,34 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1165,34 +1164,34 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
/* Runtime instructions and 2 copies of data: /* Runtime instructions and 2 copies of data:
* 1) unmodified from disk * 1) unmodified from disk
* 2) backup cache for save/restore during power-downs */ * 2) backup cache for save/restore during power-downs */
if (iwl_alloc_fw_desc(nic(priv), &nic(priv)->fw.ucode_rt.code, if (iwl_alloc_fw_desc(nic, &nic->fw.ucode_rt.code,
pieces.inst, pieces.inst_size)) pieces.inst, pieces.inst_size))
goto err_pci_alloc; goto err_pci_alloc;
if (iwl_alloc_fw_desc(nic(priv), &nic(priv)->fw.ucode_rt.data, if (iwl_alloc_fw_desc(nic, &nic->fw.ucode_rt.data,
pieces.data, pieces.data_size)) pieces.data, pieces.data_size))
goto err_pci_alloc; goto err_pci_alloc;
/* Initialization instructions and data */ /* Initialization instructions and data */
if (pieces.init_size && pieces.init_data_size) { if (pieces.init_size && pieces.init_data_size) {
if (iwl_alloc_fw_desc(nic(priv), if (iwl_alloc_fw_desc(nic,
&nic(priv)->fw.ucode_init.code, &nic->fw.ucode_init.code,
pieces.init, pieces.init_size)) pieces.init, pieces.init_size))
goto err_pci_alloc; goto err_pci_alloc;
if (iwl_alloc_fw_desc(nic(priv), if (iwl_alloc_fw_desc(nic,
&nic(priv)->fw.ucode_init.data, &nic->fw.ucode_init.data,
pieces.init_data, pieces.init_data_size)) pieces.init_data, pieces.init_data_size))
goto err_pci_alloc; goto err_pci_alloc;
} }
/* WoWLAN instructions and data */ /* WoWLAN instructions and data */
if (pieces.wowlan_inst_size && pieces.wowlan_data_size) { if (pieces.wowlan_inst_size && pieces.wowlan_data_size) {
if (iwl_alloc_fw_desc(nic(priv), if (iwl_alloc_fw_desc(nic,
&nic(priv)->fw.ucode_wowlan.code, &nic->fw.ucode_wowlan.code,
pieces.wowlan_inst, pieces.wowlan_inst,
pieces.wowlan_inst_size)) pieces.wowlan_inst_size))
goto err_pci_alloc; goto err_pci_alloc;
if (iwl_alloc_fw_desc(nic(priv), if (iwl_alloc_fw_desc(nic,
&nic(priv)->fw.ucode_wowlan.data, &nic->fw.ucode_wowlan.data,
pieces.wowlan_data, pieces.wowlan_data,
pieces.wowlan_data_size)) pieces.wowlan_data_size))
goto err_pci_alloc; goto err_pci_alloc;
...@@ -1210,14 +1209,14 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1210,14 +1209,14 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
nic->init_evtlog_size = (pieces.init_evtlog_size - 16)/12; nic->init_evtlog_size = (pieces.init_evtlog_size - 16)/12;
else else
nic->init_evtlog_size = nic->init_evtlog_size =
cfg(priv)->base_params->max_event_log_size; cfg->base_params->max_event_log_size;
nic->init_errlog_ptr = pieces.init_errlog_ptr; nic->init_errlog_ptr = pieces.init_errlog_ptr;
nic->inst_evtlog_ptr = pieces.inst_evtlog_ptr; nic->inst_evtlog_ptr = pieces.inst_evtlog_ptr;
if (pieces.inst_evtlog_size) if (pieces.inst_evtlog_size)
nic->inst_evtlog_size = (pieces.inst_evtlog_size - 16)/12; nic->inst_evtlog_size = (pieces.inst_evtlog_size - 16)/12;
else else
nic->inst_evtlog_size = nic->inst_evtlog_size =
cfg(priv)->base_params->max_event_log_size; cfg->base_params->max_event_log_size;
nic->inst_errlog_ptr = pieces.inst_errlog_ptr; nic->inst_errlog_ptr = pieces.inst_errlog_ptr;
#ifndef CONFIG_IWLWIFI_P2P #ifndef CONFIG_IWLWIFI_P2P
ucode_capa.flags &= ~IWL_UCODE_TLV_FLAGS_PAN; ucode_capa.flags &= ~IWL_UCODE_TLV_FLAGS_PAN;
...@@ -1226,7 +1225,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1226,7 +1225,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
priv->new_scan_threshold_behaviour = priv->new_scan_threshold_behaviour =
!!(ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NEWSCAN); !!(ucode_capa.flags & IWL_UCODE_TLV_FLAGS_NEWSCAN);
if (!(cfg(priv)->sku & EEPROM_SKU_CAP_IPAN_ENABLE)) if (!(cfg->sku & EEPROM_SKU_CAP_IPAN_ENABLE))
ucode_capa.flags &= ~IWL_UCODE_TLV_FLAGS_PAN; ucode_capa.flags &= ~IWL_UCODE_TLV_FLAGS_PAN;
/* /*
...@@ -1238,10 +1237,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1238,10 +1237,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
if (ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PAN) { if (ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PAN) {
priv->sta_key_max_num = STA_KEY_MAX_NUM_PAN; priv->sta_key_max_num = STA_KEY_MAX_NUM_PAN;
priv->shrd->cmd_queue = IWL_IPAN_CMD_QUEUE_NUM; nic->shrd->cmd_queue = IWL_IPAN_CMD_QUEUE_NUM;
} else { } else {
priv->sta_key_max_num = STA_KEY_MAX_NUM; priv->sta_key_max_num = STA_KEY_MAX_NUM;
priv->shrd->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM; nic->shrd->cmd_queue = IWL_DEFAULT_CMD_QUEUE_NUM;
} }
/* /*
* figure out the offset of chain noise reset and gain commands * figure out the offset of chain noise reset and gain commands
...@@ -1271,7 +1270,9 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1271,7 +1270,9 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
err = iwl_dbgfs_register(priv, DRV_NAME); err = iwl_dbgfs_register(priv, DRV_NAME);
if (err) if (err)
IWL_ERR(priv, "failed to create debugfs files. Ignoring error: %d\n", err); IWL_ERR(nic,
"failed to create debugfs files. Ignoring error: %d\n",
err);
/* We have our copies now, allow OS release its copies */ /* We have our copies now, allow OS release its copies */
release_firmware(ucode_raw); release_firmware(ucode_raw);
...@@ -1280,17 +1281,17 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) ...@@ -1280,17 +1281,17 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
try_again: try_again:
/* try next, if any */ /* try next, if any */
if (iwl_request_firmware(priv, false)) if (iwl_request_firmware(nic, false))
goto out_unbind; goto out_unbind;
release_firmware(ucode_raw); release_firmware(ucode_raw);
return; return;
err_pci_alloc: err_pci_alloc:
IWL_ERR(priv, "failed to allocate pci memory\n"); IWL_ERR(nic, "failed to allocate pci memory\n");
iwl_dealloc_ucode(nic(priv)); iwl_dealloc_ucode(nic);
out_unbind: out_unbind:
complete(&nic->request_firmware_complete); complete(&nic->request_firmware_complete);
device_release_driver(trans(priv)->dev); device_release_driver(trans(nic)->dev);
release_firmware(ucode_raw); release_firmware(ucode_raw);
} }
...@@ -218,8 +218,4 @@ struct iwl_fw { ...@@ -218,8 +218,4 @@ struct iwl_fw {
bool enhance_sensitivity_table; bool enhance_sensitivity_table;
}; };
struct iwl_priv;
int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first);
#endif /* __iwl_ucode_h__ */ #endif /* __iwl_ucode_h__ */
...@@ -95,6 +95,7 @@ struct iwl_nic { ...@@ -95,6 +95,7 @@ struct iwl_nic {
}; };
int __must_check iwl_request_firmware(struct iwl_nic *nic, bool first);
void iwl_dealloc_ucode(struct iwl_nic *nic); void iwl_dealloc_ucode(struct iwl_nic *nic);
int iwl_send_bt_env(struct iwl_trans *trans, u8 action, u8 type); int iwl_send_bt_env(struct iwl_trans *trans, u8 action, u8 type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment