From: Zhenzhong Duan Date: Fri, 7 Sep 2018 07:27:19 +0000 (+0200) Subject: x86/dmar: zap DMAR signature for dom0 once in TBOOT case X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3310 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e3ad5e23bf74f9eb6cf5a57432d8059e60e51992;p=xen.git x86/dmar: zap DMAR signature for dom0 once in TBOOT case Commit 6c298ecc1f ("vtd: Reinstate ACPI DMAR on system shutdown or S3/S4/S5") did everything for acpi_dmar_zap() call to be unnecessary, except for invoking the function from acpi_parse_dmar(), which 123c779379 ("VTd/dmar: Tweak how the DMAR table is clobbered") added several years later. Some stale comments are also removed, No functional change. Signed-off-by: Zhenzhong Duan --- diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index d5a5292d7e..1006f957fb 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -461,8 +461,6 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) if ( txt_heap_base == 0 ) return 1; - /* map TXT heap into Xen addr space */ - /* walk heap to SinitMleData */ pa = txt_heap_base; /* skip BiosData */ @@ -490,10 +488,6 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler) rc = dmar_handler(dmar_table); xfree(dmar_table); - /* acpi_parse_dmar() zaps APCI DMAR signature in TXT heap table */ - /* but dom0 will read real table, so must zap it there too */ - acpi_dmar_zap(); - return rc; }