From 7c766b589149b83553a141ee3032b0d158deda99 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 5 Feb 2020 13:01:18 +0000 Subject: [PATCH] drop arm-8955-1-virt-relax-arch-timer-version-check-durin.patch from 4.9 and 4.4 --- ...relax-arch-timer-version-check-durin.patch | 50 ------------------- queue-4.4/series | 1 - ...relax-arch-timer-version-check-durin.patch | 50 ------------------- queue-4.9/series | 1 - 4 files changed, 102 deletions(-) delete mode 100644 queue-4.4/arm-8955-1-virt-relax-arch-timer-version-check-durin.patch delete mode 100644 queue-4.9/arm-8955-1-virt-relax-arch-timer-version-check-durin.patch diff --git a/queue-4.4/arm-8955-1-virt-relax-arch-timer-version-check-durin.patch b/queue-4.4/arm-8955-1-virt-relax-arch-timer-version-check-durin.patch deleted file mode 100644 index 9771d82a9de..00000000000 --- a/queue-4.4/arm-8955-1-virt-relax-arch-timer-version-check-durin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fab04db4db271d6ce4a2057569bd2efd854d9e8d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 20 Jan 2020 15:07:46 +0100 -Subject: ARM: 8955/1: virt: Relax arch timer version check during early boot - -From: Vladimir Murzin - -[ Upstream commit 6849b5eba1965ceb0cad3a75877ef4569dd3638e ] - -Updates to the Generic Timer architecture allow ID_PFR1.GenTimer to -have values other than 0 or 1 while still preserving backward -compatibility. At the moment, Linux is quite strict in the way it -handles this field at early boot and will not configure arch timer if -it doesn't find the value 1. - -Since here use ubfx for arch timer version extraction (hyb-stub build -with -march=armv7-a, so it is safe) - -To help backports (even though the code was correct at the time of writing) - -Fixes: 8ec58be9f3ff ("ARM: virt: arch_timers: enable access to physical timers") -Acked-by: Marc Zyngier -Signed-off-by: Vladimir Murzin -Signed-off-by: Russell King -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/hyp-stub.S | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S -index 2a55373f49bfb..f9948363111d1 100644 ---- a/arch/arm/kernel/hyp-stub.S -+++ b/arch/arm/kernel/hyp-stub.S -@@ -144,10 +144,9 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE - #if !defined(ZIMAGE) && defined(CONFIG_ARM_ARCH_TIMER) - @ make CNTP_* and CNTPCT accessible from PL1 - mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1 -- lsr r7, #16 -- and r7, #0xf -- cmp r7, #1 -- bne 1f -+ ubfx r7, r7, #16, #4 -+ teq r7, #0 -+ beq 1f - mrc p15, 4, r7, c14, c1, 0 @ CNTHCTL - orr r7, r7, #3 @ PL1PCEN | PL1PCTEN - mcr p15, 4, r7, c14, c1, 0 @ CNTHCTL --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 0148cbd9120..6e47bb2a54e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -37,7 +37,6 @@ ixgbe-fix-calculation-of-queue-with-vfs-and-flow-dir.patch wireless-wext-avoid-gcc-o3-warning.patch vti-6-fix-packet-tx-through-bpf_redirect.patch scsi-fnic-do-not-queue-commands-during-fwreset.patch -arm-8955-1-virt-relax-arch-timer-version-check-durin.patch airo-fix-possible-info-leak-in-airooldioctl-siocdevp.patch airo-add-missing-cap_net_admin-check-in-airooldioctl.patch r8152-get-default-setting-of-wol-before-initializing.patch diff --git a/queue-4.9/arm-8955-1-virt-relax-arch-timer-version-check-durin.patch b/queue-4.9/arm-8955-1-virt-relax-arch-timer-version-check-durin.patch deleted file mode 100644 index 814f07d646a..00000000000 --- a/queue-4.9/arm-8955-1-virt-relax-arch-timer-version-check-durin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 998b8ccff6bf22854d6bfabda899f3ae1f1d13ec Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 20 Jan 2020 15:07:46 +0100 -Subject: ARM: 8955/1: virt: Relax arch timer version check during early boot - -From: Vladimir Murzin - -[ Upstream commit 6849b5eba1965ceb0cad3a75877ef4569dd3638e ] - -Updates to the Generic Timer architecture allow ID_PFR1.GenTimer to -have values other than 0 or 1 while still preserving backward -compatibility. At the moment, Linux is quite strict in the way it -handles this field at early boot and will not configure arch timer if -it doesn't find the value 1. - -Since here use ubfx for arch timer version extraction (hyb-stub build -with -march=armv7-a, so it is safe) - -To help backports (even though the code was correct at the time of writing) - -Fixes: 8ec58be9f3ff ("ARM: virt: arch_timers: enable access to physical timers") -Acked-by: Marc Zyngier -Signed-off-by: Vladimir Murzin -Signed-off-by: Russell King -Signed-off-by: Sasha Levin ---- - arch/arm/kernel/hyp-stub.S | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S -index f5e5e3e196592..f587681a9553c 100644 ---- a/arch/arm/kernel/hyp-stub.S -+++ b/arch/arm/kernel/hyp-stub.S -@@ -158,10 +158,9 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE - #if !defined(ZIMAGE) && defined(CONFIG_ARM_ARCH_TIMER) - @ make CNTP_* and CNTPCT accessible from PL1 - mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1 -- lsr r7, #16 -- and r7, #0xf -- cmp r7, #1 -- bne 1f -+ ubfx r7, r7, #16, #4 -+ teq r7, #0 -+ beq 1f - mrc p15, 4, r7, c14, c1, 0 @ CNTHCTL - orr r7, r7, #3 @ PL1PCEN | PL1PCTEN - mcr p15, 4, r7, c14, c1, 0 @ CNTHCTL --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 8a64ea04cc1..91f83858e2e 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -50,7 +50,6 @@ mac80211-fix-tkip-replay-protection-immediately-afte.patch wireless-wext-avoid-gcc-o3-warning.patch vti-6-fix-packet-tx-through-bpf_redirect.patch scsi-fnic-do-not-queue-commands-during-fwreset.patch -arm-8955-1-virt-relax-arch-timer-version-check-durin.patch airo-fix-possible-info-leak-in-airooldioctl-siocdevp.patch airo-add-missing-cap_net_admin-check-in-airooldioctl.patch r8152-get-default-setting-of-wol-before-initializing.patch -- 2.47.3