From 2fe857b25d5a008b736795e6a37c45648a0f9a91 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sep 24 2019 14:08:09 +0000 Subject: add iwlwifi fix for 8000 series devices --- diff --git a/iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch b/iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch new file mode 100644 index 0000000..f583a5b --- /dev/null +++ b/iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch @@ -0,0 +1,87 @@ +From patchwork Tue Sep 24 10:30:57 2019 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Luca Coelho +X-Patchwork-Id: 11158395 +X-Patchwork-Delegate: kvalo@adurom.com +Return-Path: +Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org + [172.30.200.123]) + by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62FF3112B + for ; + Tue, 24 Sep 2019 10:31:06 +0000 (UTC) +Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) + by mail.kernel.org (Postfix) with ESMTP id 4AA4E214D9 + for ; + Tue, 24 Sep 2019 10:31:06 +0000 (UTC) +Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand + id S2409468AbfIXKbF (ORCPT + ); + Tue, 24 Sep 2019 06:31:05 -0400 +Received: from paleale.coelho.fi ([176.9.41.70]:44742 "EHLO + farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org + with ESMTP id S2387644AbfIXKbF (ORCPT + ); + Tue, 24 Sep 2019 06:31:05 -0400 +Received: from [91.156.6.193] (helo=redipa.ger.corp.intel.com) + by farmhouse.coelho.fi with esmtpsa + (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) + (Exim 4.92) + (envelope-from ) + id 1iCi63-0005Je-8E; Tue, 24 Sep 2019 13:31:03 +0300 +From: Luca Coelho +To: kvalo@codeaurora.org +Cc: linux-wireless@vger.kernel.org +Date: Tue, 24 Sep 2019 13:30:57 +0300 +Message-Id: <20190924103057.17147-1-luca@coelho.fi> +X-Mailer: git-send-email 2.23.0 +MIME-Version: 1.0 +X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on farmhouse.coelho.fi +X-Spam-Level: +X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, + URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 +Subject: [PATCH v5.4] iwlwifi: fw: don't send GEO_TX_POWER_LIMIT command to FW + version 36 +Sender: linux-wireless-owner@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-wireless@vger.kernel.org + +From: Luca Coelho + +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: stable@vger.kernel.org # 4.19+ +Signed-off-by: Luca Coelho +--- + 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 014eca6596e2..32a5e4e5461f 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +@@ -889,11 +889,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; + } diff --git a/kernel.spec b/kernel.spec index d2f8e7f..a9944ee 100644 --- a/kernel.spec +++ b/kernel.spec @@ -545,11 +545,14 @@ Patch330: arm64-qcom-i2c-geni-Disable-DMA-processing-on-the-Lenovo-Yoga-C630.pat Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch # gcc9 fixes -Patch507: 0001-Drop-that-for-now.patch +Patch502: 0001-Drop-that-for-now.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1701096 # Submitted upstream at https://lkml.org/lkml/2019/4/23/89 -Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch +Patch503: KEYS-Make-use-of-platform-keyring-for-module-signature.patch + +# https://patchwork.kernel.org/patch/11158395/ +Patch504: iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch # END OF PATCH DEFINITIONS