From ee636db43c647f3d05f207518514efdd11af1dde Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Mon, 8 Sep 2008 14:48:04 +0200 Subject: [PATCH] --- yaml --- r: 112599 b: refs/heads/master c: ee893c24edb8ebab9a3fb66566855572579ad616 h: refs/heads/master i: 112597: 0ec9d2d42d1b1d06d5839d4f40db54304dc95542 112595: 39ba8092198f0f461bcb2ec633349ece3ec27b1e 112591: dc1742fc1032da6d1be595a65c96cdcda51d5a40 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/amd_iommu_init.c | 1 + trunk/include/asm-x86/amd_iommu_types.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7d3a2d29f9a1..8c606369fd08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 335503e57b6b8de04cec5d27eb2c3d09ff98905b +refs/heads/master: ee893c24edb8ebab9a3fb66566855572579ad616 diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c index 41ce8d5d626e..b50234ef91ed 100644 --- a/trunk/arch/x86/kernel/amd_iommu_init.c +++ b/trunk/arch/x86/kernel/amd_iommu_init.c @@ -676,6 +676,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h) */ iommu->devid = h->devid; iommu->cap_ptr = h->cap_ptr; + iommu->pci_seg = h->pci_seg; iommu->mmio_phys = h->mmio_phys; iommu->mmio_base = iommu_map_mmio_space(h->mmio_phys); if (!iommu->mmio_base) diff --git a/trunk/include/asm-x86/amd_iommu_types.h b/trunk/include/asm-x86/amd_iommu_types.h index 8b8cd0c60b3c..20814b85bbc3 100644 --- a/trunk/include/asm-x86/amd_iommu_types.h +++ b/trunk/include/asm-x86/amd_iommu_types.h @@ -232,6 +232,9 @@ struct amd_iommu { /* capabilities of that IOMMU read from ACPI */ u32 cap; + /* pci domain of this IOMMU */ + u16 pci_seg; + /* first device this IOMMU handles. read from PCI */ u16 first_device; /* last device this IOMMU handles. read from PCI */