Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62a3207b authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE 



On 32 bits, we can have CONFIG_ACPI_SLEEP set without implying
CONFIG_X86_TRAMPOLINE.  In that case, we simply do not need to mark
the trampoline as a MAC region.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Shane Wang <shane.wang@intel.com>
Cc: Joseph Cihula <joseph.cihula@intel.com>
parent 3c556e41

arch/x86/kernel/tboot.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -189,8 +189,12 @@ static int tboot_setup_sleep(void) 




	/* S3 resume code */

	/* S3 resume code */

	add_mac_region(acpi_wakeup_address, WAKEUP_SIZE);

	add_mac_region(acpi_wakeup_address, WAKEUP_SIZE);



#ifdef CONFIG_X86_TRAMPOLINE

	/* AP trampoline code */

	/* AP trampoline code */

	add_mac_region(virt_to_phys(trampoline_base), TRAMPOLINE_SIZE);

	add_mac_region(virt_to_phys(trampoline_base), TRAMPOLINE_SIZE);

#endif



	/* kernel code + data + bss */

	/* kernel code + data + bss */

	add_mac_region(virt_to_phys(_text), _end - _text);

	add_mac_region(virt_to_phys(_text), _end - _text);