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 05/10] iommu/amd: Add function copy_dev_tables
Date: Thu, 24 Sep 2015 14:37:31 +0800 [thread overview]
Message-ID: <1443076656-31776-6-git-send-email-bhe@redhat.com> (raw)
In-Reply-To: <1443076656-31776-1-git-send-email-bhe@redhat.com>
Signed-off-by: Baoquan He <bhe@redhat.com>
---
drivers/iommu/amd_iommu_init.c | 26 ++++++++++++++++++++++++++
drivers/iommu/amd_iommu_types.h | 2 ++
2 files changed, 28 insertions(+)
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 1fc369e..913a718 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -690,6 +690,32 @@ static void iommu_enable_gt(struct amd_iommu *iommu)
iommu_feature_enable(iommu, CONTROL_GT_EN);
}
+static void copy_dev_tables(void)
+{
+ u64 entry;
+ u32 lo, hi;
+ phys_addr_t old_devtb_phys;
+ struct dev_table_entry *old_devtb;
+ struct amd_iommu *iommu;
+ u16 dom_id;
+ u32 devid;
+
+ for_each_iommu(iommu) {
+ lo = readl(iommu->mmio_base + MMIO_DEV_TABLE_OFFSET);
+ hi = readl(iommu->mmio_base + MMIO_DEV_TABLE_OFFSET + 4);
+ entry = (((u64) hi) << 32) + lo;
+ old_devtb_phys = entry & PAGE_MASK;
+ old_devtb = ioremap_cache(old_devtb_phys, dev_table_size);
+ for (devid = 0; devid <= amd_iommu_last_bdf; ++devid) {
+ amd_iommu_dev_table[devid] = old_devtb[devid];
+ dom_id = amd_iommu_dev_table[devid].data[1] & DEV_DOMID_MASK;
+ __set_bit(dom_id, amd_iommu_pd_alloc_bitmap);
+ }
+ iounmap(old_devtb);
+ }
+
+}
+
/* sets a specific bit in the device table entry. */
static void set_dev_entry_bit(u16 devid, u8 bit)
{
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index f659088..d0f0cfb 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -194,6 +194,8 @@
#define DEV_ENTRY_MODE_MASK 0x07
#define DEV_ENTRY_MODE_SHIFT 0x09
+#define DEV_DOMID_MASK 0xffff
+
#define MAX_DEV_TABLE_ENTRIES 0xffff
/* constants to configure the command buffer */
--
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 ` [PATCH 04/10] iommu/amd: Detect pre enabled translation Baoquan He
2015-09-24 6:37 ` Baoquan He [this message]
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-6-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