diff options
| author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-01-06 10:18:24 +0400 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2014-01-09 15:43:45 +0400 |
| commit | cc05301fd54f3e166aedf24e39f6731c4dec0451 (patch) | |
| tree | 3c5baf4bc8037b6ef97ef72de9d370af7885bcfd /drivers/iommu/dmar.c | |
| parent | a84da70b7ba0c5236fccf25115acefc235ed65f9 (diff) | |
| download | linux-cc05301fd54f3e166aedf24e39f6731c4dec0451.tar.xz | |
iommu/vt-d: fix wrong return value of dmar_table_init()
If dmar_table_init() fails to detect DMAR table on the first call,
it will return wrong result on following calls because it always
sets dmar_table_initialized no matter if succeeds or fails to
detect DMAR table.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'drivers/iommu/dmar.c')
| -rw-r--r-- | drivers/iommu/dmar.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 726cfe296d99..753c7ecf66a8 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -472,24 +472,23 @@ int __init dmar_table_init(void) static int dmar_table_initialized; int ret; - if (dmar_table_initialized) - return 0; - - dmar_table_initialized = 1; - - ret = parse_dmar_table(); - if (ret) { - if (ret != -ENODEV) - pr_info("parse DMAR table failure.\n"); - return ret; - } + if (dmar_table_initialized == 0) { + ret = parse_dmar_table(); + if (ret < 0) { + if (ret != -ENODEV) + pr_info("parse DMAR table failure.\n"); + } else if (list_empty(&dmar_drhd_units)) { + pr_info("No DMAR devices found\n"); + ret = -ENODEV; + } - if (list_empty(&dmar_drhd_units)) { - pr_info("No DMAR devices found\n"); - return -ENODEV; + if (ret < 0) + dmar_table_initialized = ret; + else + dmar_table_initialized = 1; } - return 0; + return dmar_table_initialized < 0 ? dmar_table_initialized : 0; } static void warn_invalid_dmar(u64 addr, const char *message) |