From: Wan Zongshun <vw@iommu.org>
To: Baoquan He <bhe@redhat.com>, joro@8bytes.org
Cc: linux-kernel@vger.kernel.org, vincent.wan@amd.com,
iommu@lists.linux-foundation.org, dyoung@redhat.com,
Wan Zongshun <vw@iommu.org>
Subject: Re: [Patch v4 3/9] iommu/amd: Detect pre enabled translation
Date: Sat, 28 May 2016 20:49:46 +0800 [thread overview]
Message-ID: <3371fab6-b3db-6f4a-a1a1-b272c3f8fdbe@iommu.org> (raw)
In-Reply-To: <1464157735-8865-4-git-send-email-bhe@redhat.com>
-------- 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 {
>
next prev parent reply other threads:[~2016-05-28 13:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 6:28 [Patch v4 0/9] *** Fix kdump failure in system with amd iommu*** Baoquan He
2016-05-25 6:28 ` [Patch v4 1/9] iommu/amd: clean up the cmpxchg64 invocation Baoquan He
2016-05-25 6:28 ` [Patch v4 2/9] iommu/amd: Use standard bitmap operation to set bitmap Baoquan He
2016-05-25 6:28 ` [Patch v4 3/9] iommu/amd: Detect pre enabled translation Baoquan He
2016-05-28 12:49 ` Wan Zongshun [this message]
2016-05-30 3:24 ` Baoquan He
2016-05-30 3:27 ` Baoquan He
2016-05-25 6:28 ` [Patch v4 4/9] iommu/amd: add early_enable_iommu() helper function Baoquan He
2016-05-25 6:28 ` [Patch v4 5/9] iommu/amd: Define bit fields for DTE particularly Baoquan He
2016-05-25 6:28 ` [Patch v4 6/9] iommu/amd: Add function copy_dev_tables Baoquan He
2016-05-28 13:08 ` Wan Zongshun
2016-05-30 3:32 ` Baoquan He
2016-05-25 6:28 ` [Patch v4 7/9] iommu/amd: copy old trans table from old kernel Baoquan He
2016-05-28 13:25 ` Wan Zongshun
2016-05-25 6:28 ` [Patch v4 8/9] iommu/amd: Do not initialize dev tables again in kdump Baoquan He
2016-05-25 6:28 ` [Patch v4 9/9] iommu/amd: Check the validation of irq table and domain id Baoquan He
2016-05-28 13:30 ` Wan Zongshun
2016-05-30 5:10 ` Baoquan He
2016-05-25 7:02 ` [Patch v4 0/9] *** Fix kdump failure in system with amd iommu*** Baoquan He
2016-05-25 7:15 ` Baoquan He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3371fab6-b3db-6f4a-a1a1-b272c3f8fdbe@iommu.org \
--to=vw@iommu.org \
--cc=bhe@redhat.com \
--cc=dyoung@redhat.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vincent.wan@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).