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

Commit 7e1223b5 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: new Alive / error table API 



The new API slightly changes the layout of the version of
the firmware - prepare for that.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 33cef925

drivers/net/wireless/iwlwifi/dvm/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1549,7 +1549,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv) 
				      table.blink1, table.blink2, table.ilink1,

				      table.ilink2, table.bcon_time, table.gp1,

				      table.gp2, table.gp3, table.ucode_ver,

				      table.hw_ver, table.brd_ver);

				      table.hw_ver, 0, table.brd_ver);

	IWL_ERR(priv, "0x%08X | %-28s\n", table.error_id,

		desc_lookup(table.error_id));

	IWL_ERR(priv, "0x%08X | uPc\n", table.pc);

drivers/net/wireless/iwlwifi/iwl-devtrace.h

+10 −8
Original line number Diff line number Diff line
@@ -431,11 +431,11 @@ TRACE_EVENT(iwlwifi_dev_ucode_error, 
	TP_PROTO(const struct device *dev, u32 desc, u32 tsf_low,

		 u32 data1, u32 data2, u32 line, u32 blink1,

		 u32 blink2, u32 ilink1, u32 ilink2, u32 bcon_time,

		 u32 gp1, u32 gp2, u32 gp3, u32 ucode_ver, u32 hw_ver,

		 u32 gp1, u32 gp2, u32 gp3, u32 major, u32 minor, u32 hw_ver,

		 u32 brd_ver),

	TP_ARGS(dev, desc, tsf_low, data1, data2, line,

		blink1, blink2, ilink1, ilink2, bcon_time, gp1, gp2,

		gp3, ucode_ver, hw_ver, brd_ver),

		gp3, major, minor, hw_ver, brd_ver),

	TP_STRUCT__entry(

		DEV_ENTRY

		__field(u32, desc)
@@ -451,7 +451,8 @@ TRACE_EVENT(iwlwifi_dev_ucode_error, 
		__field(u32, gp1)

		__field(u32, gp2)

		__field(u32, gp3)

		__field(u32, ucode_ver)

		__field(u32, major)

		__field(u32, minor)

		__field(u32, hw_ver)

		__field(u32, brd_ver)

	),
@@ -470,21 +471,22 @@ TRACE_EVENT(iwlwifi_dev_ucode_error, 
		__entry->gp1 = gp1;

		__entry->gp2 = gp2;

		__entry->gp3 = gp3;

		__entry->ucode_ver = ucode_ver;

		__entry->major = major;

		__entry->minor = minor;

		__entry->hw_ver = hw_ver;

		__entry->brd_ver = brd_ver;

	),

	TP_printk("[%s] #%02d %010u data 0x%08X 0x%08X line %u, "

		  "blink 0x%05X 0x%05X ilink 0x%05X 0x%05X "

		  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X uCode 0x%08X "

		  "hw 0x%08X brd 0x%08X",

		  "bcon_tm %010u gp 0x%08X 0x%08X 0x%08X major 0x%08X "

		  "minor 0x%08X hw 0x%08X brd 0x%08X",

		  __get_str(dev), __entry->desc, __entry->tsf_low,

		  __entry->data1,

		  __entry->data2, __entry->line, __entry->blink1,

		  __entry->blink2, __entry->ilink1, __entry->ilink2,

		  __entry->bcon_time, __entry->gp1, __entry->gp2,

		  __entry->gp3, __entry->ucode_ver, __entry->hw_ver,

		  __entry->brd_ver)

		  __entry->gp3, __entry->major, __entry->minor,

		  __entry->hw_ver, __entry->brd_ver)

);



