[PATCH 0/2][SRU][B/D/E/OEM-B/OEM-OSP1-B] iwlwifi: exclude GEO SAR support for 3168

[You-Sheng Yang]

BugLink: https://bugs.launchpad.net/bugs/1846016

[Impact]
Intel Wireless AC-3168 and some 8000 models give iwlwifi firmware error
messages in dmesg:

  kernel: iwlwifi 0000:02:00.0: Loaded firmware version: 36.77d01142.0
  kernel: iwlwifi 0000:02:00.0: FW error in SYNC CMD GEO_TX_POWER_LIMIT

This affect B/D/E/OEM-B/OEM-OSP1-B that with GEO_TX_POWER_LIMIT support.

[Fix]
Two upstream patches to be SRU-ed:

  fddbfeece9c7 "iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36"
  12e36d98d3e5 "iwlwifi: exclude GEO SAR support for 3168"

They basically exclude unsupported firmware version for sending
GEO_TX_POWER_LIMIT command.

[Test Case]
Tested on a Ubuntu certified HP EliteDesk 800 G3 DM that has the same AC 3168
wireless adapter.

[Regression Risk]
Low. This doesn't affect the majority of iwlwifi support devices but
those incapable of processing GEO_TX_POWER_LIMIT command in the
firmware.

Luca Coelho (2):
  iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36
  iwlwifi: exclude GEO SAR support for 3168

 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[You-Sheng Yang]

From: Luca Coelho <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1846016

The intention was to have the GEO_TX_POWER_LIMIT command in FW version
36 as well, but not all 8000 family got this feature enabled.  The
8000 family is the only one using version 36, so skip this version
entirely.  If we try to send this command to the firmwares that do not
support it, we get a BAD_COMMAND response from the firmware.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=204151.

Cc: [hidden email] # 4.19+
Signed-off-by: Luca Coelho <[hidden email]>
Signed-off-by: Kalle Valo <[hidden email]>
(cherry picked from commit fddbfeece9c7882cc47754c7da460fe427e3e85b)
Signed-off-by: You-Sheng Yang <[hidden email]>
---
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 29efee6bfe76..5fadbb0f025e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -795,11 +795,13 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm)
  * firmware versions.  Unfortunately, we don't have a TLV API
  * flag to rely on, so rely on the major version which is in
  * the first byte of ucode_ver.  This was implemented
- * initially on version 38 and then backported to 36, 29 and
- * 17.
+ * initially on version 38 and then backported to29 and 17.
+ * The intention was to have it in 36 as well, but not all
+ * 8000 family got this feature enabled.  The 8000 family is
+ * the only one using version 36, so skip this version
+ * entirely.
  */
  return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 ||
-       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 36 ||
        IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 ||
        IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17;
 }
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[You-Sheng Yang]

From: Luca Coelho <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1846016

We currently support two NICs in FW version 29, namely 7265D and 3168.
Out of these, only 7265D supports GEO SAR, so adjust the function that
checks for it accordingly.

Signed-off-by: Luca Coelho <[hidden email]>
Fixes: f5a47fae6aa3 ("iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support")
Signed-off-by: Luca Coelho <[hidden email]>
(cherry picked from commit 12e36d98d3e5acf5fc57774e0a15906d55f30cb9
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git)
Signed-off-by: You-Sheng Yang <[hidden email]>
---
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 5fadbb0f025e..5c70abda4af5 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -795,15 +795,17 @@ static bool iwl_mvm_sar_geo_support(struct iwl_mvm *mvm)
  * firmware versions.  Unfortunately, we don't have a TLV API
  * flag to rely on, so rely on the major version which is in
  * the first byte of ucode_ver.  This was implemented
- * initially on version 38 and then backported to29 and 17.
- * The intention was to have it in 36 as well, but not all
- * 8000 family got this feature enabled.  The 8000 family is
- * the only one using version 36, so skip this version
- * entirely.
+ * initially on version 38 and then backported to 17.  It was
+ * also backported to 29, but only for 7265D devices.  The
+ * intention was to have it in 36 as well, but not all 8000
+ * family got this feature enabled.  The 8000 family is the
+ * only one using version 36, so skip this version entirely.
  */
  return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 ||
-       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 ||
-       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17;
+       IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17 ||
+       (IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 &&
+ ((mvm->trans->hw_rev & CSR_HW_REV_TYPE_MSK) ==
+ CSR_HW_REV_TYPE_7265D));
 }
 
 int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Timo Aaltonen-6]

On 18.10.2019 7.33, You-Sheng Yang wrote:

