git: a603d41aca48 - main - madt_setup_local: skip further checks if ACPI DMAR table already disabled x2APIC

[Konstantin Belousov]

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=a603d41aca48ff21df59967c55ddef181e16ec14

commit a603d41aca48ff21df59967c55ddef181e16ec14
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-06-02 22:01:28 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-06-03 19:47:31 +0000

    madt_setup_local: skip further checks if ACPI DMAR table already disabled x2APIC
    
    Reviewed by:    markj
    Tested by:      David Sebek <dasebek at gmail.com>
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D30624
---
 sys/x86/acpica/madt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c
index 5683f7eb321d..11c7b9de52d7 100644
--- a/sys/x86/acpica/madt.c
+++ b/sys/x86/acpica/madt.c
@@ -158,7 +158,9 @@ madt_setup_local(void)
 				reason = "by DMAR table";
 			acpi_unmap_table(dmartbl);
 		}
-		if (vm_guest == VM_GUEST_VMWARE) {
+		if (reason != NULL) {
+			/* Already disabled */
+		} else if (vm_guest == VM_GUEST_VMWARE) {
 			vmware_hvcall(VMW_HVCMD_GETVCPU_INFO, p);
 			if ((p[0] & VMW_VCPUINFO_VCPU_RESERVED) != 0 ||
 			    (p[0] & VMW_VCPUINFO_LEGACY_X2APIC) == 0)