]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices
authorDan Moulding <dmoulding@me.com>
Tue, 24 Mar 2020 23:55:45 +0000 (16:55 -0700)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 25 Mar 2020 03:56:18 +0000 (23:56 -0400)
commit02f6eb68aae0de9b5046ccf385103ea854d7d221
tree073d70f8bd00e5d08041e810a87db32b2062949d
parent61f61b3b7d0afdbbe2ca90f4c50e30d1f625fbfa
iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices

BugLink: https://bugs.launchpad.net/bugs/1868442
The logic for checking required NVM sections was recently fixed in
commit b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168
devices"). However, with that fixed the else is now taken for 3168
devices and within the else clause there is a mandatory check for the
PHY_SKU section. This causes the parsing to fail for 3168 devices.

The PHY_SKU section is really only mandatory for the IWL_NVM_EXT
layout (the phy_sku parameter of iwl_parse_nvm_data is only used when
the NVM type is IWL_NVM_EXT). So this changes the PHY_SKU section
check so that it's only mandatory for IWL_NVM_EXT.

Fixes: b3f20e098293 ("iwlwifi: mvm: fix NVM check for 3168 devices")
Signed-off-by: Dan Moulding <dmoulding@me.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
(cherry picked from commit a9149d243f259ad8f02b1e23dfe8ba06128f15e1)
Signed-off-by: Sultan Alsawaf <sultan.alsawaf@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c