From: Joerg Roedel <joerg.roedel@amd.com>
To: tglx@linutronix.de, mingo@redhat.com
Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
bhavna.sarathy@amd.com, Sebastian.Biemueller@amd.com,
robert.richter@amd.com, joro@8bytes.org,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 20/34] AMD IOMMU: add functions to initialize unity mappings
Date: Thu, 26 Jun 2008 21:27:56 +0200 [thread overview]
Message-ID: <1214508490-29683-21-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1214508490-29683-1-git-send-email-joerg.roedel@amd.com>
This patch adds the functions which will initialize the unity mappings in the
device page tables.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/x86/kernel/amd_iommu.c | 122 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index a24ee4a..1d70f5e 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -37,6 +37,9 @@ struct command {
u32 data[4];
};
+static int dma_ops_unity_map(struct dma_ops_domain *dma_dom,
+ struct unity_map_entry *e);
+
static int __iommu_queue_command(struct amd_iommu *iommu, struct command *cmd)
{
u32 tail, head;
@@ -144,3 +147,122 @@ static int iommu_flush_pages(struct amd_iommu *iommu, u16 domid,
return 0;
}
+static int iommu_map(struct protection_domain *dom,
+ unsigned long bus_addr,
+ unsigned long phys_addr,
+ int prot)
+{
+ u64 __pte, *pte, *page;
+
+ bus_addr = PAGE_ALIGN(bus_addr);
+ phys_addr = PAGE_ALIGN(bus_addr);
+
+ /* only support 512GB address spaces for now */
+ if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK))
+ return -EINVAL;
+
+ pte = &dom->pt_root[IOMMU_PTE_L2_INDEX(bus_addr)];
+
+ if (!IOMMU_PTE_PRESENT(*pte)) {
+ page = (u64 *)get_zeroed_page(GFP_KERNEL);
+ if (!page)
+ return -ENOMEM;
+ *pte = IOMMU_L2_PDE(virt_to_phys(page));
+ }
+
+ pte = IOMMU_PTE_PAGE(*pte);
+ pte = &pte[IOMMU_PTE_L1_INDEX(bus_addr)];
+
+ if (!IOMMU_PTE_PRESENT(*pte)) {
+ page = (u64 *)get_zeroed_page(GFP_KERNEL);
+ if (!page)
+ return -ENOMEM;
+ *pte = IOMMU_L1_PDE(virt_to_phys(page));
+ }
+
+ pte = IOMMU_PTE_PAGE(*pte);
+ pte = &pte[IOMMU_PTE_L0_INDEX(bus_addr)];
+
+ if (IOMMU_PTE_PRESENT(*pte))
+ return -EBUSY;
+
+ __pte = phys_addr | IOMMU_PTE_P;
+ if (prot & IOMMU_PROT_IR)
+ __pte |= IOMMU_PTE_IR;
+ if (prot & IOMMU_PROT_IW)
+ __pte |= IOMMU_PTE_IW;
+
+ *pte = __pte;
+
+ return 0;
+}
+
+static int iommu_for_unity_map(struct amd_iommu *iommu,
+ struct unity_map_entry *entry)
+{
+ u16 bdf, i;
+
+ for (i = entry->devid_start; i <= entry->devid_end; ++i) {
+ bdf = amd_iommu_alias_table[i];
+ if (amd_iommu_rlookup_table[bdf] == iommu)
+ return 1;
+ }
+
+ return 0;
+}
+
+static int iommu_init_unity_mappings(struct amd_iommu *iommu)
+{
+ struct unity_map_entry *entry;
+ int ret;
+
+ list_for_each_entry(entry, &amd_iommu_unity_map, list) {
+ if (!iommu_for_unity_map(iommu, entry))
+ continue;
+ ret = dma_ops_unity_map(iommu->default_dom, entry);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+static int dma_ops_unity_map(struct dma_ops_domain *dma_dom,
+ struct unity_map_entry *e)
+{
+ u64 addr;
+ int ret;
+
+ for (addr = e->address_start; addr < e->address_end;
+ addr += PAGE_SIZE) {
+ ret = iommu_map(&dma_dom->domain, addr, addr, e->prot);
+ if (ret)
+ return ret;
+ /*
+ * if unity mapping is in aperture range mark the page
+ * as allocated in the aperture
+ */
+ if (addr < dma_dom->aperture_size)
+ __set_bit(addr >> PAGE_SHIFT, dma_dom->bitmap);
+ }
+
+ return 0;
+}
+
+static int init_unity_mappings_for_device(struct dma_ops_domain *dma_dom,
+ u16 devid)
+{
+ struct unity_map_entry *e;
+ int ret;
+
+ list_for_each_entry(e, &amd_iommu_unity_map, list) {
+ if (!(devid >= e->devid_start && devid <= e->devid_end))
+ continue;
+ ret = dma_ops_unity_map(dma_dom, e);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
--
1.5.3.7
next prev parent reply other threads:[~2008-06-26 19:39 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-26 19:27 [PATCH 00/34] AMD IOMMU driver Joerg Roedel
2008-06-26 19:27 ` [PATCH 01/34] AMD IOMMU: add Kconfig entry Joerg Roedel
2008-06-27 14:25 ` Adrian Bunk
2008-06-27 14:47 ` Andi Kleen
2008-06-27 16:39 ` Muli Ben-Yehuda
2008-06-27 16:54 ` Joerg Roedel
2008-06-27 16:59 ` Muli Ben-Yehuda
2008-06-27 17:05 ` Joerg Roedel
2008-06-27 17:12 ` Muli Ben-Yehuda
2008-06-27 17:20 ` Joerg Roedel
2008-06-27 17:31 ` Muli Ben-Yehuda
2008-06-27 17:40 ` Joerg Roedel
2008-06-27 17:44 ` Muli Ben-Yehuda
2008-06-27 17:52 ` Joerg Roedel
2008-07-02 5:45 ` Amit Shah
2008-07-02 8:12 ` Alan Cox
2008-06-27 20:39 ` Duran, Leo
2008-06-27 22:29 ` Muli Ben-Yehuda
2008-06-27 22:47 ` Duran, Leo
2008-06-28 11:04 ` Joerg Roedel
2008-06-28 14:40 ` Duran, Leo
2008-06-28 16:27 ` Joerg Roedel
2008-06-28 14:58 ` Duran, Leo
2008-06-27 18:54 ` Andi Kleen
2008-06-28 10:52 ` Joerg Roedel
2008-06-27 16:40 ` Joerg Roedel
2008-07-08 12:45 ` Pavel Machek
2008-07-09 8:48 ` Ingo Molnar
2008-07-10 0:50 ` FUJITA Tomonori
2008-07-10 8:44 ` Ingo Molnar
2008-06-26 19:27 ` [PATCH 02/34] AMD IOMMU: add header file for driver data structures and defines Joerg Roedel
2008-06-29 15:07 ` FUJITA Tomonori
2008-06-29 15:14 ` Joerg Roedel
2008-06-29 23:11 ` FUJITA Tomonori
2008-06-30 12:22 ` Ingo Molnar
2008-07-10 1:38 ` Andrew Morton
2008-07-10 1:50 ` Arjan van de Ven
2008-07-10 2:36 ` Andrew Morton
2008-07-10 12:12 ` Joerg Roedel
2008-07-10 12:59 ` Andrew Morton
2008-06-26 19:27 ` [PATCH 03/34] AMD IOMMU: add defines and structures for ACPI scanning code Joerg Roedel
2008-07-10 1:41 ` Andrew Morton
2008-07-10 12:17 ` Joerg Roedel
2008-06-26 19:27 ` [PATCH 04/34] AMD IOMMU: add data structures to manage the IOMMUs in the system Joerg Roedel
2008-07-10 1:43 ` Andrew Morton
2008-07-10 12:25 ` Joerg Roedel
2008-06-26 19:27 ` [PATCH 05/34] AMD IOMMU: add functions to find last possible PCI device for IOMMU Joerg Roedel
2008-06-26 19:27 ` [PATCH 06/34] AMD IOMMU: add amd_iommu_init.c to Makefile Joerg Roedel
2008-06-26 19:27 ` [PATCH 07/34] AMD IOMMU: add functions for mapping/unmapping the MMIO space Joerg Roedel
2008-06-26 19:27 ` [PATCH 08/34] AMD IOMMU: add functions for programming IOMMU " Joerg Roedel
2008-06-26 19:27 ` [PATCH 09/34] AMD IOMMU: add command buffer (de-)allocation Joerg Roedel
2008-07-10 1:47 ` Andrew Morton
2008-06-26 19:27 ` [PATCH 10/34] AMD IOMMU: add device table initialization functions Joerg Roedel
2008-06-26 19:27 ` [PATCH 11/34] AMD IOMMU: add functions for IOMMU hardware initialization from ACPI Joerg Roedel
2008-07-10 1:49 ` Andrew Morton
2008-06-26 19:27 ` [PATCH 12/34] AMD IOMMU: add detect code for AMD IOMMU hardware Joerg Roedel
2008-07-10 1:51 ` Andrew Morton
2008-06-26 19:27 ` [PATCH 13/34] AMD IOMMU: add functions to parse IOMMU memory mapping requirements for devices Joerg Roedel
2008-07-10 1:51 ` Andrew Morton
2008-06-26 19:27 ` [PATCH 14/34] AMD IOMMU: clue initialization code together Joerg Roedel
2008-07-10 1:55 ` Andrew Morton
2008-07-10 12:37 ` Joerg Roedel
2008-07-10 13:03 ` Andrew Morton
2008-07-10 13:31 ` Joerg Roedel
2008-07-10 18:37 ` Joerg Roedel
2008-06-26 19:27 ` [PATCH 15/34] AMD IOMMU: add early detection code Joerg Roedel
2008-06-26 19:27 ` [PATCH 16/34] AMD IOMMU: add kernel command line parameters for AMD IOMMU Joerg Roedel
2008-07-10 1:56 ` Andrew Morton
2008-07-10 4:25 ` FUJITA Tomonori
2008-07-10 4:39 ` Andrew Morton
2008-07-10 6:26 ` Ingo Molnar
2008-07-10 20:42 ` Randy Dunlap
2008-07-14 23:56 ` FUJITA Tomonori
2008-07-10 7:04 ` Yinghai Lu
2008-07-10 12:41 ` Joerg Roedel
2008-06-26 19:27 ` [PATCH 17/34] AMD IOMMU: add generic defines and structures for mapping code Joerg Roedel
2008-07-10 2:01 ` Andrew Morton
2008-07-10 2:38 ` Andrew Morton
2008-07-10 4:25 ` FUJITA Tomonori
2008-07-10 12:44 ` Joerg Roedel
2008-06-26 19:27 ` [PATCH 18/34] AMD IOMMU: add amd_iommu.c to Makefile Joerg Roedel
2008-06-26 19:27 ` [PATCH 19/34] AMD IOMMU: add functions to send IOMMU commands Joerg Roedel
2008-07-10 2:04 ` Andrew Morton
2008-07-10 12:53 ` Joerg Roedel
2008-06-26 19:27 ` Joerg Roedel [this message]
2008-06-26 19:27 ` [PATCH 21/34] AMD IOMMU: add address allocation and deallocation functions Joerg Roedel
2008-06-29 15:07 ` FUJITA Tomonori
2008-06-29 15:17 ` Joerg Roedel
2008-06-29 23:11 ` FUJITA Tomonori
2008-06-26 19:27 ` [PATCH 22/34] AMD IOMMU: add domain " Joerg Roedel
2008-07-10 2:14 ` Andrew Morton
2008-07-10 12:54 ` Joerg Roedel
2008-06-26 19:27 ` [PATCH 23/34] AMD IOMMU: add functions to find IOMMU device resources Joerg Roedel
2008-07-10 2:18 ` Andrew Morton
2008-07-10 16:46 ` Joerg Roedel
2008-07-10 23:59 ` Andrew Morton
2008-06-26 19:28 ` [PATCH 24/34] AMD IOMMU: add generic dma_ops mapping functions Joerg Roedel
2008-06-26 19:28 ` [PATCH 25/34] AMD IOMMU: add dma_ops mapping functions for single mappings Joerg Roedel
2008-07-10 2:26 ` Andrew Morton
2008-07-10 13:20 ` Joerg Roedel
2008-06-26 19:28 ` [PATCH 26/34] AMD IOMMU: add mapping functions for scatter gather lists Joerg Roedel
2008-06-29 15:07 ` FUJITA Tomonori
2008-06-30 13:25 ` Joerg Roedel
2008-06-26 19:28 ` [PATCH 27/34] AMD IOMMU: add mapping functions for coherent mappings Joerg Roedel
2008-06-26 19:28 ` [PATCH 28/34] AMD IOMMU: add pre-allocation of protection domains Joerg Roedel
2008-06-26 19:28 ` [PATCH 29/34] AMD IOMMU: add dma_ops initialization function Joerg Roedel
2008-06-26 19:28 ` [PATCH 30/34] AMD IOMMU: add amd_iommu.h to export functions to the generic x86 dma code Joerg Roedel
2008-06-26 19:28 ` [PATCH 31/34] AMD IOMMU: initialize dma_ops from IOMMU initialization and enable IOMMUs Joerg Roedel
2008-06-26 19:28 ` [PATCH 32/34] AMD_IOMMU: call detect and initialization functions from dma code Joerg Roedel
2008-06-26 19:28 ` [PATCH 33/34] AMD IOMMU: add MAINTAINERS entry Joerg Roedel
2008-06-26 19:28 ` [PATCH 34/34] AMD IOMMU: add documentation for kernel parameters Joerg Roedel
2008-06-29 15:07 ` FUJITA Tomonori
2008-06-30 12:25 ` Ingo Molnar
2008-06-26 20:37 ` [PATCH 00/34] AMD IOMMU driver Rafael J. Wysocki
2008-06-26 20:37 ` Joerg Roedel
2008-06-26 21:02 ` Rafael J. Wysocki
2008-06-27 8:18 ` Ingo Molnar
2008-06-27 10:07 ` Ingo Molnar
2008-06-27 10:15 ` Joerg Roedel
2008-06-27 10:59 ` Joerg Roedel
2008-07-11 10:22 ` Eric W. Biederman
2008-07-11 14:11 ` Joerg Roedel
2008-07-11 16:23 ` Duran, Leo
2008-07-11 17:20 ` Eric W. Biederman
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=1214508490-29683-21-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.com \
--cc=Sebastian.Biemueller@amd.com \
--cc=bhavna.sarathy@amd.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=robert.richter@amd.com \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®