fix up queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaroun...

diff --git a/queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch b/queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch
index ad5be9feca5f71e9fbc292c5b42e14aabd1c4883..8511710d67fc3b4b97b447bd45af2af687e5eb5c 100644 (file)
--- a/queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch
+++ b/queue-6.1/arm64-errata-add-cortex-a520-speculative-unprivileged-load-workaround.patch
@@ -29,31 +29,27 @@ Link: https://lore.kernel.org/r/20230921194156.1050055-2-robh@kernel.org
 Signed-off-by: Will Deacon <will@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- Documentation/arch/arm64/silicon-errata.rst |  2 ++
- arch/arm64/Kconfig                          | 13 +++++++++++++
- arch/arm64/kernel/cpu_errata.c              |  8 ++++++++
- arch/arm64/kernel/entry.S                   |  4 ++++
- arch/arm64/tools/cpucaps                    |  1 +
+ Documentation/arm64/silicon-errata.rst |    2 ++
+ arch/arm64/Kconfig                     |   13 +++++++++++++
+ arch/arm64/kernel/cpu_errata.c         |    8 ++++++++
+ arch/arm64/kernel/entry.S              |    4 ++++
+ arch/arm64/tools/cpucaps               |    1 +
  5 files changed, 28 insertions(+)
 
-diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst
-index e96f057ea2a0..f47f63bcf67c 100644
---- a/Documentation/arch/arm64/silicon-errata.rst
-+++ b/Documentation/arch/arm64/silicon-errata.rst
-@@ -71,6 +71,8 @@ stable kernels.
+--- a/Documentation/arm64/silicon-errata.rst
++++ b/Documentation/arm64/silicon-errata.rst
+@@ -63,6 +63,8 @@ stable kernels.
  +----------------+-----------------+-----------------+-----------------------------+
- | ARM            | Cortex-A510     | #2658417        | ARM64_ERRATUM_2658417       |
+ | ARM            | Cortex-A510     | #1902691        | ARM64_ERRATUM_1902691       |
  +----------------+-----------------+-----------------+-----------------------------+
 +| ARM            | Cortex-A520     | #2966298        | ARM64_ERRATUM_2966298       |
 ++----------------+-----------------+-----------------+-----------------------------+
  | ARM            | Cortex-A53      | #826319         | ARM64_ERRATUM_826319        |
  +----------------+-----------------+-----------------+-----------------------------+
  | ARM            | Cortex-A53      | #827319         | ARM64_ERRATUM_827319        |
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index b10515c0200b..78f20e632712 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -1037,6 +1037,19 @@ config ARM64_ERRATUM_2645198
+@@ -983,6 +983,19 @@ config ARM64_ERRATUM_2457168
  
          If unsure, say Y.
  
@@ -73,11 +69,9 @@ index b10515c0200b..78f20e632712 100644
  config CAVIUM_ERRATUM_22375
        bool "Cavium erratum 22375, 24313"
        default y
-diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
-index be66e94a21bd..5706e74c5578 100644
 --- a/arch/arm64/kernel/cpu_errata.c
 +++ b/arch/arm64/kernel/cpu_errata.c
-@@ -730,6 +730,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
+@@ -723,6 +723,14 @@ const struct arm64_cpu_capabilities arm6
                .cpu_enable = cpu_clear_bf16_from_user_emulation,
        },
  #endif
@@ -92,11 +86,9 @@ index be66e94a21bd..5706e74c5578 100644
  #ifdef CONFIG_AMPERE_ERRATUM_AC03_CPU_38
        {
                .desc = "AmpereOne erratum AC03_CPU_38",
-diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
-index 6ad61de03d0a..a6030913cd58 100644
 --- a/arch/arm64/kernel/entry.S
 +++ b/arch/arm64/kernel/entry.S
-@@ -428,6 +428,10 @@ alternative_else_nop_endif
+@@ -419,6 +419,10 @@ alternative_else_nop_endif
        ldp     x28, x29, [sp, #16 * 14]
  
        .if     \el == 0
@@ -107,18 +99,13 @@ index 6ad61de03d0a..a6030913cd58 100644
  alternative_if_not ARM64_UNMAP_KERNEL_AT_EL0
        ldr     lr, [sp, #S_LR]
        add     sp, sp, #PT_REGS_SIZE           // restore sp
-diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps
-index c3f06fdef609..dea3dc89234b 100644
 --- a/arch/arm64/tools/cpucaps
 +++ b/arch/arm64/tools/cpucaps
-@@ -84,6 +84,7 @@ WORKAROUND_2077057
+@@ -71,6 +71,7 @@ WORKAROUND_2064142
+ WORKAROUND_2077057
  WORKAROUND_2457168
- WORKAROUND_2645198
  WORKAROUND_2658417
 +WORKAROUND_2966298
  WORKAROUND_AMPERE_AC03_CPU_38
  WORKAROUND_TRBE_OVERWRITE_FILL_MODE
  WORKAROUND_TSB_FLUSH_FAILURE
--- 
-2.42.0
-