From: Joerg Roedel <[email protected]> The RTT bit in the RTADDR_REG can not be changed while translation is enabled. So check its value if we boot into a kdump kernel and find translation enabled, and if it is different from what we would set it to, bail out and don't try to copy over the translation tables from the old kernel.
Signed-off-by: Joerg Roedel <[email protected]> --- drivers/iommu/intel-iommu.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 58abddb..08209c4 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -389,6 +389,7 @@ static void unmap_device_dma(struct dmar_domain *domain, struct device *dev, struct intel_iommu *iommu); static void iommu_check_pre_te_status(struct intel_iommu *iommu); +static bool iommu_check_rtt(struct intel_iommu *iommu); static u8 g_translation_pre_enabled; /* @@ -2917,9 +2918,11 @@ static int __init init_dmars(void) /* * We don't even try to preserve anything when we are not in a - * kdump kernel. + * kdump kernel or when we have to change the RTT bit in the + * RTADDR_REG. */ - if (!is_kdump_kernel() && iommu->pre_enabled_trans) { + if (iommu->pre_enabled_trans && + (!is_kdump_kernel() || iommu_check_rtt(iommu))) { iommu_disable_translation(iommu); iommu->pre_enabled_trans = 0; g_translation_pre_enabled = 0; @@ -5087,3 +5090,13 @@ static void iommu_check_pre_te_status(struct intel_iommu *iommu) g_translation_pre_enabled = 1; } } + +static bool iommu_check_rtt(struct intel_iommu *iommu) +{ + u64 rtaddr; + + rtaddr = dmar_readq(iommu->reg + DMAR_RTADDR_REG); + + return (!!ecap_ecs(iommu->ecap) != !!(rtaddr & DMA_RTADDR_RTT)); +} + -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
