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

Commit 116890d5 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: move x86_64-specific to common code. 



This patch moves the bootmem functions, that are largely
x86_64-specific into pci-dma.c. The code goes inside an ifdef.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent cb5867a5

arch/x86/kernel/pci-dma.c

+73 −0
Original line number Original line Diff line number Diff line 
#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/dmar.h>

#include <linux/dmar.h>

#include <linux/bootmem.h>





#include <asm/proto.h>

#include <asm/dma.h>

#include <asm/gart.h>

#include <asm/gart.h>

#include <asm/calgary.h>

#include <asm/calgary.h>
@@ -26,6 +29,76 @@ int dma_set_mask(struct device *dev, u64 mask) 
}

}

EXPORT_SYMBOL(dma_set_mask);

EXPORT_SYMBOL(dma_set_mask);





#ifdef CONFIG_X86_64

static __initdata void *dma32_bootmem_ptr;

static unsigned long dma32_bootmem_size __initdata = (128ULL<<20);



static int __init parse_dma32_size_opt(char *p)

{

	if (!p)

		return -EINVAL;

	dma32_bootmem_size = memparse(p, &p);

	return 0;

}

early_param("dma32_size", parse_dma32_size_opt);



void __init dma32_reserve_bootmem(void)

{

	unsigned long size, align;

	if (end_pfn <= MAX_DMA32_PFN)

		return;



	align = 64ULL<<20;

	size = round_up(dma32_bootmem_size, align);

	dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align,

				 __pa(MAX_DMA_ADDRESS));

	if (dma32_bootmem_ptr)

		dma32_bootmem_size = size;

	else

		dma32_bootmem_size = 0;

}

static void __init dma32_free_bootmem(void)

{

	int node;



	if (end_pfn <= MAX_DMA32_PFN)

		return;



	if (!dma32_bootmem_ptr)

		return;



	for_each_online_node(node)

		free_bootmem_node(NODE_DATA(node), __pa(dma32_bootmem_ptr),

				  dma32_bootmem_size);



	dma32_bootmem_ptr = NULL;

	dma32_bootmem_size = 0;

}



void __init pci_iommu_alloc(void)

{

	/* free the range so iommu could get some range less than 4G */

	dma32_free_bootmem();

	/*

	 * The order of these functions is important for

	 * fall-back/fail-over reasons

	 */

#ifdef CONFIG_GART_IOMMU

	gart_iommu_hole_init();

#endif



#ifdef CONFIG_CALGARY_IOMMU

	detect_calgary();

#endif



	detect_intel_iommu();



#ifdef CONFIG_SWIOTLB

	pci_swiotlb_init();

#endif

}

#endif



static int __init pci_iommu_init(void)

static int __init pci_iommu_init(void)

{

{

#ifdef CONFIG_CALGARY_IOMMU

#ifdef CONFIG_CALGARY_IOMMU

arch/x86/kernel/pci-dma_64.c

+0 −68
Original line number Original line Diff line number Diff line
@@ -271,74 +271,6 @@ static __init int iommu_setup(char *p) 
}

}

early_param("iommu", iommu_setup);

early_param("iommu", iommu_setup);





static __initdata void *dma32_bootmem_ptr;

static unsigned long dma32_bootmem_size __initdata = (128ULL<<20);



static int __init parse_dma32_size_opt(char *p)

{

	if (!p)

		return -EINVAL;

	dma32_bootmem_size = memparse(p, &p);

	return 0;

}

early_param("dma32_size", parse_dma32_size_opt);



void __init dma32_reserve_bootmem(void)

{

	unsigned long size, align;

	if (end_pfn <= MAX_DMA32_PFN)

		return;



	align = 64ULL<<20;

	size = round_up(dma32_bootmem_size, align);

	dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align,

				 __pa(MAX_DMA_ADDRESS));

	if (dma32_bootmem_ptr)

		dma32_bootmem_size = size;

	else

		dma32_bootmem_size = 0;

}

static void __init dma32_free_bootmem(void)

{

	int node;



	if (end_pfn <= MAX_DMA32_PFN)

		return;



	if (!dma32_bootmem_ptr)

		return;



	for_each_online_node(node)

		free_bootmem_node(NODE_DATA(node), __pa(dma32_bootmem_ptr),

				  dma32_bootmem_size);



	dma32_bootmem_ptr = NULL;

	dma32_bootmem_size = 0;

}



void __init pci_iommu_alloc(void)

{

	/* free the range so iommu could get some range less than 4G */

	dma32_free_bootmem();

	/*

	 * The order of these functions is important for

	 * fall-back/fail-over reasons

	 */

#ifdef CONFIG_GART_IOMMU

	gart_iommu_hole_init();

#endif



#ifdef CONFIG_CALGARY_IOMMU

	detect_calgary();

#endif



	detect_intel_iommu();



#ifdef CONFIG_SWIOTLB

	pci_swiotlb_init();

#endif

}



#ifdef CONFIG_PCI

#ifdef CONFIG_PCI

/* Many VIA bridges seem to corrupt data for DAC. Disable it here */

/* Many VIA bridges seem to corrupt data for DAC. Disable it here */