summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Mills <gary_mills@fastmail.fm>2017-12-08 20:25:02 -0600
committerRobert Mustacchi <rm@joyent.com>2017-12-14 01:29:13 +0000
commitbea2d2b818ffe6739ebe3d447f51007733f518ce (patch)
treeef09c0f5ff328058bcdd4de7084f9f6a2aa8bc10
parent739415d128746863863f9005c1923d9f5dd397e4 (diff)
downloadillumos-joyent-bea2d2b818ffe6739ebe3d447f51007733f518ce.tar.gz
8902 Panic with debug kernel on AMD Ryzen hardware
Reviewed by: ken mays <maybird1776@yahoo.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Robert Mustacchi <rm@joyent.com>
-rw-r--r--usr/src/uts/i86pc/io/amd_iommu/amd_iommu_acpi.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/uts/i86pc/io/amd_iommu/amd_iommu_acpi.h b/usr/src/uts/i86pc/io/amd_iommu/amd_iommu_acpi.h
index c1e3e38b60..4768c536fb 100644
--- a/usr/src/uts/i86pc/io/amd_iommu/amd_iommu_acpi.h
+++ b/usr/src/uts/i86pc/io/amd_iommu/amd_iommu_acpi.h
@@ -19,6 +19,7 @@
* CDDL HEADER END
*/
/*
+ * Copyright 2017 Gary Mills
* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
*/
@@ -40,13 +41,16 @@ extern "C" {
#define IVRS_SIG "IVRS"
/*
- * IVINFO settings
+ * IVINFO bit fields
+ * Documented at: http://support.amd.com/TechDocs/48882_IOMMU.pdf
*/
#define AMD_IOMMU_ACPI_IVINFO_RSV1 (31 << 16 | 23)
#define AMD_IOMMU_ACPI_HT_ATSRSV (22 << 16 | 22)
#define AMD_IOMMU_ACPI_VA_SIZE (21 << 16 | 15)
#define AMD_IOMMU_ACPI_PA_SIZE (14 << 16 | 8)
-#define AMD_IOMMU_ACPI_IVINFO_RSV2 (7 << 16 | 0)
+#define AMD_IOMMU_ACPI_GVA_SIZE (7 << 16 | 5)
+#define AMD_IOMMU_ACPI_IVINFO_RSV2 (4 << 16 | 1)
+#define AMD_IOMMU_ACPI_IVINFO_EFRSUP (0 << 16 | 0)
/*
* IVHD Device entry len field