TRACE_EVENT(iwlwifi_dev_ucode_event,

drivers/net/wireless/iwlwifi/iwl-drv.c

+21 −1
Original line number Diff line number Diff line
@@ -842,6 +842,23 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
			capa->n_scan_channels =

				le32_to_cpup((__le32 *)tlv_data);

			break;

		case IWL_UCODE_TLV_FW_VERSION: {

			__le32 *ptr = (void *)tlv_data;

			u32 major, minor;

			u8 local_comp;



			if (tlv_len != sizeof(u32) * 3)

				goto invalid_tlv_len;



			major = le32_to_cpup(ptr++);

			minor = le32_to_cpup(ptr++);

			local_comp = le32_to_cpup(ptr);



			snprintf(drv->fw.fw_version,

				 sizeof(drv->fw.fw_version), "%u.%u.%u",

				 major, minor, local_comp);

			break;

			}

		case IWL_UCODE_TLV_FW_DBG_DEST: {

			struct iwl_fw_dbg_dest_tlv *dest = (void *)tlv_data;
@@ -1107,6 +1124,9 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	if (err)

		goto try_again;



	if (drv->fw.ucode_capa.api[0] & IWL_UCODE_TLV_API_NEW_VERSION)

		api_ver = drv->fw.ucode_ver;

	else

		api_ver = IWL_UCODE_API(drv->fw.ucode_ver);



	/*

drivers/net/wireless/iwlwifi/iwl-fw-file.h

+5 −1
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ enum iwl_ucode_tlv_type { 
	IWL_UCODE_TLV_N_SCAN_CHANNELS		= 31,

	IWL_UCODE_TLV_SEC_RT_USNIFFER	= 34,

	IWL_UCODE_TLV_SDIO_ADMA_ADDR	= 35,

	IWL_UCODE_TLV_FW_VERSION	= 36,

	IWL_UCODE_TLV_FW_DBG_DEST	= 38,

	IWL_UCODE_TLV_FW_DBG_CONF	= 39,

};
@@ -156,7 +157,8 @@ struct iwl_tlv_ucode_header { 
	__le32 zero;

	__le32 magic;

	u8 human_readable[FW_VER_HUMAN_READABLE_SZ];

	__le32 ver;		/* major/minor/API/serial */

	/* major/minor/API/serial or major in new format */

	__le32 ver;

	__le32 build;

	__le64 ignore;

	/*
@@ -250,6 +252,7 @@ enum iwl_ucode_tlv_flag { 
 * @IWL_UCODE_TLV_API_ASYNC_DTM: Async temperature notifications are supported.

 * @IWL_UCODE_TLV_API_LQ_SS_PARAMS: Configure STBC/BFER via LQ CMD ss_params

 * @IWL_UCODE_TLV_API_STATS_V10: uCode supports/uses statistics API version 10

 * @IWL_UCODE_TLV_API_NEW_VERSION: new versioning format

 */

enum iwl_ucode_tlv_api {

	IWL_UCODE_TLV_API_BT_COEX_SPLIT         = BIT(3),
@@ -263,6 +266,7 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_ASYNC_DTM		= BIT(17),

	IWL_UCODE_TLV_API_LQ_SS_PARAMS		= BIT(18),

	IWL_UCODE_TLV_API_STATS_V10		= BIT(19),

	IWL_UCODE_TLV_API_NEW_VERSION		= BIT(20),

};



/**

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+25 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ enum { 


#define IWL_ALIVE_FLG_RFKILL	BIT(0)



struct mvm_alive_resp {

struct mvm_alive_resp_ver1 {

	__le16 status;

	__le16 flags;

	u8 ucode_minor;
@@ -483,6 +483,30 @@ struct mvm_alive_resp_ver2 { 
	__le32 dbg_print_buff_addr;

} __packed; /* ALIVE_RES_API_S_VER_2 */



struct mvm_alive_resp {

	__le16 status;

	__le16 flags;

	__le32 ucode_minor;

	__le32 ucode_major;

	u8 ver_subtype;

	u8 ver_type;

	u8 mac;

	u8 opt;

	__le32 timestamp;

	__le32 error_event_table_ptr;	/* SRAM address for error log */

	__le32 log_event_table_ptr;	/* SRAM address for LMAC event log */

	__le32 cpu_register_ptr;

	__le32 dbgm_config_ptr;

	__le32 alive_counter_ptr;

	__le32 scd_base_ptr;		/* SRAM address for SCD */

	__le32 st_fwrd_addr;		/* pointer to Store and forward */

	__le32 st_fwrd_size;

	__le32 umac_minor;		/* UMAC version: minor */

	__le32 umac_major;		/* UMAC version: major */

	__le32 error_info_addr;		/* SRAM address for UMAC error log */

	__le32 dbg_print_buff_addr;

} __packed; /* ALIVE_RES_API_S_VER_3 */



/* Error response/notification */

enum {

	FW_ERR_UNKNOWN_CMD = 0x0,