AMD-vi: Mixed format IVHD block should replace fixed format IVHD block

[khng]

Summary

This fixes double IVHD_SETUP_INTR call on the same IOMMU device.

Sponsored by: The FreeBSD Foundation

[grehan]

Fixes the issue for me.

[philip]

Approved by: philip (mentor)

sys/amd64/vmm/amd/ivrs_drv.c

KASSERT((softc->end_dev_rid >= softc->start_dev_rid),
             softc->end_dev_rid, softc->start_dev_rid));
 
         return (0);
 }
 
 static bool
 ivhd_is_newer(ACPI_IVRS_HEADER *old, ACPI_IVRS_HEADER  *new)
 {
+        if (old->DeviceId == new->DeviceId) {
                 /*
                  * Newer IVRS header type take precedence.
                  */
-        if ((old->DeviceId == new->DeviceId) &&
-                (old->Type == IVRS_TYPE_HARDWARE_LEGACY) &&
-                ((new->Type == IVRS_TYPE_HARDWARE_EFR) ||
-                (new->Type == IVRS_TYPE_HARDWARE_MIXED))) {
+                if (old->Type == IVRS_TYPE_HARDWARE_LEGACY &&
+                    ((new->Type == IVRS_TYPE_HARDWARE_EFR) ||
+                    (new->Type == IVRS_TYPE_HARDWARE_MIXED)))
+                        return (true);
+
+                /*
+                 * Mixed format IVHD header type take precedence
+                 * over fixed format IVHD header types.
+                 */
+                if (old->Type == IVRS_TYPE_HARDWARE_EFR &&
+                    new->Type == IVRS_TYPE_HARDWARE_MIXED)
                         return (true);
         }
 
         return (false);
 }
 
 static void
 ivhd_identify(driver_t *driver, device_t parent)
 {