Page MenuHomeFreeBSD
Files F115929643

D34907.id104989.diff
No OneTemporary
Actions

D34907.id104989.diff
View Options

Index: sys/x86/iommu/intel_ctx.c
===================================================================
--- sys/x86/iommu/intel_ctx.c
+++ sys/x86/iommu/intel_ctx.c
@@ -631,10 +631,6 @@
* to avoid unneeded command.
*/
if (enable && !rmrr_init && (dmar->hw_gcmd & DMAR_GCMD_TE) == 0) {
- error = dmar_disable_protected_regions(dmar);
- if (error != 0)
- printf("dmar%d: Failed to disable protected regions\n",
- dmar->iommu.unit);
error = dmar_enable_translation(dmar);
if (error == 0) {
if (bootverbose) {
Index: sys/x86/iommu/intel_drv.c
===================================================================
--- sys/x86/iommu/intel_drv.c
+++ sys/x86/iommu/intel_drv.c
@@ -528,6 +528,10 @@
dmar_release_resources(dev, unit);
return (error);
}
+ error = dmar_disable_protected_regions(unit);
+ if (error != 0 && bootverbose)
+ device_printf(dev, "Failed to disable protected regions\n");
+
error = iommu_init_busdma(&unit->iommu);
if (error != 0) {
dmar_release_resources(dev, unit);
@@ -1065,10 +1069,6 @@
KASSERT((dmar->hw_gcmd & DMAR_GCMD_TE) == 0,
("dmar%d: RMRR not handled but translation is already enabled",
dmar->iommu.unit));
- error = dmar_disable_protected_regions(dmar);
- if (error != 0)
- printf("dmar%d: Failed to disable protected regions\n",
- dmar->iommu.unit);
error = dmar_enable_translation(dmar);
if (bootverbose) {
if (error == 0) {

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 1:17 PM (8 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17882370
Default Alt Text
D34907.id104989.diff (1 KB)

Event Timeline