Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22e6daf4 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by H. Peter Anvin
Browse files

x86, GART/AMD-VI: Make AMD GART and IOMMU use IOMMU_INIT_* macros. 



We utilize the IOMMU_INIT macros to create this dependency:

               [null]
                 |
       [pci_xen_swiotlb_detect]
                 |
       [pci_swiotlb_detect_override]
                 |
       [pci_swiotlb_detect_4gb]
                 |
         +-------+--------+
        /                  \
[detect_calgary]    [gart_iommu_hole_init]
                            |
                    [amd_iommu_detect]

Meaning that 'amd_iommu_detect' will be called after
'gart_iommu_hole_init'.

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
LKML-Reference: <1282845485-8991-9-git-send-email-konrad.wilk@oracle.com>
CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
CC: Joerg Roedel <joerg.roedel@amd.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent d2aa232f

arch/x86/kernel/amd_iommu_init.c

+6 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <asm/iommu.h>

#include <asm/gart.h>

#include <asm/x86_init.h>



#include <asm/iommu_table.h>

/*

 * definitions for the ACPI scanning code

 */
@@ -1430,3 +1430,8 @@ static int __init parse_amd_iommu_options(char *str) 


__setup("amd_iommu_dump", parse_amd_iommu_dump);

__setup("amd_iommu=", parse_amd_iommu_options);



IOMMU_INIT_FINISH(amd_iommu_detect,

		  gart_iommu_hole_init,

		  0,

		  0);

arch/x86/kernel/pci-gart_64.c

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <asm/dma.h>

#include <asm/k8.h>

#include <asm/x86_init.h>

#include <asm/iommu_table.h>



static unsigned long iommu_bus_base;	/* GART remapping area (physical) */

static unsigned long iommu_size;	/* size of remapping area bytes */
@@ -896,3 +897,4 @@ void __init gart_parse_options(char *p) 
		}

	}

}

IOMMU_INIT_POST(gart_iommu_hole_init);