D29521.diff
No OneTemporary
Actions

Size

1009 B

Referenced Files

None

Subscribers

None

D29521.diff
View Options

	diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c
	--- a/sys/amd64/vmm/amd/ivrs_drv.c
	+++ b/sys/amd64/vmm/amd/ivrs_drv.c
	@@ -312,14 +312,22 @@
	static bool
	ivhd_is_newer(ACPI_IVRS_HEADER old, ACPI_IVRS_HEADER new)
	{
	- /*
	- * 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))) {
	- return (true);
	+ if (old->DeviceId == new->DeviceId) {
	+ /*
	+ * Newer IVRS header type take precedence.
	+ */
	+ 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);