Revert "x86-64/efi: Use EFI to deal with platform wall clock (again)"
This reverts commitbd52276fa1
("x86-64/efi: Use EFI to deal with platform wall clock (again)"), and the two supporting commits:da5a108d05
: "x86/kernel: remove tboot 1:1 page table creation code"185034e72d
: "x86, efi: 1:1 pagetable mapping for virtual EFI calls") as they all depend semantically on commit53b87cf088
("x86, mm: Include the entire kernel memory map in trampoline_pgd") that got reverted earlier due to the problems it caused. This was pointed out by Yinghai Lu, and verified by me on my Macbook Air that uses EFI. Pointed-out-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
@@ -919,13 +919,11 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,
|
||||
|
||||
/*
|
||||
* On success we use clflush, when the CPU supports it to
|
||||
* avoid the wbindv. If the CPU does not support it, in the
|
||||
* error case, and during early boot (for EFI) we fall back
|
||||
* to cpa_flush_all (which uses wbinvd):
|
||||
* avoid the wbindv. If the CPU does not support it and in the
|
||||
* error case we fall back to cpa_flush_all (which uses
|
||||
* wbindv):
|
||||
*/
|
||||
if (early_boot_irqs_disabled)
|
||||
__cpa_flush_all((void *)(long)cache);
|
||||
else if (!ret && cpu_has_clflush) {
|
||||
if (!ret && cpu_has_clflush) {
|
||||
if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) {
|
||||
cpa_flush_array(addr, numpages, cache,
|
||||
cpa.flags, pages);
|
||||
|
Reference in New Issue
Block a user