> BugLink: https://bugs.launchpad.net/bugs/1846016
>
> [Impact]
> Intel Wireless AC-3168 and some 8000 models give iwlwifi firmware error
> messages in dmesg:
>
>   kernel: iwlwifi 0000:02:00.0: Loaded firmware version: 36.77d01142.0
>   kernel: iwlwifi 0000:02:00.0: FW error in SYNC CMD GEO_TX_POWER_LIMIT
>
> This affect B/D/E/OEM-B/OEM-OSP1-B that with GEO_TX_POWER_LIMIT support.

Hi, these don't apply to OSP1 with 'git am'.


--
t

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Timo Aaltonen-6]

On 22.10.2019 16.25, Timo Aaltonen wrote:

> On 18.10.2019 7.33, You-Sheng Yang wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1846016
>>
>> [Impact]
>> Intel Wireless AC-3168 and some 8000 models give iwlwifi firmware error
>> messages in dmesg:
>>
>>   kernel: iwlwifi 0000:02:00.0: Loaded firmware version: 36.77d01142.0
>>   kernel: iwlwifi 0000:02:00.0: FW error in SYNC CMD GEO_TX_POWER_LIMIT
>>
>> This affect B/D/E/OEM-B/OEM-OSP1-B that with GEO_TX_POWER_LIMIT support.
>
> Hi, these don't apply to OSP1 with 'git am.

actually, the first one didn't because it was already applied via the
stable tree, the second one did and is now applied in osp1 oem-next


--
t

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[AceLan Kao]

The first commit has been included in the Ubuntu 4.15.0-67.76 from stable,
so I applied the second on on linux-oem 4.15.0-1060.69

Acked-By: AceLan Kao <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Stefan Bader-2]

On 18.10.19 06:33, You-Sheng Yang wrote:

> BugLink: https://bugs.launchpad.net/bugs/1846016
>
> [Impact]
> Intel Wireless AC-3168 and some 8000 models give iwlwifi firmware error
> messages in dmesg:
>
>   kernel: iwlwifi 0000:02:00.0: Loaded firmware version: 36.77d01142.0
>   kernel: iwlwifi 0000:02:00.0: FW error in SYNC CMD GEO_TX_POWER_LIMIT
>
> This affect B/D/E/OEM-B/OEM-OSP1-B that with GEO_TX_POWER_LIMIT support.
>
> [Fix]
> Two upstream patches to be SRU-ed:
>
>   fddbfeece9c7 "iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36"
>   12e36d98d3e5 "iwlwifi: exclude GEO SAR support for 3168"
>
> They basically exclude unsupported firmware version for sending
> GEO_TX_POWER_LIMIT command.
>
> [Test Case]
> Tested on a Ubuntu certified HP EliteDesk 800 G3 DM that has the same AC 3168
> wireless adapter.
>
> [Regression Risk]
> Low. This doesn't affect the majority of iwlwifi support devices but
> those incapable of processing GEO_TX_POWER_LIMIT command in the
> firmware.
>
> Luca Coelho (2):
>   iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36
>   iwlwifi: exclude GEO SAR support for 3168
>
>  drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>

Based on Timo's comment and checking current bionic/master-next it appears patch
#1 likely is already applied everywhere (to be double checked when applying).
Acking both in case its missing somewhere.

Acked-by: Stefan Bader <[hidden email]>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

[Khaled Elmously]

Patch #1 already exists in B and D. Only patch #2 was applied to B and D.

Patch #1 and patch #2 alredy exist in E. Nothing was applied for E - setting it as APPLIED just for book-keeping.

Will mark all 3 targets as Fix-committed.


On 2019-10-18 12:33:36 , You-Sheng Yang wrote:

> BugLink: https://bugs.launchpad.net/bugs/1846016
>
> [Impact]
> Intel Wireless AC-3168 and some 8000 models give iwlwifi firmware error
> messages in dmesg:
>
>   kernel: iwlwifi 0000:02:00.0: Loaded firmware version: 36.77d01142.0
>   kernel: iwlwifi 0000:02:00.0: FW error in SYNC CMD GEO_TX_POWER_LIMIT
>
> This affect B/D/E/OEM-B/OEM-OSP1-B that with GEO_TX_POWER_LIMIT support.
>
> [Fix]
> Two upstream patches to be SRU-ed:
>
>   fddbfeece9c7 "iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36"
>   12e36d98d3e5 "iwlwifi: exclude GEO SAR support for 3168"
>
> They basically exclude unsupported firmware version for sending
> GEO_TX_POWER_LIMIT command.
>
> [Test Case]
> Tested on a Ubuntu certified HP EliteDesk 800 G3 DM that has the same AC 3168
> wireless adapter.
>
> [Regression Risk]
> Low. This doesn't affect the majority of iwlwifi support devices but
> those incapable of processing GEO_TX_POWER_LIMIT command in the
> firmware.
>
> Luca Coelho (2):
>   iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW version 36
>   iwlwifi: exclude GEO SAR support for 3168
>
>  drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>
> --
> 2.20.1
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team