971cbe50e6
Instead of taking the group/command separately, make the function
take a combined command ID. In many cases, this allows us to pass
an existing command ID (e.g. cmd.id), or introduce a new variable
for it, so that we don't use the command ID twice.
This way, we can also use LONG_GROUP implicitly, so we don't need
to spell that out for many commands.
Apart from mvm.h, fw/img.{c,h} changes and some copyright and
indentation updates, this was done with spatch:
@@
identifier cmd;
expression fw, G, C, def;
@@
struct iwl_host_cmd cmd = {
.id = WIDE_ID(G, C),
...
};
...
-iwl_fw_lookup_cmd_ver(fw, G, C, def)
+iwl_fw_lookup_cmd_ver(fw, cmd.id, def)
@@
identifier cmd;
expression fw, C, def;
@@
struct iwl_host_cmd cmd = {
.id = C,
...
};
...
-iwl_fw_lookup_cmd_ver(fw, \(IWL_ALWAYS_LONG_GROUP\|LONG_GROUP\), C, def)
+iwl_fw_lookup_cmd_ver(fw, cmd.id, def)
@@
identifier func;
expression fw, G, C, mvm, flags, cmd, size, def;
type rettype;
@@
rettype func(...)
{
+u32 cmd_id = WIDE_ID(G, C);
...
-iwl_fw_lookup_cmd_ver(fw, G, C, def)
+iwl_fw_lookup_cmd_ver(fw, cmd_id, def)
...
-iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(G, C), flags, cmd, size)
+iwl_mvm_send_cmd_pdu(mvm, cmd_id, flags, cmd, size)
...
}
@@
identifier func;
expression fw, G, C, mvm, flags, cmd, size, def;
type rettype;
@@
rettype func(...)
{
+u32 cmd_id = C;
...
-iwl_fw_lookup_cmd_ver(fw, \(IWL_ALWAYS_LONG_GROUP\|LONG_GROUP\), C, def)
+iwl_fw_lookup_cmd_ver(fw, cmd_id, def)
...
-iwl_mvm_send_cmd_pdu(mvm, C, flags, cmd, size)
+iwl_mvm_send_cmd_pdu(mvm, cmd_id, flags, cmd, size)
...
}
@@
expression fw, C, def;
@@
-iwl_fw_lookup_cmd_ver(fw, \(IWL_ALWAYS_LONG_GROUP\|LONG_GROUP\), C, def)
+iwl_fw_lookup_cmd_ver(fw, C, def)
@@
expression fw, C, G, def;
@@
-iwl_fw_lookup_cmd_ver(fw, G, C, def)
+iwl_fw_lookup_cmd_ver(fw, WIDE_ID(G, C), def)
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220128153014.c4ac213cef5c.I6fd9a4fcbcf16ef3a3ae20a2b08ee54ebe06f96f@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
93 lines
2.5 KiB
C
93 lines
2.5 KiB
C
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
|
/*
|
|
* Copyright(c) 2019 - 2021 Intel Corporation
|
|
*/
|
|
#include <fw/api/commands.h>
|
|
#include "img.h"
|
|
|
|
u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u32 cmd_id, u8 def)
|
|
{
|
|
const struct iwl_fw_cmd_version *entry;
|
|
unsigned int i;
|
|
/* prior to LONG_GROUP, we never used this CMD version API */
|
|
u8 grp = iwl_cmd_groupid(cmd_id) ?: LONG_GROUP;
|
|
u8 cmd = iwl_cmd_opcode(cmd_id);
|
|
|
|
if (!fw->ucode_capa.cmd_versions ||
|
|
!fw->ucode_capa.n_cmd_versions)
|
|
return def;
|
|
|
|
entry = fw->ucode_capa.cmd_versions;
|
|
for (i = 0; i < fw->ucode_capa.n_cmd_versions; i++, entry++) {
|
|
if (entry->group == grp && entry->cmd == cmd) {
|
|
if (entry->cmd_ver == IWL_FW_CMD_VER_UNKNOWN)
|
|
return def;
|
|
return entry->cmd_ver;
|
|
}
|
|
}
|
|
|
|
return def;
|
|
}
|
|
EXPORT_SYMBOL_GPL(iwl_fw_lookup_cmd_ver);
|
|
|
|
u8 iwl_fw_lookup_notif_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def)
|
|
{
|
|
const struct iwl_fw_cmd_version *entry;
|
|
unsigned int i;
|
|
|
|
if (!fw->ucode_capa.cmd_versions ||
|
|
!fw->ucode_capa.n_cmd_versions)
|
|
return def;
|
|
|
|
entry = fw->ucode_capa.cmd_versions;
|
|
for (i = 0; i < fw->ucode_capa.n_cmd_versions; i++, entry++) {
|
|
if (entry->group == grp && entry->cmd == cmd) {
|
|
if (entry->notif_ver == IWL_FW_CMD_VER_UNKNOWN)
|
|
return def;
|
|
return entry->notif_ver;
|
|
}
|
|
}
|
|
|
|
return def;
|
|
}
|
|
EXPORT_SYMBOL_GPL(iwl_fw_lookup_notif_ver);
|
|
|
|
static const struct {
|
|
const char *name;
|
|
u32 num;
|
|
} advanced_lookup[] = {
|
|
{ "NMI_INTERRUPT_WDG", 0x34 },
|
|
{ "SYSASSERT", 0x35 },
|
|
{ "UCODE_VERSION_MISMATCH", 0x37 },
|
|
{ "BAD_COMMAND", 0x38 },
|
|
{ "BAD_COMMAND", 0x39 },
|
|
{ "NMI_INTERRUPT_DATA_ACTION_PT", 0x3C },
|
|
{ "FATAL_ERROR", 0x3D },
|
|
{ "NMI_TRM_HW_ERR", 0x46 },
|
|
{ "NMI_INTERRUPT_TRM", 0x4C },
|
|
{ "NMI_INTERRUPT_BREAK_POINT", 0x54 },
|
|
{ "NMI_INTERRUPT_WDG_RXF_FULL", 0x5C },
|
|
{ "NMI_INTERRUPT_WDG_NO_RBD_RXF_FULL", 0x64 },
|
|
{ "NMI_INTERRUPT_HOST", 0x66 },
|
|
{ "NMI_INTERRUPT_LMAC_FATAL", 0x70 },
|
|
{ "NMI_INTERRUPT_UMAC_FATAL", 0x71 },
|
|
{ "NMI_INTERRUPT_OTHER_LMAC_FATAL", 0x73 },
|
|
{ "NMI_INTERRUPT_ACTION_PT", 0x7C },
|
|
{ "NMI_INTERRUPT_UNKNOWN", 0x84 },
|
|
{ "NMI_INTERRUPT_INST_ACTION_PT", 0x86 },
|
|
{ "PNVM_MISSING", FW_SYSASSERT_PNVM_MISSING },
|
|
{ "ADVANCED_SYSASSERT", 0 },
|
|
};
|
|
|
|
const char *iwl_fw_lookup_assert_desc(u32 num)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(advanced_lookup) - 1; i++)
|
|
if (advanced_lookup[i].num == (num & ~FW_SYSASSERT_CPU_MASK))
|
|
return advanced_lookup[i].name;
|
|
|
|
/* No entry matches 'num', so it is the last: ADVANCED_SYSASSERT */
|
|
return advanced_lookup[i].name;
|
|
}
|
|
EXPORT_SYMBOL_GPL(iwl_fw_lookup_assert_desc);
|