iommu/vt-d: Don't print the failure message when booting non-kdump kernel
When booting a new non-kdump kernel, we have below failure message: [ 0.004000] DMAR-IR: IRQ remapping was enabled on dmar2 but we are not in kdump mode [ 0.004000] DMAR-IR: Failed to copy IR table for dmar2 from previous kernel [ 0.004000] DMAR-IR: IRQ remapping was enabled on dmar1 but we are not in kdump mode [ 0.004000] DMAR-IR: Failed to copy IR table for dmar1 from previous kernel [ 0.004000] DMAR-IR: IRQ remapping was enabled on dmar0 but we are not in kdump mode [ 0.004000] DMAR-IR: Failed to copy IR table for dmar0 from previous kernel [ 0.004000] DMAR-IR: IRQ remapping was enabled on dmar3 but we are not in kdump mode [ 0.004000] DMAR-IR: Failed to copy IR table for dmar3 from previous kernel For non-kdump case, we no need to copy IR table from previous kernel so it's nonthing actually failed. To be less alarming or misleading, do not print "DMAR-IR: Failed to copy IR table for dmar[0-9] from previous kernel" messages when booting non-kdump kernel. Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
bfd20f1cc8
commit
8e12188400
|
@ -408,14 +408,6 @@ static int iommu_load_old_irte(struct intel_iommu *iommu)
|
||||||
size_t size;
|
size_t size;
|
||||||
u64 irta;
|
u64 irta;
|
||||||
|
|
||||||
if (!is_kdump_kernel()) {
|
|
||||||
pr_warn("IRQ remapping was enabled on %s but we are not in kdump mode\n",
|
|
||||||
iommu->name);
|
|
||||||
clear_ir_pre_enabled(iommu);
|
|
||||||
iommu_disable_irq_remapping(iommu);
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Check whether the old ir-table has the same size as ours */
|
/* Check whether the old ir-table has the same size as ours */
|
||||||
irta = dmar_readq(iommu->reg + DMAR_IRTA_REG);
|
irta = dmar_readq(iommu->reg + DMAR_IRTA_REG);
|
||||||
if ((irta & INTR_REMAP_TABLE_REG_SIZE_MASK)
|
if ((irta & INTR_REMAP_TABLE_REG_SIZE_MASK)
|
||||||
|
@ -567,7 +559,12 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)
|
||||||
init_ir_status(iommu);
|
init_ir_status(iommu);
|
||||||
|
|
||||||
if (ir_pre_enabled(iommu)) {
|
if (ir_pre_enabled(iommu)) {
|
||||||
if (iommu_load_old_irte(iommu))
|
if (!is_kdump_kernel()) {
|
||||||
|
pr_warn("IRQ remapping was enabled on %s but we are not in kdump mode\n",
|
||||||
|
iommu->name);
|
||||||
|
clear_ir_pre_enabled(iommu);
|
||||||
|
iommu_disable_irq_remapping(iommu);
|
||||||
|
} else if (iommu_load_old_irte(iommu))
|
||||||
pr_err("Failed to copy IR table for %s from previous kernel\n",
|
pr_err("Failed to copy IR table for %s from previous kernel\n",
|
||||||
iommu->name);
|
iommu->name);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue