iwlwifi: mvm: read and parse SKU ID if available

In v5 of the ALIVE notification, we may receive the SKU ID of the
device in use.  Read and store it locally for future access.  This
will be needed to find the correct PNVM (platform NVM) to pass to the
firmware.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20201008180656.798744ad514e.Ibb0d88586a34acc904bf319974d791faafb7a905@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index 45a9df0..caae7b5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -995,6 +995,7 @@ struct iwl_trans {
        u32 hw_rf_id;
        u32 hw_id;
        char hw_id_str[52];
+       u32 sku_id[3];
 
        u8 rx_mpdu_cmd, rx_mpdu_cmd_hdr_size;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 1c96658..fda86c5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -216,10 +216,29 @@ static bool iwl_alive_fn(struct iwl_notif_wait_data *notif_wait,
        u16 status;
        u32 lmac_error_event_table, umac_error_table;
 
-       /* we don't use the SKU ID from v5 yet, so handle it as v4 */
+       /*
+        * For v5 and above, we can check the version, for older
+        * versions we need to check the size.
+        */
        if (iwl_fw_lookup_notif_ver(mvm->fw, LEGACY_GROUP,
-                                   UCODE_ALIVE_NTFY, 0) == 5 ||
-           iwl_rx_packet_payload_len(pkt) == sizeof(struct iwl_alive_ntf_v4)) {
+                                   UCODE_ALIVE_NTFY, 0) == 5) {
+               struct iwl_alive_ntf_v5 *palive;
+
+               palive = (void *)pkt->data;
+               umac = &palive->umac_data;
+               lmac1 = &palive->lmac_data[0];
+               lmac2 = &palive->lmac_data[1];
+               status = le16_to_cpu(palive->status);
+
+               mvm->trans->sku_id[0] = le32_to_cpu(palive->sku_id.data[0]);
+               mvm->trans->sku_id[1] = le32_to_cpu(palive->sku_id.data[1]);
+               mvm->trans->sku_id[2] = le32_to_cpu(palive->sku_id.data[2]);
+
+               IWL_DEBUG_FW(mvm, "Got sku_id: 0x0%x 0x0%x 0x0%x\n",
+                            mvm->trans->sku_id[0],
+                            mvm->trans->sku_id[1],
+                            mvm->trans->sku_id[2]);
+       } else if (iwl_rx_packet_payload_len(pkt) == sizeof(struct iwl_alive_ntf_v4)) {
                struct iwl_alive_ntf_v4 *palive;
 
                palive = (void *)pkt->data;