iwlwifi: dbg_ini: add TLV allocation new API support
Add new debug TLVs API preprocessing. Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Shahar S Matityahu
Luca Coelho
parent
677d25b237
commit
a9248de424
6 changed files with 256 additions and 37 deletions
|
|
@ -62,19 +62,6 @@
|
|||
|
||||
#define IWL_FW_INI_MAX_CFG_NAME 64
|
||||
|
||||
/**
|
||||
* struct iwl_fw_ini_header: Common Header for all debug group TLV's structures
|
||||
*
|
||||
* @tlv_version: version info
|
||||
* @apply_point: &enum iwl_fw_ini_apply_point
|
||||
* @data: TLV data followed
|
||||
*/
|
||||
struct iwl_fw_ini_header {
|
||||
__le32 tlv_version;
|
||||
__le32 apply_point;
|
||||
u8 data[];
|
||||
} __packed; /* FW_DEBUG_TLV_HEADER_S */
|
||||
|
||||
/**
|
||||
* enum iwl_fw_ini_dbg_domain - debug domains
|
||||
* allows to send host cmd or collect memory region if a given domain is enabled
|
||||
|
|
@ -103,22 +90,17 @@ struct iwl_fw_ini_hcmd {
|
|||
} __packed; /* FW_DEBUG_TLV_HCMD_DATA_API_S_VER_1 */
|
||||
|
||||
/**
|
||||
* struct iwl_fw_ini_hcmd_tlv - (IWL_UCODE_TLV_TYPE_HCMD)
|
||||
* Generic Host command pass through TLV
|
||||
* struct iwl_fw_ini_header - Common Header for all ini debug TLV's structures
|
||||
*
|
||||
* @header: header
|
||||
* @domain: send command only if the specific domain is enabled
|
||||
* &enum iwl_fw_ini_dbg_domain
|
||||
* @period_msec: period in which the hcmd will be sent to FW. Measured in msec
|
||||
* (0 = one time command).
|
||||
* @hcmd: a variable length host-command to be sent to apply the configuration.
|
||||
* @version: TLV version
|
||||
* @domain: domain of the TLV. One of &enum iwl_fw_ini_dbg_domain
|
||||
* @data: TLV data
|
||||
*/
|
||||
struct iwl_fw_ini_hcmd_tlv {
|
||||
struct iwl_fw_ini_header header;
|
||||
struct iwl_fw_ini_header {
|
||||
__le32 version;
|
||||
__le32 domain;
|
||||
__le32 period_msec;
|
||||
struct iwl_fw_ini_hcmd hcmd;
|
||||
} __packed; /* FW_DEBUG_TLV_HCMD_API_S_VER_1 */
|
||||
u8 data[];
|
||||
} __packed; /* FW_TLV_DEBUG_HEADER_S_VER_1 */
|
||||
|
||||
#define IWL_FW_INI_MAX_REGION_ID 64
|
||||
#define IWL_FW_INI_MAX_NAME 32
|
||||
|
|
@ -397,6 +379,22 @@ struct iwl_fw_ini_trigger_tlv {
|
|||
__le32 data[];
|
||||
} __packed; /* FW_TLV_DEBUG_TRIGGER_API_S_VER_1 */
|
||||
|
||||
/**
|
||||
* struct iwl_fw_ini_hcmd_tlv - Generic Host command pass through TLV
|
||||
*
|
||||
* @hdr: debug header
|
||||
* @time_point: time point. One of &enum iwl_fw_ini_time_point
|
||||
* @period_msec: interval at which the hcmd will be sent to the FW.
|
||||
* Measured in msec (0 = one time command)
|
||||
* @hcmd: a variable length host-command to be sent to apply the configuration
|
||||
*/
|
||||
struct iwl_fw_ini_hcmd_tlv {
|
||||
struct iwl_fw_ini_header hdr;
|
||||
__le32 time_point;
|
||||
__le32 period_msec;
|
||||
struct iwl_fw_ini_hcmd hcmd;
|
||||
} __packed; /* FW_TLV_DEBUG_HCMD_API_S_VER_1 */
|
||||
|
||||
/**
|
||||
* enum iwl_fw_ini_trigger_id
|
||||
*
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ struct iwl_ucode_header {
|
|||
} u;
|
||||
};
|
||||
|
||||
#define IWL_UCODE_INI_TLV_GROUP 0x1000000
|
||||
#define IWL_UCODE_TLV_DEBUG_BASE 0x1000005
|
||||
|
||||
/*
|
||||
* new TLV uCode file layout
|
||||
|
|
@ -151,7 +151,6 @@ enum iwl_ucode_tlv_type {
|
|||
IWL_UCODE_TLV_FW_RECOVERY_INFO = 57,
|
||||
IWL_UCODE_TLV_FW_FSEQ_VERSION = 60,
|
||||
|
||||
IWL_UCODE_TLV_DEBUG_BASE = IWL_UCODE_INI_TLV_GROUP,
|
||||
IWL_UCODE_TLV_TYPE_DEBUG_INFO = IWL_UCODE_TLV_DEBUG_BASE + 0,
|
||||
IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION = IWL_UCODE_TLV_DEBUG_BASE + 1,
|
||||
IWL_UCODE_TLV_TYPE_HCMD = IWL_UCODE_TLV_DEBUG_BASE + 2,
|
||||
|
|
|
|||
|
|
@ -104,12 +104,27 @@ dbg_ver_table[IWL_DBG_TLV_TYPE_NUM] = {
|
|||
[IWL_DBG_TLV_TYPE_TRIGGER] = {.min_ver = 1, .max_ver = 1,},
|
||||
};
|
||||
|
||||
static int iwl_dbg_tlv_add(struct iwl_ucode_tlv *tlv, struct list_head *list)
|
||||
{
|
||||
u32 len = le32_to_cpu(tlv->length);
|
||||
struct iwl_dbg_tlv_node *node;
|
||||
|
||||
node = kzalloc(sizeof(*node) + len, GFP_KERNEL);
|
||||
if (!node)
|
||||
return -ENOMEM;
|
||||
|
||||
memcpy(&node->tlv, tlv, sizeof(node->tlv) + len);
|
||||
list_add_tail(&node->list, list);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool iwl_dbg_tlv_ver_support(struct iwl_ucode_tlv *tlv)
|
||||
{
|
||||
struct iwl_fw_ini_header *hdr = (void *)&tlv->data[0];
|
||||
u32 type = le32_to_cpu(tlv->type);
|
||||
u32 tlv_idx = type - IWL_UCODE_TLV_DEBUG_BASE;
|
||||
u32 ver = le32_to_cpu(hdr->tlv_version);
|
||||
u32 ver = le32_to_cpu(hdr->version);
|
||||
|
||||
if (ver < dbg_ver_table[tlv_idx].min_ver ||
|
||||
ver > dbg_ver_table[tlv_idx].max_ver)
|
||||
|
|
@ -118,27 +133,169 @@ static bool iwl_dbg_tlv_ver_support(struct iwl_ucode_tlv *tlv)
|
|||
return true;
|
||||
}
|
||||
|
||||
static int iwl_dbg_tlv_alloc_debug_info(struct iwl_trans *trans,
|
||||
struct iwl_ucode_tlv *tlv)
|
||||
{
|
||||
struct iwl_fw_ini_debug_info_tlv *debug_info = (void *)tlv->data;
|
||||
|
||||
if (le32_to_cpu(tlv->length) != sizeof(*debug_info))
|
||||
return -EINVAL;
|
||||
|
||||
IWL_DEBUG_FW(trans, "WRT: Loading debug cfg: %s\n",
|
||||
debug_info->debug_cfg_name);
|
||||
|
||||
return iwl_dbg_tlv_add(tlv, &trans->dbg.debug_info_tlv_list);
|
||||
}
|
||||
|
||||
static int iwl_dbg_tlv_alloc_buf_alloc(struct iwl_trans *trans,
|
||||
struct iwl_ucode_tlv *tlv)
|
||||
{
|
||||
struct iwl_fw_ini_allocation_tlv *alloc = (void *)tlv->data;
|
||||
u32 buf_location = le32_to_cpu(alloc->buf_location);
|
||||
u32 alloc_id = le32_to_cpu(alloc->alloc_id);
|
||||
|
||||
if (le32_to_cpu(tlv->length) != sizeof(*alloc) ||
|
||||
(buf_location != IWL_FW_INI_LOCATION_SRAM_PATH &&
|
||||
buf_location != IWL_FW_INI_LOCATION_DRAM_PATH))
|
||||
return -EINVAL;
|
||||
|
||||
if ((buf_location == IWL_FW_INI_LOCATION_SRAM_PATH &&
|
||||
alloc_id != IWL_FW_INI_ALLOCATION_ID_DBGC1) ||
|
||||
(buf_location == IWL_FW_INI_LOCATION_DRAM_PATH &&
|
||||
(alloc_id == IWL_FW_INI_ALLOCATION_INVALID ||
|
||||
alloc_id >= IWL_FW_INI_ALLOCATION_NUM))) {
|
||||
IWL_ERR(trans,
|
||||
"WRT: Invalid allocation id %u for allocation TLV\n",
|
||||
alloc_id);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
trans->dbg.fw_mon_cfg[alloc_id] = *alloc;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int iwl_dbg_tlv_alloc_hcmd(struct iwl_trans *trans,
|
||||
struct iwl_ucode_tlv *tlv)
|
||||
{
|
||||
struct iwl_fw_ini_hcmd_tlv *hcmd = (void *)tlv->data;
|
||||
u32 tp = le32_to_cpu(hcmd->time_point);
|
||||
|
||||
if (le32_to_cpu(tlv->length) <= sizeof(*hcmd))
|
||||
return -EINVAL;
|
||||
|
||||
/* Host commands can not be sent in early time point since the FW
|
||||
* is not ready
|
||||
*/
|
||||
if (tp == IWL_FW_INI_TIME_POINT_INVALID ||
|
||||
tp >= IWL_FW_INI_TIME_POINT_NUM ||
|
||||
tp == IWL_FW_INI_TIME_POINT_EARLY) {
|
||||
IWL_ERR(trans,
|
||||
"WRT: Invalid time point %u for host command TLV\n",
|
||||
tp);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return iwl_dbg_tlv_add(tlv, &trans->dbg.time_point[tp].hcmd_list);
|
||||
}
|
||||
|
||||
static int iwl_dbg_tlv_alloc_region(struct iwl_trans *trans,
|
||||
struct iwl_ucode_tlv *tlv)
|
||||
{
|
||||
struct iwl_fw_ini_region_tlv *reg = (void *)tlv->data;
|
||||
struct iwl_ucode_tlv **active_reg;
|
||||
u32 id = le32_to_cpu(reg->id);
|
||||
u32 type = le32_to_cpu(reg->type);
|
||||
u32 tlv_len = sizeof(*tlv) + le32_to_cpu(tlv->length);
|
||||
|
||||
if (le32_to_cpu(tlv->length) < sizeof(*reg))
|
||||
return -EINVAL;
|
||||
|
||||
if (id >= IWL_FW_INI_MAX_REGION_ID) {
|
||||
IWL_ERR(trans, "WRT: Invalid region id %u\n", id);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (type <= IWL_FW_INI_REGION_INVALID ||
|
||||
type >= IWL_FW_INI_REGION_NUM) {
|
||||
IWL_ERR(trans, "WRT: Invalid region type %u\n", type);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
active_reg = &trans->dbg.active_regions[id];
|
||||
if (*active_reg) {
|
||||
IWL_WARN(trans, "WRT: Overriding region id %u\n", id);
|
||||
|
||||
kfree(*active_reg);
|
||||
}
|
||||
|
||||
*active_reg = kmemdup(tlv, tlv_len, GFP_KERNEL);
|
||||
if (!*active_reg)
|
||||
return -ENOMEM;
|
||||
|
||||
IWL_DEBUG_FW(trans, "WRT: Enabling region id %u type %u\n", id, type);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int iwl_dbg_tlv_alloc_trigger(struct iwl_trans *trans,
|
||||
struct iwl_ucode_tlv *tlv)
|
||||
{
|
||||
struct iwl_fw_ini_trigger_tlv *trig = (void *)tlv->data;
|
||||
u32 tp = le32_to_cpu(trig->time_point);
|
||||
|
||||
if (le32_to_cpu(tlv->length) < sizeof(*trig))
|
||||
return -EINVAL;
|
||||
|
||||
if (tp <= IWL_FW_INI_TIME_POINT_INVALID ||
|
||||
tp >= IWL_FW_INI_TIME_POINT_NUM) {
|
||||
IWL_ERR(trans,
|
||||
"WRT: Invalid time point %u for trigger TLV\n",
|
||||
tp);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!le32_to_cpu(trig->occurrences))
|
||||
trig->occurrences = cpu_to_le32(-1);
|
||||
|
||||
return iwl_dbg_tlv_add(tlv, &trans->dbg.time_point[tp].trig_list);
|
||||
}
|
||||
|
||||
static int (*dbg_tlv_alloc[])(struct iwl_trans *trans,
|
||||
struct iwl_ucode_tlv *tlv) = {
|
||||
[IWL_DBG_TLV_TYPE_DEBUG_INFO] = iwl_dbg_tlv_alloc_debug_info,
|
||||
[IWL_DBG_TLV_TYPE_BUF_ALLOC] = iwl_dbg_tlv_alloc_buf_alloc,
|
||||
[IWL_DBG_TLV_TYPE_HCMD] = iwl_dbg_tlv_alloc_hcmd,
|
||||
[IWL_DBG_TLV_TYPE_REGION] = iwl_dbg_tlv_alloc_region,
|
||||
[IWL_DBG_TLV_TYPE_TRIGGER] = iwl_dbg_tlv_alloc_trigger,
|
||||
};
|
||||
|
||||
void iwl_dbg_tlv_alloc(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,
|
||||
bool ext)
|
||||
{
|
||||
struct iwl_fw_ini_header *hdr = (void *)&tlv->data[0];
|
||||
u32 type = le32_to_cpu(tlv->type);
|
||||
u32 pnt = le32_to_cpu(hdr->apply_point);
|
||||
u32 tlv_idx = type - IWL_UCODE_TLV_DEBUG_BASE;
|
||||
enum iwl_ini_cfg_state *cfg_state = ext ?
|
||||
&trans->dbg.external_ini_cfg : &trans->dbg.internal_ini_cfg;
|
||||
int ret;
|
||||
|
||||
IWL_DEBUG_FW(trans, "WRT: read TLV 0x%x, apply point %d\n",
|
||||
type, pnt);
|
||||
|
||||
if (tlv_idx >= IWL_DBG_TLV_TYPE_NUM) {
|
||||
IWL_ERR(trans, "WRT: Unsupported TLV 0x%x\n", type);
|
||||
if (tlv_idx >= ARRAY_SIZE(dbg_tlv_alloc) || !dbg_tlv_alloc[tlv_idx]) {
|
||||
IWL_ERR(trans, "WRT: Unsupported TLV type 0x%x\n", type);
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
if (!iwl_dbg_tlv_ver_support(tlv)) {
|
||||
IWL_ERR(trans, "WRT: Unsupported TLV 0x%x version %u\n", type,
|
||||
le32_to_cpu(hdr->tlv_version));
|
||||
le32_to_cpu(hdr->version));
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
ret = dbg_tlv_alloc[tlv_idx](trans, tlv);
|
||||
if (ret) {
|
||||
IWL_ERR(trans,
|
||||
"WRT: Failed to allocate TLV 0x%x, ret %d, (ext=%d)\n",
|
||||
type, ret, ext);
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
|
|
@ -159,7 +316,41 @@ IWL_EXPORT_SYMBOL(iwl_dbg_tlv_del_timers);
|
|||
|
||||
void iwl_dbg_tlv_free(struct iwl_trans *trans)
|
||||
{
|
||||
/* will be used again later */
|
||||
struct iwl_dbg_tlv_node *tlv_node, *tlv_node_tmp;
|
||||
int i;
|
||||
|
||||
iwl_dbg_tlv_del_timers(trans);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(trans->dbg.active_regions); i++) {
|
||||
struct iwl_ucode_tlv **active_reg =
|
||||
&trans->dbg.active_regions[i];
|
||||
|
||||
kfree(*active_reg);
|
||||
*active_reg = NULL;
|
||||
}
|
||||
|
||||
list_for_each_entry_safe(tlv_node, tlv_node_tmp,
|
||||
&trans->dbg.debug_info_tlv_list, list) {
|
||||
list_del(&tlv_node->list);
|
||||
kfree(tlv_node);
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(trans->dbg.time_point); i++) {
|
||||
struct iwl_dbg_tlv_time_point_data *tp =
|
||||
&trans->dbg.time_point[i];
|
||||
|
||||
list_for_each_entry_safe(tlv_node, tlv_node_tmp, &tp->trig_list,
|
||||
list) {
|
||||
list_del(&tlv_node->list);
|
||||
kfree(tlv_node);
|
||||
}
|
||||
|
||||
list_for_each_entry_safe(tlv_node, tlv_node_tmp, &tp->hcmd_list,
|
||||
list) {
|
||||
list_del(&tlv_node->list);
|
||||
kfree(tlv_node);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int iwl_dbg_tlv_parse_bin(struct iwl_trans *trans, const u8 *data,
|
||||
|
|
@ -205,6 +396,21 @@ void iwl_dbg_tlv_load_bin(struct device *dev, struct iwl_trans *trans)
|
|||
release_firmware(fw);
|
||||
}
|
||||
|
||||
void iwl_dbg_tlv_init(struct iwl_trans *trans)
|
||||
{
|
||||
int i;
|
||||
|
||||
INIT_LIST_HEAD(&trans->dbg.debug_info_tlv_list);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(trans->dbg.time_point); i++) {
|
||||
struct iwl_dbg_tlv_time_point_data *tp =
|
||||
&trans->dbg.time_point[i];
|
||||
|
||||
INIT_LIST_HEAD(&tp->trig_list);
|
||||
INIT_LIST_HEAD(&tp->hcmd_list);
|
||||
}
|
||||
}
|
||||
|
||||
void iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,
|
||||
enum iwl_fw_ini_time_point tp_id,
|
||||
union iwl_dbg_tlv_tp_data *tp_data)
|
||||
|
|
|
|||
|
|
@ -82,6 +82,16 @@ union iwl_dbg_tlv_tp_data {
|
|||
struct iwl_rx_packet *fw_pkt;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct iwl_dbg_tlv_time_point_data
|
||||
* @trig_list: list of triggers
|
||||
* @hcmd_list: list of host commands
|
||||
*/
|
||||
struct iwl_dbg_tlv_time_point_data {
|
||||
struct list_head trig_list;
|
||||
struct list_head hcmd_list;
|
||||
};
|
||||
|
||||
struct iwl_trans;
|
||||
struct iwl_fw_runtime;
|
||||
|
||||
|
|
@ -89,6 +99,7 @@ void iwl_dbg_tlv_load_bin(struct device *dev, struct iwl_trans *trans);
|
|||
void iwl_dbg_tlv_free(struct iwl_trans *trans);
|
||||
void iwl_dbg_tlv_alloc(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,
|
||||
bool ext);
|
||||
void iwl_dbg_tlv_init(struct iwl_trans *trans);
|
||||
void iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt,
|
||||
enum iwl_fw_ini_time_point tp_id,
|
||||
union iwl_dbg_tlv_tp_data *tp_data);
|
||||
|
|
|
|||
|
|
@ -723,6 +723,7 @@ struct iwl_self_init_dram {
|
|||
* @ini_dest: debug monitor destination uses &enum iwl_fw_ini_buffer_location
|
||||
* @active_regions: active regions
|
||||
* @debug_info_tlv_list: list of debug info TLVs
|
||||
* @time_point: array of debug time points
|
||||
*/
|
||||
struct iwl_trans_debug {
|
||||
u8 n_dest_reg;
|
||||
|
|
@ -749,6 +750,8 @@ struct iwl_trans_debug {
|
|||
|
||||
struct iwl_ucode_tlv *active_regions[IWL_FW_INI_MAX_REGION_ID];
|
||||
struct list_head debug_info_tlv_list;
|
||||
struct iwl_dbg_tlv_time_point_data
|
||||
time_point[IWL_FW_INI_TIME_POINT_NUM];
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -3614,6 +3614,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
|
|||
mutex_init(&trans_pcie->fw_mon_data.mutex);
|
||||
#endif
|
||||
|
||||
iwl_dbg_tlv_init(trans);
|
||||
|
||||
return trans;
|
||||
|
||||
out_free_ict:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue