Commit ef7471b1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, genapic: unify struct genapic 



Move over the (now identical) struct genapic definitions from
genapic_32/64.h to genapic.h.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 943d0f74

arch/x86/include/asm/genapic.h

+96 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_GENAPIC_H

#define _ASM_X86_GENAPIC_H



#include <linux/cpumask.h>



/*

 * Copyright 2004 James Cleverdon, IBM.

 * Subject to the GNU Public License, v.2

 *

 * Generic APIC sub-arch data struct.

 *

 * Hacked for x86-64 by James Cleverdon from i386 architecture code by

 * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and

 * James Cleverdon.

 */



struct genapic {

	char *name;



	int (*probe)(void);

	int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);

	int (*apic_id_registered)(void);



	u32 int_delivery_mode;

	u32 int_dest_mode;



	const struct cpumask *(*target_cpus)(void);



	int ESR_DISABLE;



	int apic_destination_logical;

	unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);

	unsigned long (*check_apicid_present)(int apicid);



	int no_balance_irq;

	int no_ioapic_check;



	void (*vector_allocation_domain)(int cpu, struct cpumask *retmask);

	void (*init_apic_ldr)(void);



	physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map);



	void (*setup_apic_routing)(void);

	int (*multi_timer_check)(int apic, int irq);

	int (*apicid_to_node)(int logical_apicid);

	int (*cpu_to_logical_apicid)(int cpu);

	int (*cpu_present_to_apicid)(int mps_cpu);

	physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);

	void (*setup_portio_remap)(void);

	int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);

	void (*enable_apic_mode)(void);

#ifdef CONFIG_X86_32

	u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);

#else

	unsigned int (*phys_pkg_id)(int index_msb);

#endif



	/*

	 * When one of the next two hooks returns 1 the genapic

	 * is switched to this. Essentially they are additional

	 * probe functions:

	 */

	int (*mps_oem_check)(struct mpc_table *mpc, char *oem,

			     char *productid);



	unsigned int (*get_apic_id)(unsigned long x);

	unsigned long (*set_apic_id)(unsigned int id);

	unsigned long apic_id_mask;



	unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask);

	unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,

					       const struct cpumask *andmask);



#ifdef CONFIG_SMP

	/* ipi */

	void (*send_IPI_mask)(const struct cpumask *mask, int vector);

	void (*send_IPI_mask_allbutself)(const struct cpumask *mask,

					 int vector);

	void (*send_IPI_allbutself)(int vector);

	void (*send_IPI_all)(int vector);

	void (*send_IPI_self)(int vector);

#endif

	/* wakeup_secondary_cpu */

	int (*wakeup_cpu)(int apicid, unsigned long start_eip);



	int trampoline_phys_low;

	int trampoline_phys_high;

	void (*wait_for_init_deassert)(atomic_t *deassert);

	void (*smp_callin_clear_local_apic)(void);

	void (*store_NMI_vector)(unsigned short *high, unsigned short *low);

	void (*restore_NMI_vector)(unsigned short *high, unsigned short *low);

	void (*inquire_remote_apic)(int apicid);

};



#ifdef CONFIG_X86_32

# include "genapic_32.h"

#else

# include "genapic_64.h"

#endif



#endif /* _ASM_X86_GENAPIC_64_H */

arch/x86/include/asm/genapic_32.h

+0 −93
Original line number Diff line number Diff line
@@ -4,99 +4,6 @@ 
#include <asm/mpspec.h>

#include <asm/atomic.h>



/*

 * Generic APIC driver interface.

 *

 * An straight forward mapping of the APIC related parts of the

 * x86 subarchitecture interface to a dynamic object.

 *

 * This is used by the "generic" x86 subarchitecture.

 *

 * Copyright 2003 Andi Kleen, SuSE Labs.

 */



struct mpc_bus;

struct mpc_table;

struct mpc_cpu;



struct genapic {

	char *name;



	int (*probe)(void);

	int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);

	int (*apic_id_registered)(void);



	u32 int_delivery_mode;

	u32 int_dest_mode;



	const struct cpumask *(*target_cpus)(void);



	int ESR_DISABLE;



	int apic_destination_logical;

	unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);

	unsigned long (*check_apicid_present)(int apicid);



	int no_balance_irq;

	int no_ioapic_check;



	void (*vector_allocation_domain)(int cpu, struct cpumask *retmask);

	void (*init_apic_ldr)(void);



	physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map);



	void (*setup_apic_routing)(void);

	int (*multi_timer_check)(int apic, int irq);

	int (*apicid_to_node)(int logical_apicid);

	int (*cpu_to_logical_apicid)(int cpu);

	int (*cpu_present_to_apicid)(int mps_cpu);

	physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);

	void (*setup_portio_remap)(void);

	int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);

	void (*enable_apic_mode)(void);

