From 9f1c9d188c1db2c4cc6ea462d85e5ea19fa8c62f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 8 Apr 2024 12:45:05 +0200 Subject: [PATCH] 6.8-stable patches added patches: revert-x86-mpparse-register-apic-address-only-once.patch --- ...arse-register-apic-address-only-once.patch | 43 +++++++++++++++++++ queue-6.8/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-6.8/revert-x86-mpparse-register-apic-address-only-once.patch diff --git a/queue-6.8/revert-x86-mpparse-register-apic-address-only-once.patch b/queue-6.8/revert-x86-mpparse-register-apic-address-only-once.patch new file mode 100644 index 00000000000..5d1e93510a2 --- /dev/null +++ b/queue-6.8/revert-x86-mpparse-register-apic-address-only-once.patch @@ -0,0 +1,43 @@ +From 77a1e7b046bb70fc1214cd6965399ef5490dd9a6 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Mon, 8 Apr 2024 12:42:06 +0200 +Subject: Revert "x86/mpparse: Register APIC address only once" + +From: Greg Kroah-Hartman + +This reverts commit 3428faa0d675f6a6284331731b762dc041011b3c which is +commit f2208aa12c27bfada3c15c550c03ca81d42dcac2 upstream. + +It is reported to cause problems in the stable branches, so revert it. + +Link: https://lore.kernel.org/r/899b7c1419a064a2b721b78eade06659@stwm.de +Reported-by: Wolfgang Walter +Cc: Thomas Gleixner +Cc: Borislav Petkov (AMD) +Cc: Guenter Roeck +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kernel/mpparse.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/arch/x86/kernel/mpparse.c ++++ b/arch/x86/kernel/mpparse.c +@@ -196,12 +196,12 @@ static int __init smp_read_mpc(struct mp + if (!smp_check_mpc(mpc, oem, str)) + return 0; + +- if (early) { +- /* Initialize the lapic mapping */ +- if (!acpi_lapic) +- register_lapic_address(mpc->lapic); ++ /* Initialize the lapic mapping */ ++ if (!acpi_lapic) ++ register_lapic_address(mpc->lapic); ++ ++ if (early) + return 1; +- } + + /* Now process the configuration blocks. */ + while (count < mpc->length) { diff --git a/queue-6.8/series b/queue-6.8/series index 329dd407ce8..ae58f373d9f 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -266,3 +266,4 @@ drm-i915-gt-do-not-generate-the-command-streamer-for-all-the-ccs.patch drm-i915-gt-enable-only-one-ccs-for-compute-workload.patch drm-xe-use-ring-ops-tlb-invalidation-for-rebinds.patch drm-xe-rework-rebinding.patch +revert-x86-mpparse-register-apic-address-only-once.patch -- 2.47.3