lkml.org 
[lkml]   [2016]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [Patch v4 3/9] iommu/amd: Detect pre enabled translation
From
Date


-------- Original Message --------
> Add functions to check whether translation is already enabled in IOMMU.
>
> Signed-off-by: Baoquan He <bhe@redhat.com>
> ---
> drivers/iommu/amd_iommu_init.c | 25 +++++++++++++++++++++++++
> drivers/iommu/amd_iommu_types.h | 4 ++++
> 2 files changed, 29 insertions(+)
>
> diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
> index 8361367d..9e1dfcb 100644
> --- a/drivers/iommu/amd_iommu_init.c
> +++ b/drivers/iommu/amd_iommu_init.c
> @@ -229,6 +229,26 @@ 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);
>
> +
> +static 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 int iommu_pc_get_set_reg_val(struct amd_iommu *iommu,
> u8 bank, u8 cntr, u8 fxn,
> u64 *value, bool is_write);
> @@ -1101,6 +1121,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())
> + pr_warn("Translation is already enabled - trying to copy translation structures\n");
> +

You missed this 'iommu' parameter here, even I saw you fixed it in
another patch, but please keep each patch to be meaningful.

> ret = init_iommu_from_acpi(iommu, h);
> if (ret)
> return ret;
> diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
> index 9d32b20..01783cc 100644
> --- a/drivers/iommu/amd_iommu_types.h
> +++ b/drivers/iommu/amd_iommu_types.h
> @@ -384,6 +384,7 @@ extern struct kmem_cache *amd_iommu_irq_cache;
> #define APERTURE_PAGE_INDEX(a) (((a) >> 21) & 0x3fULL)
>
>
> +
> /*
> * This struct is used to pass information about
> * incoming PPR faults around.
> @@ -401,6 +402,8 @@ struct amd_iommu_fault {
> struct iommu_domain;
> struct irq_domain;
>
> +#define AMD_IOMMU_FLAG_TRANS_PRE_ENABLED (1 << 0)
> +
> /*
> * This structure contains generic data for IOMMU protection domains
> * independent of their use.
> @@ -525,6 +528,7 @@ struct amd_iommu {
> struct irq_domain *ir_domain;
> struct irq_domain *msi_domain;
> #endif
> + u32 flags;
> };
>
> struct devid_map {
>

\
 
 \ /
  Last update: 2016-05-28 15:21    [W:0.067 / U:0.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site