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

Commit a437b3d9 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-03-01' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-03-01' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* add triggers for firmware dump collection
* remove support for -9.ucode
* new statitics API
* rate control improvements
parents 9b6cc9a8 190f1029

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-7000.c

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
#define IWL3160_UCODE_API_OK	10



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	9

#define IWL3160_UCODE_API_MIN	9

#define IWL7260_UCODE_API_MIN	10

#define IWL3160_UCODE_API_MIN	10



/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#define IWL8000_UCODE_API_OK	10



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	9

#define IWL8000_UCODE_API_MIN	10



/* NVM versions */

#define IWL8000_NVM_VERSION		0x0a1d

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

+65 −3
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ static void iwl_dealloc_ucode(struct iwl_drv *drv) 
	kfree(drv->fw.dbg_dest_tlv);

	for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_conf_tlv); i++)

		kfree(drv->fw.dbg_conf_tlv[i]);

	for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_trigger_tlv); i++)

		kfree(drv->fw.dbg_trigger_tlv[i]);



	for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)

		iwl_free_fw_img(drv, drv->fw.img + i);
@@ -293,8 +295,10 @@ struct iwl_firmware_pieces { 


	/* FW debug data parsed for driver usage */

	struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;

	struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_MAX];

	size_t dbg_conf_tlv_len[FW_DBG_MAX];

	struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];

	size_t dbg_conf_tlv_len[FW_DBG_CONF_MAX];

	struct iwl_fw_dbg_trigger_tlv *dbg_trigger_tlv[FW_DBG_TRIGGER_MAX];

	size_t dbg_trigger_tlv_len[FW_DBG_TRIGGER_MAX];

};



/*
@@ -842,6 +846,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;
@@ -897,6 +918,31 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
			pieces->dbg_conf_tlv_len[conf->id] = tlv_len;

			break;

			}

		case IWL_UCODE_TLV_FW_DBG_TRIGGER: {

			struct iwl_fw_dbg_trigger_tlv *trigger =

				(void *)tlv_data;

			u32 trigger_id = le32_to_cpu(trigger->id);



			if (trigger_id >= ARRAY_SIZE(drv->fw.dbg_trigger_tlv)) {

				IWL_ERR(drv,

					"Skip unknown trigger: %u\n",

					trigger->id);

				break;

			}



			if (pieces->dbg_trigger_tlv[trigger_id]) {

				IWL_ERR(drv,

					"Ignore duplicate dbg trigger %u\n",

					trigger->id);

				break;

			}



			IWL_INFO(drv, "Found debug trigger: %u\n", trigger->id);



			pieces->dbg_trigger_tlv[trigger_id] = trigger;

			pieces->dbg_trigger_tlv_len[trigger_id] = tlv_len;

			break;

			}

		case IWL_UCODE_TLV_SEC_RT_USNIFFER:

			usniffer_images = true;

			iwl_store_ucode_sec(pieces, tlv_data,
@@ -1107,6 +1153,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);



	/*
@@ -1178,6 +1227,19 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
		}

	}



	for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_trigger_tlv); i++) {

		if (pieces->dbg_trigger_tlv[i]) {

			drv->fw.dbg_trigger_tlv_len[i] =

				pieces->dbg_trigger_tlv_len[i];

			drv->fw.dbg_trigger_tlv[i] =

				kmemdup(pieces->dbg_trigger_tlv[i],

					drv->fw.dbg_trigger_tlv_len[i],

					GFP_KERNEL);

			if (!drv->fw.dbg_trigger_tlv[i])

				goto out_free_fw;

		}

	}



	/* Now that we can no longer fail, copy information */



	/*