From 988883b98d6c33bea915f0062f81edec0bc7526a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 7 Oct 2019 07:40:43 +0100 Subject: [PATCH] v5.3.4 --- ...CI-device-IDs-for-family-17h-model-7.patch | 92 ------------------- ...POWER_LIMIT-command-to-FW-version-36.patch | 87 ------------------ kernel.spec | 15 +-- sources | 2 +- 4 files changed, 5 insertions(+), 191 deletions(-) delete mode 100644 0001-x86-amd_nb-Add-PCI-device-IDs-for-family-17h-model-7.patch delete mode 100644 iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch diff --git a/0001-x86-amd_nb-Add-PCI-device-IDs-for-family-17h-model-7.patch b/0001-x86-amd_nb-Add-PCI-device-IDs-for-family-17h-model-7.patch deleted file mode 100644 index 327789e50..000000000 --- a/0001-x86-amd_nb-Add-PCI-device-IDs-for-family-17h-model-7.patch +++ /dev/null @@ -1,92 +0,0 @@ -From af4e1c5eca95bed1192d8dc45c8ed63aea2209e8 Mon Sep 17 00:00:00 2001 -From: Marcel Bocu -Date: Mon, 22 Jul 2019 20:45:10 +0300 -Subject: [PATCH] x86/amd_nb: Add PCI device IDs for family 17h, model 70h - -The AMD Ryzen gen 3 processors came with a different PCI IDs for the -function 3 & 4 which are used to access the SMN interface. The root -PCI address however remained at the same address as the model 30h. - -Adding the F3/F4 PCI IDs respectively to the misc and link ids appear -to be sufficient for k10temp, so let's add them and follow up on the -patch if other functions need more tweaking. - -Vicki Pfau sent an identical patch after I checked that no-one had -written this patch. I would have been happy about dropping my patch but -unlike for his patch series, I had already Cc:ed the x86 people and -they already reviewed the changes. Since Vicki has not answered to -any email after his initial series, let's assume she is on vacation -and let's avoid duplication of reviews from the maintainers and merge -my series. To acknowledge Vicki's anteriority, I added her S-o-b to -the patch. - -v2, suggested by Guenter Roeck and Brian Woods: - - rename from 71h to 70h - -Signed-off-by: Vicki Pfau -Signed-off-by: Marcel Bocu -Tested-by: Marcel Bocu -Acked-by: Thomas Gleixner -Acked-by: Brian Woods -Acked-by: Bjorn Helgaas # pci_ids.h - -Cc: Thomas Gleixner -Cc: Ingo Molnar -Cc: Borislav Petkov -Cc: "H. Peter Anvin" -Cc: x86@kernel.org -Cc: "Woods, Brian" -Cc: Clemens Ladisch -Cc: Jean Delvare -Cc: Guenter Roeck -Cc: linux-hwmon@vger.kernel.org -Link: https://lore.kernel.org/r/20190722174510.2179-1-marcel.p.bocu@gmail.com -Signed-off-by: Guenter Roeck ---- - arch/x86/kernel/amd_nb.c | 3 +++ - include/linux/pci_ids.h | 1 + - 2 files changed, 4 insertions(+) - -diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c -index d63e63b7d1d9..251c795b4eb3 100644 ---- a/arch/x86/kernel/amd_nb.c -+++ b/arch/x86/kernel/amd_nb.c -@@ -21,6 +21,7 @@ - #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 - #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec - #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 -+#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444 - - /* Protect the PCI config register pairs used for SMN and DF indirect access. */ - static DEFINE_MUTEX(smn_mutex); -@@ -50,6 +51,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, - {} - }; - EXPORT_SYMBOL_GPL(amd_nb_misc_ids); -@@ -63,6 +65,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, - {} - }; -diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h -index c842735a4f45..4b97f427cc92 100644 ---- a/include/linux/pci_ids.h -+++ b/include/linux/pci_ids.h -@@ -548,6 +548,7 @@ - #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 - #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb - #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 -+#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 - #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703 - #define PCI_DEVICE_ID_AMD_LANCE 0x2000 - #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001 --- -2.21.0 - 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 deleted file mode 100644 index f583a5b2d..000000000 --- a/iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 d2a52bc6a..521bd57d1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 2 +%define stable_update 4 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -594,20 +594,10 @@ Patch503: KEYS-Make-use-of-platform-keyring-for-module-signature.patch # rhbz 1753099 Patch504: dwc3-fix.patch -# https://patchwork.kernel.org/patch/11158395/ -Patch505: iwlwifi-fw-don-t-send-GEO_TX_POWER_LIMIT-command-to-FW-version-36.patch - -# new ids -Patch506: 0001-x86-amd_nb-Add-PCI-device-IDs-for-family-17h-model-7.patch - # rhbz 1752961 Patch507: v2-1-2-efi-tpm-Don-t-access-event--count-when-it-isn-t-mapped..patch Patch508: v3-tpm-only-set-efi_tpm_final_log_size-after-successful-event-log-parsing.patch -# CVE-2019-17052 CVE-2019-17053 CVE-2019-17054 CVE-2019-17055 CVE-2019-17056 -# rhbz 1758239 1758240 1758242 1758243 1758245 1758246 1758248 1758249 1758256 1758257 -Patch509: enforce-CAP_NET_RAW-for-raw-sockets.patch - # END OF PATCH DEFINITIONS %endif @@ -1809,6 +1799,9 @@ fi # # %changelog +* Mon Oct 7 2019 Peter Robinson 5.3.4-300 +- Linux v5.3.4 + * Sun Oct 6 2019 Peter Robinson - Fixes for RockPro64 - Fixes for Jetson-TX series devices diff --git a/sources b/sources index 6e4650fea..f9f7d3aea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d -SHA512 (patch-5.3.2.xz) = 3528b4355ebbf1a1cbc4ac7efd7cdd5b5dddb28c30e182e8c0f3119c61a97d6bc1fb07ec8f2cf0a78067b098c27535bc006485428c76d6c8fb653f215218dff3 +SHA512 (patch-5.3.4.xz) = 63f774e8a4dbc6376cab702e2813c5e7703aaa300d942447f1bb27bb749375179ac969e21a1983314eb33e0109206ad298be503f7fc6f168c85008cf63788002