Functions to copy the irte data from the old kernel into the kdump kernel. Signed-off-by: Li, Zhen-Hua <zhen-hual@xxxxxx> --- drivers/iommu/intel_irq_remapping.c | 68 +++++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 4 +++ 2 files changed, 72 insertions(+) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 14de1ab..e6426a0 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -17,6 +17,10 @@ #include "irq_remapping.h" +static int __iommu_load_old_irte(struct intel_iommu *iommu); +static int __iommu_update_old_irte(struct intel_iommu *iommu, int index); +static void iommu_check_pre_ir_status(struct intel_iommu *iommu); + struct ioapic_scope { struct intel_iommu *iommu; unsigned int id; @@ -1302,3 +1306,67 @@ int dmar_ir_hotplug(struct dmar_drhd_unit *dmaru, bool insert) return ret; } + +static int __iommu_load_old_irte(struct intel_iommu *iommu) +{ + if ((!iommu) + || (!iommu->ir_table) + || (!iommu->ir_table->base) + || (!iommu->ir_table->base_old_phys) + || (!iommu->ir_table->base_old_virt)) + return -1; + + memcpy(iommu->ir_table->base, + iommu->ir_table->base_old_virt, + INTR_REMAP_TABLE_ENTRIES*sizeof(struct irte)); + + __iommu_flush_cache(iommu, iommu->ir_table->base, + INTR_REMAP_TABLE_ENTRIES*sizeof(struct irte)); + + return 0; +} + +static int __iommu_update_old_irte(struct intel_iommu *iommu, int index) +{ + int start; + unsigned long size; + void __iomem *to; + void *from; + + if ((!iommu) + || (!iommu->ir_table) + || (!iommu->ir_table->base) + || (!iommu->ir_table->base_old_phys) + || (!iommu->ir_table->base_old_virt)) + return -1; + + if (index < -1 || index >= INTR_REMAP_TABLE_ENTRIES) + return -1; + + if (index == -1) { + start = 0; + size = INTR_REMAP_TABLE_ENTRIES * sizeof(struct irte); + } else { + start = index * sizeof(struct irte); + size = sizeof(struct irte); + } + + to = iommu->ir_table->base_old_virt; + from = iommu->ir_table->base; + memcpy(to + start, from + start, size); + + __iommu_flush_cache(iommu, to + start, size); + + return 0; +} + +static void iommu_check_pre_ir_status(struct intel_iommu *iommu) +{ + u32 sts; + + sts = readl(iommu->reg + DMAR_GSTS_REG); + if (sts & DMA_GSTS_IRES) { + pr_info("IR is enabled prior to OS.\n"); + iommu->pre_enabled_ir = 1; + } +} diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 9ca025a..d7ee5ba 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -289,6 +289,8 @@ struct q_inval { struct ir_table { struct irte *base; unsigned long *bitmap; + void __iomem *base_old_virt; + unsigned long base_old_phys; }; #endif @@ -330,6 +332,8 @@ struct intel_iommu { /* whether translation is enabled prior to OS*/ u8 pre_enabled_trans; + /* whether interrupt remapping is enabled prior to OS*/ + u8 pre_enabled_ir; void __iomem *root_entry_old_virt; /* mapped from old root entry */ unsigned long root_entry_old_phys; /* root entry in old kernel */ -- 2.0.0-rc0 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html