Commit 30f09200 authored Nov 25, 2025 by Linus Torvalds

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Will Deacon:
 "We've got a revert due to one of the recent CCA commits breaking ACPI
  firmware-based error reporting, a fix for a hard-lockup introduced by
  a prior fix affecting non-default (CONFIG_EXPERT) configurations and
  another ACPI fix for systems using MMIO-based timers.

  Other than that, we're looking pretty good.

   - Avoid hardlockup when CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=n

   - Fix regression in APEI/GHES error handling

   - Fix MMIO timers when probed via ACPI"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: proton-pack: Fix hard lockup when !MITIGATE_SPECTRE_BRANCH_HISTORY
  ACPI: GTDT: Correctly number platform devices for MMIO timers
  Revert "arm64: acpi: Enable ACPI CCEL support"

parents 5f8a6c70 165eb13e

arch/arm64/kernel/acpi.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -351,16 +351,6 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
		* as long as we take care not to create a writable
		* mapping for executable code.
		*/
		fallthrough;

		case EFI_ACPI_MEMORY_NVS:
		/*
		* ACPI NVS marks an area reserved for use by the
		* firmware, even after exiting the boot service.
		* This may be used by the firmware for sharing dynamic
		* tables/data (e.g., ACPI CCEL) with the OS. Map it
		* as read-only.
		*/
		prot = PAGE_KERNEL_RO;
		break;

arch/arm64/kernel/proton-pack.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1032,6 +1032,8 @@ void spectre_bhb_enable_mitigation(const struct arm64_cpu_capabilities *entry)

		if (arm64_get_spectre_v2_state() == SPECTRE_VULNERABLE) {
		/* No point mitigating Spectre-BHB alone. */
		} else if (!IS_ENABLED(CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY)) {
		/* Do nothing */
		} else if (supports_ecbhb(SCOPE_LOCAL_CPU)) {
		state = SPECTRE_MITIGATED;
		set_bit(BHB_HW, &system_bhb_mitigations);

drivers/acpi/arm64/gtdt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -430,10 +430,10 @@ static int __init gtdt_platform_timer_init(void)
		continue;

		pdev = platform_device_register_data(NULL, "gtdt-arm-mmio-timer",
		gwdt_count, &atm,
		mmio_timer_count, &atm,
		sizeof(atm));
		if (IS_ERR(pdev)) {
		pr_err("Can't register timer %d\n", gwdt_count);
		pr_err("Can't register timer %d\n", mmio_timer_count);
		continue;
		}