Commit ee86cd90 authored by Miri Korenblit's avatar Miri Korenblit
Browse files

wifi: iwlwifi: remove support of versions 4 and 5 of iwl_alive_ntf 



These are not used in any of our devices. Remove them.

Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250711183056.dd784443be53.I4ff3b2392294f5df2625a71e2deee3364e9708f6@changeid
parent 0356e509

drivers/net/wireless/intel/iwlwifi/fw/api/alive.h

+0 −15
Original line number Diff line number Diff line
@@ -82,21 +82,6 @@ struct iwl_alive_ntf_v3 { 
	struct iwl_umac_alive umac_data;

} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_3 */



struct iwl_alive_ntf_v4 {

	__le16 status;

	__le16 flags;

	struct iwl_lmac_alive lmac_data[2];

	struct iwl_umac_alive umac_data;

} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_4 */



struct iwl_alive_ntf_v5 {

	__le16 status;

	__le16 flags;

	struct iwl_lmac_alive lmac_data[2];

	struct iwl_umac_alive umac_data;

	struct iwl_sku_id sku_id;

} __packed; /* UCODE_ALIVE_NTFY_API_S_VER_5 */



struct iwl_imr_alive_info {

	__le64 base_addr;

	__le32 size;

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

+16 −34
Original line number Diff line number Diff line
@@ -121,6 +121,22 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait, 
			return false;



		palive = (void *)pkt->data;



		umac = &palive->umac_data;

		lmac1 = &palive->lmac_data[0];

		lmac2 = &palive->lmac_data[1];

		status = le16_to_cpu(palive->status);



		BUILD_BUG_ON(sizeof(palive->sku_id.data) !=

			     sizeof(alive_data->sku_id));

		memcpy(alive_data->sku_id, palive->sku_id.data,

		       sizeof(palive->sku_id.data));



		IWL_DEBUG_FW(mvm, "Got sku_id: 0x0%x 0x0%x 0x0%x\n",

			     le32_to_cpu(alive_data->sku_id[0]),

			     le32_to_cpu(alive_data->sku_id[1]),

			     le32_to_cpu(alive_data->sku_id[2]));



		mvm->trans->dbg.imr_data.imr_enable =

			le32_to_cpu(palive->imr.enabled);

		mvm->trans->dbg.imr_data.imr_size =
@@ -168,40 +184,6 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait, 
			IWL_DEBUG_FW(mvm, "platform id: 0x%llx\n",

				     palive_v8->platform_id);

		}

	}



	if (version >= 5) {

		struct iwl_alive_ntf_v5 *palive;



		if (pkt_len < sizeof(*palive))

			return false;



		palive = (void *)pkt->data;

		umac = &palive->umac_data;

		lmac1 = &palive->lmac_data[0];

		lmac2 = &palive->lmac_data[1];

		status = le16_to_cpu(palive->status);



		BUILD_BUG_ON(sizeof(palive->sku_id.data) !=

			     sizeof(alive_data->sku_id));

		memcpy(alive_data->sku_id, palive->sku_id.data,

		       sizeof(palive->sku_id.data));



		IWL_DEBUG_FW(mvm, "Got sku_id: 0x0%x 0x0%x 0x0%x\n",

			     le32_to_cpu(alive_data->sku_id[0]),

			     le32_to_cpu(alive_data->sku_id[1]),

			     le32_to_cpu(alive_data->sku_id[2]));

	} else if (iwl_rx_packet_payload_len(pkt) == sizeof(struct iwl_alive_ntf_v4)) {

		struct iwl_alive_ntf_v4 *palive;



		if (pkt_len < sizeof(*palive))

			return false;



		palive = (void *)pkt->data;

		umac = &palive->umac_data;

		lmac1 = &palive->lmac_data[0];

		lmac2 = &palive->lmac_data[1];

		status = le16_to_cpu(palive->status);

	} else if (iwl_rx_packet_payload_len(pkt) ==

		   sizeof(struct iwl_alive_ntf_v3)) {

		struct iwl_alive_ntf_v3 *palive3;