From: Greg Kroah-Hartman Date: Thu, 3 May 2018 15:52:52 +0000 (-0700) Subject: drop some 4.4 patches X-Git-Tag: v4.9.99~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53ce6dca6b3bc19956cddc3544bca839c685affb;p=thirdparty%2Fkernel%2Fstable-queue.git drop some 4.4 patches --- diff --git a/queue-4.4/i40e-add-delay-after-emp-reset-for-firmware-to-recover.patch b/queue-4.4/i40e-add-delay-after-emp-reset-for-firmware-to-recover.patch deleted file mode 100644 index 5f930a91456..00000000000 --- a/queue-4.4/i40e-add-delay-after-emp-reset-for-firmware-to-recover.patch +++ /dev/null @@ -1,43 +0,0 @@ -From foo@baz Wed May 2 11:39:22 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 -@@ -6756,6 +6756,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.4/media-vb2-fix-videobuf2-to-map-correct-area.patch b/queue-4.4/media-vb2-fix-videobuf2-to-map-correct-area.patch deleted file mode 100644 index c3fd4986154..00000000000 --- a/queue-4.4/media-vb2-fix-videobuf2-to-map-correct-area.patch +++ /dev/null @@ -1,40 +0,0 @@ -From foo@baz Wed May 2 11:39:22 PDT 2018 -From: Masami Hiramatsu -Date: Tue, 6 Feb 2018 03:02:23 -0500 -Subject: media: vb2: Fix videobuf2 to map correct area - -From: Masami Hiramatsu - -[ Upstream commit d13a0139d7874a0577b5955d6eed895517d23b72 ] - -Fixes vb2_vmalloc_get_userptr() to ioremap correct area. -Since the current code does ioremap the page address, if the offset > 0, -it does not do ioremap the last page and results in kernel panic. - -This fixes to pass the size + offset to ioremap so that ioremap -can map correct area. Also, this uses __pfn_to_phys() to get the physical -address of given PFN. - -Signed-off-by: Masami Hiramatsu -Reported-by: Takao Orito -Reported-by: Fumihiro ATSUMI -Reviewed-by: Marek Szyprowski -Signed-off-by: Hans Verkuil -Signed-off-by: Mauro Carvalho Chehab -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/media/v4l2-core/videobuf2-vmalloc.c -+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c -@@ -100,7 +100,7 @@ static void *vb2_vmalloc_get_userptr(voi - if (nums[i-1] + 1 != nums[i]) - goto fail_map; - buf->vaddr = (__force void *) -- ioremap_nocache(nums[0] << PAGE_SHIFT, size); -+ ioremap_nocache(__pfn_to_phys(nums[0]), size + offset); - } else { - buf->vaddr = vm_map_ram(frame_vector_pages(vec), n_pages, -1, - PAGE_KERNEL); diff --git a/queue-4.4/series b/queue-4.4/series index e61860a4453..d7064c0aad4 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -147,7 +147,6 @@ net-fix-untag-for-vlan-packets-without-ethernet-header.patch net-mvneta-fix-enable-of-all-initialized-rxqs.patch sh-fix-debug-trap-failure-to-process-signals-before-return-to-user.patch x86-pgtable-don-t-set-huge-pud-pmd-on-non-leaf-entries.patch -x86-mm-do-not-forbid-_page_rw-before-init-for-__ro_after_init.patch fs-proc-proc_sysctl.c-fix-potential-page-fault-while-unregistering-sysctl-table.patch swap-divide-by-zero-when-zero-length-swap-file-on-ssd.patch sr-get-drop-reference-to-device-in-revalidate-and-check_events.patch @@ -240,7 +239,6 @@ serial-fsl_lpuart-fix-out-of-bounds-access-through-dt-alias.patch serial-arc_uart-fix-out-of-bounds-access-through-dt-alias.patch pci-add-function-1-dma-alias-quirk-for-marvell-88se9220.patch udf-provide-saner-default-for-invalid-uid-gid.patch -media-vb2-fix-videobuf2-to-map-correct-area.patch media-cx25821-prevent-out-of-bounds-read-on-array-card.patch clk-samsung-s3c2410-fix-pll-rates.patch clk-samsung-exynos5260-fix-pll-rates.patch @@ -256,7 +254,6 @@ perf-tests-use-arch__compare_symbol_names-to-compare-symbols.patch 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 -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 diff --git a/queue-4.4/x86-mm-do-not-forbid-_page_rw-before-init-for-__ro_after_init.patch b/queue-4.4/x86-mm-do-not-forbid-_page_rw-before-init-for-__ro_after_init.patch deleted file mode 100644 index 81b67f96c43..00000000000 --- a/queue-4.4/x86-mm-do-not-forbid-_page_rw-before-init-for-__ro_after_init.patch +++ /dev/null @@ -1,64 +0,0 @@ -From foo@baz Wed May 2 11:39:22 PDT 2018 -From: Dave Hansen -Date: Fri, 6 Apr 2018 13:55:14 -0700 -Subject: x86/mm: Do not forbid _PAGE_RW before init for __ro_after_init - -From: Dave Hansen - -[ Upstream commit 639d6aafe437a7464399d2a77d006049053df06f ] - -__ro_after_init data gets stuck in the .rodata section. That's normally -fine because the kernel itself manages the R/W properties. - -But, if we run __change_page_attr() on an area which is __ro_after_init, -the .rodata checks will trigger and force the area to be immediately -read-only, even if it is early-ish in boot. This caused problems when -trying to clear the _PAGE_GLOBAL bit for these area in the PTI code: -it cleared _PAGE_GLOBAL like I asked, but also took it up on itself -to clear _PAGE_RW. The kernel then oopses the next time it wrote to -a __ro_after_init data structure. - -To fix this, add the kernel_set_to_readonly check, just like we have -for kernel text, just a few lines below in this function. - -Signed-off-by: Dave Hansen -Acked-by: Kees Cook -Cc: Andrea Arcangeli -Cc: Andy Lutomirski -Cc: Arjan van de Ven -Cc: Borislav Petkov -Cc: Dan Williams -Cc: David Woodhouse -Cc: Greg Kroah-Hartman -Cc: Hugh Dickins -Cc: Josh Poimboeuf -Cc: Juergen Gross -Cc: Linus Torvalds -Cc: Nadav Amit -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Cc: linux-mm@kvack.org -Link: http://lkml.kernel.org/r/20180406205514.8D898241@viggo.jf.intel.com -Signed-off-by: Ingo Molnar -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/x86/mm/pageattr.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/arch/x86/mm/pageattr.c -+++ b/arch/x86/mm/pageattr.c -@@ -273,9 +273,11 @@ static inline pgprot_t static_protection - - /* - * The .rodata section needs to be read-only. Using the pfn -- * catches all aliases. -+ * catches all aliases. This also includes __ro_after_init, -+ * so do not enforce until kernel_set_to_readonly is true. - */ -- if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT, -+ if (kernel_set_to_readonly && -+ within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT, - __pa_symbol(__end_rodata) >> PAGE_SHIFT)) - pgprot_val(forbidden) |= _PAGE_RW; -