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

Commit c987d12f authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: remove end_pfn in 64bit 



and use max_pfn directly.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f47f9d53

arch/x86/kernel/aperture_64.c

+4 −2
Original line number Diff line number Diff line
@@ -407,7 +407,9 @@ void __init gart_iommu_hole_init(void) 
				    agp_aper_base == aper_base &&

				    agp_aper_order == aper_order) {

					/* the same between two setting from NB and agp */

					if (!no_iommu && end_pfn > MAX_DMA32_PFN && !printed_gart_size_msg) {

					if (!no_iommu &&

					    max_pfn > MAX_DMA32_PFN &&

					    !printed_gart_size_msg) {

						printk(KERN_ERR "you are using iommu with agp, but GART size is less than 64M\n");

						printk(KERN_ERR "please increase GART size in your BIOS setup\n");

						printk(KERN_ERR "if BIOS doesn't have that option, contact your HW vendor!\n");
@@ -448,7 +450,7 @@ void __init gart_iommu_hole_init(void) 
		/* Got the aperture from the AGP bridge */

	} else if (swiotlb && !valid_agp) {

		/* Do nothing */

	} else if ((!no_iommu && end_pfn > MAX_DMA32_PFN) ||

	} else if ((!no_iommu && max_pfn > MAX_DMA32_PFN) ||

		   force_iommu ||

		   valid_agp ||

		   fallback_aper_force) {

arch/x86/kernel/e820.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ __init void e820_setup_gap(void) 


#ifdef CONFIG_X86_64

	if (!found) {

		gapstart = (end_pfn << PAGE_SHIFT) + 1024*1024;

		gapstart = (max_pfn << PAGE_SHIFT) + 1024*1024;

		printk(KERN_ERR "PCI: Warning: Cannot find a gap in the 32bit "

		       "address range\n"

		       KERN_ERR "PCI: Unassigned devices with 32bit resource "

arch/x86/kernel/early-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void __init fix_hypertransport_config(int num, int slot, int func) 
static void __init via_bugs(int  num, int slot, int func)

{

#ifdef CONFIG_GART_IOMMU

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

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

	    !gart_iommu_aperture_allowed) {

		printk(KERN_INFO

		       "Looks like a VIA chipset. Disabling IOMMU."

arch/x86/kernel/machine_kexec_64.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int init_pgtable(struct kimage *image, unsigned long start_pgtable) 
{

	pgd_t *level4p;

	level4p = (pgd_t *)__va(start_pgtable);

 	return init_level4_page(image, level4p, 0, end_pfn << PAGE_SHIFT);

	return init_level4_page(image, level4p, 0, max_pfn << PAGE_SHIFT);

}



static void set_idt(void *newidt, u16 limit)

arch/x86/kernel/pci-calgary_64.c

+2 −2
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ void __init detect_calgary(void) 
		return;

	}



	specified_table_size = determine_tce_table_size(end_pfn * PAGE_SIZE);

	specified_table_size = determine_tce_table_size(max_pfn * PAGE_SIZE);



	for (bus = 0; bus < MAX_PHB_BUS_NUM; bus++) {

		struct calgary_bus_info *info = &bus_info[bus];
@@ -1459,7 +1459,7 @@ int __init calgary_iommu_init(void) 
	if (ret) {

		printk(KERN_ERR "PCI-DMA: Calgary init failed %d, "

		       "falling back to no_iommu\n", ret);

		if (end_pfn > MAX_DMA32_PFN)

		if (max_pfn > MAX_DMA32_PFN)

			printk(KERN_ERR "WARNING more than 4GB of memory, "

					"32bit PCI may malfunction.\n");

		return ret;