From: Greg Kroah-Hartman Date: Thu, 3 May 2018 15:46:18 +0000 (-0700) Subject: drop some more 4.9 patches X-Git-Tag: v4.9.99~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=446f063017131b84ec97b27874b93df8f96d6fe5;p=thirdparty%2Fkernel%2Fstable-queue.git drop some more 4.9 patches --- diff --git a/queue-4.9/i40e-add-delay-after-emp-reset-for-firmware-to-recover.patch b/queue-4.9/i40e-add-delay-after-emp-reset-for-firmware-to-recover.patch deleted file mode 100644 index 7a1f5adf6c8..00000000000 --- a/queue-4.9/i40e-add-delay-after-emp-reset-for-firmware-to-recover.patch +++ /dev/null @@ -1,43 +0,0 @@ -From foo@baz Wed May 2 10:53:12 PDT 2018 -From: Filip Sadowski -Date: Fri, 29 Dec 2017 08:50:05 -0500 -Subject: i40e: Add delay after EMP reset for firmware to recover - -From: Filip Sadowski - -[ Upstream commit 1fa51a650e1deb50410677f1bd6c0ce17aa48a49 ] - -This patch adds necessary delay for 4.33 firmware to recover after -EMP reset. Without this patch driver occasionally reinitializes -structures too quickly to communicate with firmware after EMP reset -causing AdminQ to timeout. - -Signed-off-by: Filip Sadowski -Tested-by: Andrew Bowers -Signed-off-by: Jeff Kirsher -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/drivers/net/ethernet/intel/i40e/i40e_main.c -+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c -@@ -6830,6 +6830,17 @@ static void i40e_reset_and_rebuild(struc - goto clear_recovery; - } - -+ if (test_bit(__I40E_EMP_RESET_INTR_RECEIVED, pf->state) && -+ ((hw->aq.fw_maj_ver == 4 && hw->aq.fw_min_ver <= 33) || -+ hw->aq.fw_maj_ver < 4) && hw->mac.type == I40E_MAC_XL710) { -+ /* The following delay is necessary for 4.33 firmware and older -+ * to recover after EMP reset. 200 ms should suffice but we -+ * put here 300 ms to be sure that FW is ready to operate -+ * after reset. -+ */ -+ mdelay(300); -+ } -+ - /* re-verify the eeprom if we just had an EMP reset */ - if (test_and_clear_bit(__I40E_EMP_RESET_INTR_RECEIVED, &pf->state)) - i40e_verify_eeprom(pf); diff --git a/queue-4.9/ima-fix-kconfig-to-select-tpm-2.0-crb-interface.patch b/queue-4.9/ima-fix-kconfig-to-select-tpm-2.0-crb-interface.patch deleted file mode 100644 index d55c58e1e7f..00000000000 --- a/queue-4.9/ima-fix-kconfig-to-select-tpm-2.0-crb-interface.patch +++ /dev/null @@ -1,37 +0,0 @@ -From foo@baz Wed May 2 10:53:11 PDT 2018 -From: Jiandi An -Date: Tue, 6 Mar 2018 23:26:26 -0600 -Subject: ima: Fix Kconfig to select TPM 2.0 CRB interface - -From: Jiandi An - -[ Upstream commit fac37c628fd5d68fd7298d9b57ae8601ee1b4723 ] - -TPM_CRB driver provides TPM CRB 2.0 support. If it is built as a -module, the TPM chip is registered after IMA init. tpm_pcr_read() in -IMA fails and displays the following message even though eventually -there is a TPM chip on the system. - -ima: No TPM chip found, activating TPM-bypass! (rc=-19) - -Fix IMA Kconfig to select TPM_CRB so TPM_CRB driver is built in the kernel -and initializes before IMA. - -Signed-off-by: Jiandi An -Signed-off-by: Mimi Zohar -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - security/integrity/ima/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/security/integrity/ima/Kconfig -+++ b/security/integrity/ima/Kconfig -@@ -10,6 +10,7 @@ config IMA - select CRYPTO_HASH_INFO - select TCG_TPM if HAS_IOMEM && !UML - select TCG_TIS if TCG_TPM && X86 -+ select TCG_CRB if TCG_TPM && ACPI - select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES - help - The Trusted Computing Group(TCG) runtime Integrity diff --git a/queue-4.9/series b/queue-4.9/series index cfc938c3880..35bf1b030a8 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -278,7 +278,6 @@ selftests-print-the-test-we-re-running-to-dev-kmsg.patch net-mlx5-protect-from-command-bit-overflow.patch ath10k-fix-kernel-panic-while-using-worker-ath10k_sta_rc_update_wk.patch cxgb4-setup-fw-queues-before-registering-netdev.patch -ima-fix-kconfig-to-select-tpm-2.0-crb-interface.patch ima-fallback-to-the-builtin-hash-algorithm.patch alsa-usb-audio-add-native-dsd-support-for-luxman-da-06.patch virtio-net-fix-operstate-for-virtio-when-no-virtio_net_f_status.patch @@ -381,7 +380,6 @@ perf-report-fix-memory-corruption-in-branch-history-mode-branch-history.patch selftests-net-fixes-psock_fanout-ebpf-test-case.patch netlabel-if-pf_inet6-check-sk_buff-ip-header-version.patch regmap-correct-comparison-in-regmap_cached.patch -i40e-add-delay-after-emp-reset-for-firmware-to-recover.patch scsi-lpfc-fix-issue_lip-if-link-is-disabled.patch scsi-lpfc-fix-soft-lockup-in-lpfc-worker-thread-during-lip-testing.patch scsi-lpfc-fix-frequency-of-release-wqe-cqes.patch