openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/dmar: Rectify return code handling in detect_intel_iommu() 

There is inconsistency in return codes across the functions called from
detect_intel_iommu().

Make it consistent and propagate return code to the caller.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Andy Shevchenko 2017-03-16 16:23:51 +02:00 committed by Joerg Roedel
parent 97da3854c5
commit 8326c5d205
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/iommu/dmar.c
View File

@ -551,7 +551,7 @@ static int __init dmar_table_detect(void)
status = AE_NOT_FOUND; status = AE_NOT_FOUND;
} }
return (ACPI_SUCCESS(status) ? 1 : 0); return ACPI_SUCCESS(status) ? 0 : -ENOENT;
} }
static int dmar_walk_remapping_entries(struct acpi_dmar_header *start, static int dmar_walk_remapping_entries(struct acpi_dmar_header *start,
@ -891,17 +891,17 @@ int __init detect_intel_iommu(void)
down_write(&dmar_global_lock); down_write(&dmar_global_lock);
ret = dmar_table_detect(); ret = dmar_table_detect();
if (ret) if (!ret)
ret = !dmar_walk_dmar_table((struct acpi_table_dmar *)dmar_tbl, ret = dmar_walk_dmar_table((struct acpi_table_dmar *)dmar_tbl,
&validate_drhd_cb); &validate_drhd_cb);
if (ret && !no_iommu && !iommu_detected && !dmar_disabled) { if (!ret && !no_iommu && !iommu_detected && !dmar_disabled) {
iommu_detected = 1; iommu_detected = 1;
/* Make sure ACS will be enabled */ /* Make sure ACS will be enabled */
pci_request_acs(); pci_request_acs();
} }
#ifdef CONFIG_X86 #ifdef CONFIG_X86
if (ret) if (!ret)
x86_init.iommu.iommu_init = intel_iommu_init; x86_init.iommu.iommu_init = intel_iommu_init;
#endif #endif
@ -911,10 +911,9 @@ int __init detect_intel_iommu(void)
} }
up_write(&dmar_global_lock); up_write(&dmar_global_lock);
return ret ? 1 : -ENODEV; return ret ? ret : 1;
} }
static void unmap_iommu(struct intel_iommu *iommu) static void unmap_iommu(struct intel_iommu *iommu)
{ {
iounmap(iommu->reg); iounmap(iommu->reg);