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

Commit 3e35a0e5 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: move ioapic code where it belongs 



The commit 39928722 hacked the
ioapic resource mapping into apic.c for no good reason.
Move the code into io_apic_64.c where it belongs.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 84c873ed

arch/x86/kernel/apic_64.c

+0 −87
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ static int apic_calibrate_pmtmr __initdata; 
int local_apic_timer_c2_ok;

int local_apic_timer_c2_ok;

EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);

EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);





static struct resource *ioapic_resources;

static struct resource lapic_resource = {

static struct resource lapic_resource = {

	.name = "Local APIC",

	.name = "Local APIC",

	.flags = IORESOURCE_MEM | IORESOURCE_BUSY,

	.flags = IORESOURCE_MEM | IORESOURCE_BUSY,
@@ -714,64 +713,6 @@ static int __init detect_init_APIC (void) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_X86_IO_APIC

static struct resource * __init ioapic_setup_resources(void)

{

#define IOAPIC_RESOURCE_NAME_SIZE 11

	unsigned long n;

	struct resource *res;

	char *mem;

	int i;



	if (nr_ioapics <= 0)

		return NULL;



	n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);

	n *= nr_ioapics;



	mem = alloc_bootmem(n);

	res = (void *)mem;



	if (mem != NULL) {

		memset(mem, 0, n);

		mem += sizeof(struct resource) * nr_ioapics;



		for (i = 0; i < nr_ioapics; i++) {

			res[i].name = mem;

			res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;

			sprintf(mem,  "IOAPIC %u", i);

			mem += IOAPIC_RESOURCE_NAME_SIZE;

		}

	}



	ioapic_resources = res;



	return res;

}



static int __init ioapic_insert_resources(void)

{

	int i;

	struct resource *r = ioapic_resources;



	if (!r) {

		printk("IO APIC resources could be not be allocated.\n");

		return -1;

	}



	for (i = 0; i < nr_ioapics; i++) {

		insert_resource(&iomem_resource, r);

		r++;

	}



	return 0;

}



/* Insert the IO APIC resources after PCI initialization has occured to handle

 * IO APICS that are mapped in on a BAR in PCI space. */

late_initcall(ioapic_insert_resources);

#endif



void __init init_apic_mappings(void)

void __init init_apic_mappings(void)

{

{

	unsigned long apic_phys;

	unsigned long apic_phys;
@@ -801,34 +742,6 @@ void __init init_apic_mappings(void) 
	 * default configuration (or the MP table is broken).

	 * default configuration (or the MP table is broken).

	 */

	 */

	boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));

	boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));



	{

		unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;

		int i;

		struct resource *ioapic_res;



		ioapic_res = ioapic_setup_resources();

		for (i = 0; i < nr_ioapics; i++) {

			if (smp_found_config) {

				ioapic_phys = mp_ioapics[i].mpc_apicaddr;

			} else {

				ioapic_phys = (unsigned long)

					alloc_bootmem_pages(PAGE_SIZE);

				ioapic_phys = __pa(ioapic_phys);

			}

			set_fixmap_nocache(idx, ioapic_phys);

			apic_printk(APIC_VERBOSE,

				    "mapped IOAPIC to %016lx (%016lx)\n",

				    __fix_to_virt(idx), ioapic_phys);

			idx++;



			if (ioapic_res != NULL) {

				ioapic_res->start = ioapic_phys;

				ioapic_res->end = ioapic_phys + (4 * 1024) - 1;

				ioapic_res++;

			}

		}

	}

}

}





/*

/*

arch/x86/kernel/io_apic_64.c

+90 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 
#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

#include <acpi/acpi_bus.h>

#include <acpi/acpi_bus.h>

#endif

#endif

#include <linux/bootmem.h>





#include <asm/idle.h>

#include <asm/idle.h>

#include <asm/io.h>

#include <asm/io.h>
@@ -2288,3 +2289,92 @@ void __init setup_ioapic_dest(void) 
}

}

#endif

#endif





#define IOAPIC_RESOURCE_NAME_SIZE 11



static struct resource *ioapic_resources;



static struct resource * __init ioapic_setup_resources(void)

{

	unsigned long n;

	struct resource *res;

	char *mem;

	int i;



	if (nr_ioapics <= 0)

		return NULL;



	n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);

	n *= nr_ioapics;



	mem = alloc_bootmem(n);

	res = (void *)mem;



	if (mem != NULL) {

		memset(mem, 0, n);

		mem += sizeof(struct resource) * nr_ioapics;



		for (i = 0; i < nr_ioapics; i++) {

			res[i].name = mem;

			res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;

			sprintf(mem,  "IOAPIC %u", i);

			mem += IOAPIC_RESOURCE_NAME_SIZE;

		}

	}



	ioapic_resources = res;



	return res;

}



void __init ioapic_init_mappings(void)

{

	unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;

	struct resource *ioapic_res;

	int i;



	ioapic_res = ioapic_setup_resources();

	for (i = 0; i < nr_ioapics; i++) {

		if (smp_found_config) {

			ioapic_phys = mp_ioapics[i].mpc_apicaddr;

		} else {

			ioapic_phys = (unsigned long)

				alloc_bootmem_pages(PAGE_SIZE);

			ioapic_phys = __pa(ioapic_phys);

		}

		set_fixmap_nocache(idx, ioapic_phys);

		apic_printk(APIC_VERBOSE,

			    "mapped IOAPIC to %016lx (%016lx)\n",

			    __fix_to_virt(idx), ioapic_phys);

		idx++;



		if (ioapic_res != NULL) {

			ioapic_res->start = ioapic_phys;

			ioapic_res->end = ioapic_phys + (4 * 1024) - 1;

			ioapic_res++;

		}

	}

}



static int __init ioapic_insert_resources(void)

{

	int i;

	struct resource *r = ioapic_resources;



	if (!r) {

		printk(KERN_ERR

		       "IO APIC resources could be not be allocated.\n");

		return -1;

	}



	for (i = 0; i < nr_ioapics; i++) {

		insert_resource(&iomem_resource, r);

		r++;

	}



	return 0;

}



/* Insert the IO APIC resources after PCI initialization has occured to handle

 * IO APICS that are mapped in on a BAR in PCI space. */

late_initcall(ioapic_insert_resources);

arch/x86/kernel/setup_64.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -433,6 +433,7 @@ void __init setup_arch(char **cmdline_p) 
	if (smp_found_config)

	if (smp_found_config)

		get_smp_config();

		get_smp_config();

	init_apic_mappings();

	init_apic_mappings();

	ioapic_init_mappings();





	/*

	/*

	 * We trust e820 completely. No explicit ROM probing in memory.

	 * We trust e820 completely. No explicit ROM probing in memory.

include/asm-x86/io_apic_64.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,8 @@ extern int io_apic_get_redir_entries (int ioapic); 
extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int);

extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int);

#endif

#endif





extern void ioapic_init_mappings(void);



extern int sis_apic_bug; /* dummy */ 

extern int sis_apic_bug; /* dummy */ 





#endif
 
#endif