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

Commit 0440d4c0 authored by Joerg Roedel's avatar Joerg Roedel Committed by Thomas Gleixner
Browse files

x86 gart: rename symbols only used for the GART implementation 



This patch renames the 4 symbols iommu_hole_init(), iommu_aperture,
iommu_aperture_allowed, iommu_aperture_disabled. All these symbols are only
used for the GART implementation of IOMMUs.

It adds and additional gart_ prefix to them.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 79da0874

arch/x86/kernel/aperture_64.c

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

#include <asm/k8.h>



int iommu_aperture;

int iommu_aperture_disabled __initdata = 0;

int iommu_aperture_allowed __initdata = 0;

int gart_iommu_aperture;

int gart_iommu_aperture_disabled __initdata = 0;

int gart_iommu_aperture_allowed __initdata = 0;



int fallback_aper_order __initdata = 1; /* 64MB */

int fallback_aper_force __initdata = 0;
@@ -204,14 +204,15 @@ static __u32 __init search_agp_bridge(u32 *order, int *valid_agp) 
	return 0;

}



void __init iommu_hole_init(void) 

void __init gart_iommu_hole_init(void)

{ 

	int fix, num; 

	u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0;

	u64 aper_base, last_aper_base = 0;

	int valid_agp = 0;



	if (iommu_aperture_disabled || !fix_aperture || !early_pci_allowed())

	if (gart_iommu_aperture_disabled || !fix_aperture ||

	    !early_pci_allowed())

		return;



	printk(KERN_INFO  "Checking aperture...\n");
@@ -222,7 +223,7 @@ void __init iommu_hole_init(void) 
			continue;



		iommu_detected = 1;

		iommu_aperture = 1; 

		gart_iommu_aperture = 1;



		aper_order = (read_pci_config(0, num, 3, 0x90) >> 1) & 7; 

		aper_size = (32 * 1024 * 1024) << aper_order;

arch/x86/kernel/early-quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ static void __init via_bugs(void) 
{

#ifdef CONFIG_GART_IOMMU

	if ((end_pfn > MAX_DMA32_PFN ||  force_iommu) &&

	    !iommu_aperture_allowed) {

	    !gart_iommu_aperture_allowed) {

		printk(KERN_INFO

		       "Looks like a VIA chipset. Disabling IOMMU."

		       " Override with iommu=allowed\n");

		iommu_aperture_disabled = 1;

		gart_iommu_aperture_disabled = 1;

	}

#endif

}

arch/x86/kernel/pci-dma_64.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ void __init pci_iommu_alloc(void) 
	 * fall-back/fail-over reasons

	 */

#ifdef CONFIG_GART_IOMMU

	iommu_hole_init();

	gart_iommu_hole_init();

#endif



#ifdef CONFIG_CALGARY_IOMMU

arch/x86/kernel/pci-gart_64.c

+4 −4
Original line number Diff line number Diff line
@@ -627,12 +627,12 @@ void __init gart_iommu_init(void) 
		return;



	/* Did we detect a different HW IOMMU? */

	if (iommu_detected && !iommu_aperture)

	if (iommu_detected && !gart_iommu_aperture)

		return;



	if (no_iommu ||

	    (!force_iommu && end_pfn <= MAX_DMA32_PFN) ||

	    !iommu_aperture ||

	    !gart_iommu_aperture ||

	    (no_agp && init_k8_gatt(&info) < 0)) {

		if (end_pfn > MAX_DMA32_PFN) {

			printk(KERN_ERR "WARNING more than 4GB of memory "
@@ -733,9 +733,9 @@ void __init gart_parse_options(char *p) 
		fix_aperture = 0;

	/* duplicated from pci-dma.c */

	if (!strncmp(p,"force",5))

		iommu_aperture_allowed = 1;

		gart_iommu_aperture_allowed = 1;

	if (!strncmp(p,"allowed",7))

		iommu_aperture_allowed = 1;

		gart_iommu_aperture_allowed = 1;

	if (!strncmp(p, "memaper", 7)) {

		fallback_aper_force = 1;

		p += 7;

include/asm-x86/gart.h

+6 −6
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ extern int iommu_detected; 
extern void gart_iommu_init(void);

extern void gart_iommu_shutdown(void);

extern void __init gart_parse_options(char *);

extern void iommu_hole_init(void);

extern void gart_iommu_hole_init(void);

extern int fallback_aper_order;

extern int fallback_aper_force;

extern int iommu_aperture;

extern int iommu_aperture_allowed;

extern int iommu_aperture_disabled;

extern int gart_iommu_aperture;

extern int gart_iommu_aperture_allowed;

extern int gart_iommu_aperture_disabled;

extern int fix_aperture;

#else

#define iommu_aperture 0

#define iommu_aperture_allowed 0

#define gart_iommu_aperture 0

#define gart_iommu_aperture_allowed 0



static inline void gart_iommu_shutdown(void)

{