#ifdef CONFIG_X86_32

	u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);

#else

	unsigned int (*phys_pkg_id)(int index_msb);

#endif



	/*

	 * When one of the next two hooks returns 1 the genapic

	 * is switched to this. Essentially they are additional

	 * probe functions:

	 */

	int (*mps_oem_check)(struct mpc_table *mpc, char *oem,

			     char *productid);



	unsigned int (*get_apic_id)(unsigned long x);

	unsigned long (*set_apic_id)(unsigned int id);

	unsigned long apic_id_mask;



	unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask);

	unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,

					       const struct cpumask *andmask);



#ifdef CONFIG_SMP

	/* ipi */

	void (*send_IPI_mask)(const struct cpumask *mask, int vector);

	void (*send_IPI_mask_allbutself)(const struct cpumask *mask,

					 int vector);

	void (*send_IPI_allbutself)(int vector);

	void (*send_IPI_all)(int vector);

	void (*send_IPI_self)(int vector);

#endif

	/* wakeup_secondary_cpu */

	int (*wakeup_cpu)(int apicid, unsigned long start_eip);



	int trampoline_phys_low;

	int trampoline_phys_high;

	void (*wait_for_init_deassert)(atomic_t *deassert);

	void (*smp_callin_clear_local_apic)(void);

	void (*store_NMI_vector)(unsigned short *high, unsigned short *low);

	void (*restore_NMI_vector)(unsigned short *high, unsigned short *low);

	void (*inquire_remote_apic)(int apicid);

};



#define APICFUNC(x) .x = x,



/* More functions could be probably marked IPIFUNC and save some space

arch/x86/include/asm/genapic_64.h

+0 −91
Original line number Diff line number Diff line 
#ifndef _ASM_X86_GENAPIC_64_H

#define _ASM_X86_GENAPIC_64_H



#include <linux/cpumask.h>



/*

 * Copyright 2004 James Cleverdon, IBM.

 * Subject to the GNU Public License, v.2

 *

 * Generic APIC sub-arch data struct.

 *

 * Hacked for x86-64 by James Cleverdon from i386 architecture code by

 * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and

 * James Cleverdon.

 */



struct genapic {

	char *name;



	int (*probe)(void);

	int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);

	int (*apic_id_registered)(void);



	u32 int_delivery_mode;

	u32 int_dest_mode;



	const struct cpumask *(*target_cpus)(void);



	int ESR_DISABLE;



	int apic_destination_logical;

	unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);

	unsigned long (*check_apicid_present)(int apicid);



	int no_balance_irq;

	int no_ioapic_check;



	void (*vector_allocation_domain)(int cpu, struct cpumask *retmask);

	void (*init_apic_ldr)(void);



	physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map);



	void (*setup_apic_routing)(void);

	int (*multi_timer_check)(int apic, int irq);

	int (*apicid_to_node)(int logical_apicid);

	int (*cpu_to_logical_apicid)(int cpu);

	int (*cpu_present_to_apicid)(int mps_cpu);

	physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);

	void (*setup_portio_remap)(void);

	int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);

	void (*enable_apic_mode)(void);

#ifdef CONFIG_X86_32

	u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);

#else

	unsigned int (*phys_pkg_id)(int index_msb);

#endif



	/*

	 * When one of the next two hooks returns 1 the genapic

	 * is switched to this. Essentially they are additional

	 * probe functions:

	 */

	int (*mps_oem_check)(struct mpc_table *mpc, char *oem,

			     char *productid);



	unsigned int (*get_apic_id)(unsigned long x);

	unsigned long (*set_apic_id)(unsigned int id);

	unsigned long apic_id_mask;



	unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask);

	unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,

					       const struct cpumask *andmask);



#ifdef CONFIG_SMP

	/* ipi */

	void (*send_IPI_mask)(const struct cpumask *mask, int vector);

	void (*send_IPI_mask_allbutself)(const struct cpumask *mask,

					 int vector);

	void (*send_IPI_allbutself)(int vector);

	void (*send_IPI_all)(int vector);

	void (*send_IPI_self)(int vector);

#endif

	/* wakeup_secondary_cpu */

	int (*wakeup_cpu)(int apicid, unsigned long start_eip);



	int trampoline_phys_low;

	int trampoline_phys_high;

	void (*wait_for_init_deassert)(atomic_t *deassert);

	void (*smp_callin_clear_local_apic)(void);

	void (*store_NMI_vector)(unsigned short *high, unsigned short *low);

	void (*restore_NMI_vector)(unsigned short *high, unsigned short *low);

	void (*inquire_remote_apic)(int apicid);

};



extern struct genapic *genapic;



extern struct genapic apic_flat;

CRA Git | Maintained and supported by SUSTech CRA and CCSE