Skip to content

Commit 9238fa3

Browse files
committed
Revert "arm64: acpi: Enable ACPI CCEL support"
This reverts commit d02c2e4. Mauro reports that this breaks APEI notifications on his QEMU setup because the "reserved for firmware" region still needs to be writable by Linux in order to signal _back_ to the firmware after processing the reported error: | {1}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 1 | ... | [Firmware Warn]: GHES: Unhandled processor error type 0x02: cache error | Unable to handle kernel write to read-only memory at virtual address ffff800080035018 | Mem abort info: | ESR = 0x000000009600004f | EC = 0x25: DABT (current EL), IL = 32 bits | SET = 0, FnV = 0 | EA = 0, S1PTW = 0 | FSC = 0x0f: level 3 permission fault | Data abort info: | ISV = 0, ISS = 0x0000004f, ISS2 = 0x00000000 | CM = 0, WnR = 1, TnD = 0, TagAccess = 0 | GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 | swapper pgtable: 4k pages, 52-bit VAs, pgdp=00000000505d7000 | pgd=10000000510bc003, p4d=1000000100229403, pud=100000010022a403, pmd=100000010022b403, pte=0060000139b90483 | Internal error: Oops: 000000009600004f [#1] SMP For now, revert the offending commit. We can presumably switch back to PAGE_KERNEL when bringing this back in the future. Link: https://lore.kernel.org/r/[email protected] Reported-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent 8e8ae78 commit 9238fa3

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

arch/arm64/kernel/acpi.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -351,16 +351,6 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
351351
* as long as we take care not to create a writable
352352
* mapping for executable code.
353353
*/
354-
fallthrough;
355-
356-
case EFI_ACPI_MEMORY_NVS:
357-
/*
358-
* ACPI NVS marks an area reserved for use by the
359-
* firmware, even after exiting the boot service.
360-
* This may be used by the firmware for sharing dynamic
361-
* tables/data (e.g., ACPI CCEL) with the OS. Map it
362-
* as read-only.
363-
*/
364354
prot = PAGE_KERNEL_RO;
365355
break;
366356

0 commit comments

Comments
 (0)