iommu/vt-d: Disable translation if already enabled
authorTakao Indoh <indou.takao@jp.fujitsu.com>
Tue, 23 Apr 2013 08:35:03 +0000 (17:35 +0900)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 6 Aug 2014 17:07:42 +0000 (18:07 +0100)
commit73f98b0930b1871bbf515aa4abc2484f2d5095b4
tree8785d3e5edd65e33ec551dfd99dfb6cf65921d11
parentdc79279294628d41b32e86b2e0e2a850ee67dd95
iommu/vt-d: Disable translation if already enabled

commit 3a93c841c2b3b14824f7728dd74bd00a1cedb806 upstream.

This patch disables translation(dma-remapping) before its initialization
if it is already enabled.

This is needed for kexec/kdump boot. If dma-remapping is enabled in the
first kernel, it need to be disabled before initializing its page table
during second kernel boot. Wei Hu also reported that this is needed
when second kernel boots with intel_iommu=off.

Basically iommu->gcmd is used to know whether translation is enabled or
disabled, but it is always zero at boot time even when translation is
enabled since iommu->gcmd is initialized without considering such a
case. Therefor this patch synchronizes iommu->gcmd value with global
command register when iommu structure is allocated.

Signed-off-by: Takao Indoh <indou.takao@jp.fujitsu.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
[wyj: Backported to 3.4: adjust context]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/iommu/dmar.c
drivers/iommu/intel-iommu.c