From: Baoquan He <bhe@redhat.com>
To: joro@8bytes.org, iommu@lists.linux-foundation.org
Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org,
Baoquan He <bhe@redhat.com>
Subject: [PATCH 04/10] iommu/amd: Detect pre enabled translation
Date: Thu, 24 Sep 2015 14:37:30 +0800 [thread overview]
Message-ID: <1443076656-31776-5-git-send-email-bhe@redhat.com> (raw)
In-Reply-To: <1443076656-31776-1-git-send-email-bhe@redhat.com>
Add functions to check whether translation is already enabled in IOMMU.
Maybe it need be checked per IOMMU. Currently for debugging I didn't do
like that.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
drivers/iommu/amd_iommu_init.c | 26 ++++++++++++++++++++++++++
drivers/iommu/amd_iommu_proto.h | 4 ++++
2 files changed, 30 insertions(+)
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 5845918..1fc369e 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -229,6 +229,27 @@ 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 u8 g_pre_enabled;
+
+bool translation_pre_enabled(void)
+{
+ return !!g_pre_enabled;
+}
+
+void clear_translation_pre_enabled(void)
+{
+ g_pre_enabled = 0;
+}
+
+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))
+ g_pre_enabled = 1;
+}
+
static inline void update_last_devid(u16 devid)
{
if (devid > amd_iommu_last_bdf)
@@ -1142,6 +1163,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");
+
ret = init_iommu_from_acpi(iommu, h);
if (ret)
return ret;
diff --git a/drivers/iommu/amd_iommu_proto.h b/drivers/iommu/amd_iommu_proto.h
index 0bd9eb3..743e209 100644
--- a/drivers/iommu/amd_iommu_proto.h
+++ b/drivers/iommu/amd_iommu_proto.h
@@ -98,4 +98,8 @@ static inline bool iommu_feature(struct amd_iommu *iommu, u64 f)
return !!(iommu->features & f);
}
+/* kdump checking */
+extern bool translation_pre_enabled(void);
+extern void clear_translation_pre_enabled(void);
+
#endif /* _ASM_X86_AMD_IOMMU_PROTO_H */
--
2.4.0
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2015-09-24 6:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-24 6:37 [PATCH 00/10] Fix AMD IOMMU faults in kdump kernel Baoquan He
2015-09-24 6:37 ` [PATCH 01/10] iommu/amd: Use standard bitmap operation to set bitmap Baoquan He
2015-09-24 6:37 ` [PATCH 02/10] iommu/amd: Adjust functons which get first/last devid by reading pci config Baoquan He
2015-09-24 6:37 ` [PATCH 03/10] iommu/amd: Get the first/last device of iommu earlier Baoquan He
2015-09-24 6:37 ` Baoquan He [this message]
2015-09-24 6:37 ` [PATCH 05/10] iommu/amd: Add function copy_dev_tables Baoquan He
2015-09-24 6:37 ` [PATCH 06/10] iommu/amd: Add functions copy_command_buffer/copy_event_buffer Baoquan He
[not found] ` <20150929160439.GN3036@8bytes.org>
2015-10-10 12:24 ` Baoquan He
2015-09-24 6:37 ` [PATCH 07/10] iommu/amd: copy old dev tables and do not touch dev tables Baoquan He
[not found] ` <20150929160808.GO3036@8bytes.org>
2015-10-10 12:28 ` Baoquan He
2015-09-24 6:37 ` [PATCH 08/10] iommu/amd: Do not update the information of domain to devtables before device driver init Baoquan He
2015-09-24 6:37 ` [PATCH 09/10] iommu/amd: Clear the iommu pre enabled setting Baoquan He
[not found] ` <20150929160949.GP3036@8bytes.org>
2015-10-10 12:30 ` Baoquan He
2015-09-24 6:37 ` [PATCH 10/10] iommu/amd: Copy the old ir table Baoquan He
[not found] ` <20150929161140.GQ3036@8bytes.org>
2015-10-10 12:40 ` 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=1443076656-31776-5-git-send-email-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/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