diff options
| author | Baoquan He | 2017-08-09 10:33:33 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2017-08-15 18:14:38 +0200 |
| commit | 4c232a708be1047fe26b7c75ceaa5d73deb6a798 (patch) | |
| tree | 9f17a1d07337472b4113f4e050d1e2bd79c85950 /drivers/iommu/amd_iommu_init.c | |
| parent | Linux 4.13-rc5 (diff) | |
| download | kernel-qcow2-linux-4c232a708be1047fe26b7c75ceaa5d73deb6a798.tar.gz kernel-qcow2-linux-4c232a708be1047fe26b7c75ceaa5d73deb6a798.tar.xz kernel-qcow2-linux-4c232a708be1047fe26b7c75ceaa5d73deb6a798.zip | |
iommu/amd: Detect pre enabled translation
Add functions to check whether translation is already enabled in IOMMU.
Signed-off-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
| -rw-r--r-- | drivers/iommu/amd_iommu_init.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 372303700566..3f72f44fa2df 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -258,6 +258,25 @@ static int amd_iommu_enable_interrupts(void); static int __init iommu_go_to_state(enum iommu_init_state state); static void init_device_table_dma(void); +bool translation_pre_enabled(struct amd_iommu *iommu) +{ + return (iommu->flags & AMD_IOMMU_FLAG_TRANS_PRE_ENABLED); +} + +static void clear_translation_pre_enabled(struct amd_iommu *iommu) +{ + iommu->flags &= ~AMD_IOMMU_FLAG_TRANS_PRE_ENABLED; +} + +static void init_translation_status(struct amd_iommu *iommu) +{ + u32 ctrl; + + ctrl = readl(iommu->mmio_base + MMIO_CONTROL_OFFSET); + if (ctrl & (1<<CONTROL_IOMMU_EN)) + iommu->flags |= AMD_IOMMU_FLAG_TRANS_PRE_ENABLED; +} + static inline void update_last_devid(u16 devid) { if (devid > amd_iommu_last_bdf) @@ -1399,6 +1418,11 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) iommu->int_enabled = false; + init_translation_status(iommu); + + if (translation_pre_enabled(iommu)) + pr_warn("Translation is already enabled - trying to copy translation structures\n"); + ret = init_iommu_from_acpi(iommu, h); if (ret) return ret; |