Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 cff90dbf 编写于 作者: T Thomas Gleixner 提交者： Ingo Molnar
浏览文件
操作

x86: prepare unification of include/asm-x86/apic_32/64.h 

White space and coding style clenaup.

Move the K8 local apic defines to apicdef.h, where they belong
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 2d539553
显示空白变更内容
内联 并排
Showing with 48 addition and 50 deletion
include/asm-x86/apic_32.h
浏览文件 @ cff90dbf
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
#define APIC_VERBOSE 1 #define APIC_VERBOSE 1
#define APIC_DEBUG 2 #define APIC_DEBUG 2
extern int apic_verbosity;
/* /*
* Define the default level of output to be very little * Define the default level of output to be very little
* This can be turned up by using apic=verbose for more * This can be turned up by using apic=verbose for more
...@@ -35,6 +33,11 @@ extern void generic_apic_probe(void); ...@@ -35,6 +33,11 @@ extern void generic_apic_probe(void);
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
extern int apic_verbosity;
extern int timer_over_8254;
extern int local_apic_timer_c2_ok;
extern int local_apic_timer_disabled;
/* /*
* Basic functions accessing APICs. * Basic functions accessing APICs.
*/ */
...@@ -65,9 +68,9 @@ static __inline fastcall unsigned long native_apic_read(unsigned long reg) ...@@ -65,9 +68,9 @@ static __inline fastcall unsigned long native_apic_read(unsigned long reg)
return *((volatile unsigned long *)(APIC_BASE+reg)); return *((volatile unsigned long *)(APIC_BASE+reg));
} }
void apic_wait_icr_idle(void); extern void apic_wait_icr_idle(void);
unsigned long safe_apic_wait_icr_idle(void); extern unsigned long safe_apic_wait_icr_idle(void);
int get_physical_broadcast(void); extern int get_physical_broadcast(void);
#ifdef CONFIG_X86_GOOD_APIC #ifdef CONFIG_X86_GOOD_APIC
# define FORCE_READ_AROUND_WRITE 0 # define FORCE_READ_AROUND_WRITE 0
...@@ -94,30 +97,24 @@ static inline void ack_APIC_irq(void) ...@@ -94,30 +97,24 @@ static inline void ack_APIC_irq(void)
extern int lapic_get_maxlvt(void); extern int lapic_get_maxlvt(void);
extern void clear_local_APIC(void); extern void clear_local_APIC(void);
extern void connect_bsp_APIC (void); extern void connect_bsp_APIC(void);
extern void disconnect_bsp_APIC (int virt_wire_setup); extern void disconnect_bsp_APIC(int virt_wire_setup);
extern void disable_local_APIC (void); extern void disable_local_APIC(void);
extern void lapic_shutdown (void); extern void lapic_shutdown(void);
extern int verify_local_APIC (void); extern int verify_local_APIC(void);
extern void cache_APIC_registers (void); extern void cache_APIC_registers(void);
extern void sync_Arb_IDs (void); extern void sync_Arb_IDs(void);
extern void init_bsp_APIC (void); extern void init_bsp_APIC(void);
extern void setup_local_APIC (void); extern void setup_local_APIC(void);
extern void init_apic_mappings (void); extern void init_apic_mappings(void);
extern void smp_local_timer_interrupt (void); extern void smp_local_timer_interrupt(void);
extern void setup_boot_APIC_clock (void); extern void setup_boot_APIC_clock(void);
extern void setup_secondary_APIC_clock (void); extern void setup_secondary_APIC_clock(void);
extern int APIC_init_uniprocessor (void); extern int APIC_init_uniprocessor(void);
extern void enable_NMI_through_LVT0(void *dummy);
extern void enable_NMI_through_LVT0 (void * dummy);
#define ARCH_APICTIMER_STOPS_ON_C3 1 #define ARCH_APICTIMER_STOPS_ON_C3 1
extern int timer_over_8254;
extern int local_apic_timer_c2_ok;
extern int local_apic_timer_disabled;
#else /* !CONFIG_X86_LOCAL_APIC */ #else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { } static inline void lapic_shutdown(void) { }
#define local_apic_timer_c2_ok 1 #define local_apic_timer_c2_ok 1
......
include/asm-x86/apic_64.h
浏览文件 @ cff90dbf
...@@ -64,22 +64,22 @@ static inline void ack_APIC_irq(void) ...@@ -64,22 +64,22 @@ static inline void ack_APIC_irq(void)
apic_write(APIC_EOI, 0); apic_write(APIC_EOI, 0);
} }
extern int get_maxlvt (void); extern int get_maxlvt(void);
extern void clear_local_APIC (void); extern void clear_local_APIC(void);
extern void connect_bsp_APIC (void); extern void connect_bsp_APIC(void);
extern void disconnect_bsp_APIC (int virt_wire_setup); extern void disconnect_bsp_APIC(int virt_wire_setup);
extern void disable_local_APIC (void); extern void disable_local_APIC(void);
extern void lapic_shutdown (void); extern void lapic_shutdown(void);
extern int verify_local_APIC (void); extern int verify_local_APIC(void);
extern void cache_APIC_registers (void); extern void cache_APIC_registers(void);
extern void sync_Arb_IDs (void); extern void sync_Arb_IDs(void);
extern void init_bsp_APIC (void); extern void init_bsp_APIC(void);
extern void setup_local_APIC (void); extern void setup_local_APIC(void);
extern void init_apic_mappings (void); extern void init_apic_mappings(void);
extern void smp_local_timer_interrupt (void); extern void smp_local_timer_interrupt(void);
extern void setup_boot_APIC_clock (void); extern void setup_boot_APIC_clock(void);
extern void setup_secondary_APIC_clock (void); extern void setup_secondary_APIC_clock(void);
extern int APIC_init_uniprocessor (void); extern int APIC_init_uniprocessor(void);
extern void setup_apic_routing(void); extern void setup_apic_routing(void);
extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector, extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector,
...@@ -87,13 +87,6 @@ extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector, ...@@ -87,13 +87,6 @@ extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector,
extern int apic_is_clustered_box(void); extern int apic_is_clustered_box(void);
#define K8_APIC_EXT_LVT_BASE 0x500
#define K8_APIC_EXT_INT_MSG_FIX 0x0
#define K8_APIC_EXT_INT_MSG_SMI 0x2
#define K8_APIC_EXT_INT_MSG_NMI 0x4
#define K8_APIC_EXT_INT_MSG_EXT 0x7
#define K8_APIC_EXT_LVT_ENTRY_THRESHOLD 0
#define ARCH_APICTIMER_STOPS_ON_C3 1 #define ARCH_APICTIMER_STOPS_ON_C3 1
extern unsigned boot_cpu_id; extern unsigned boot_cpu_id;
......
include/asm-x86/apicdef.h
浏览文件 @ cff90dbf
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
#define APIC_SEND_PENDING (1<<12) #define APIC_SEND_PENDING (1<<12)
#define APIC_MODE_MASK 0x700 #define APIC_MODE_MASK 0x700
#define GET_APIC_DELIVERY_MODE(x) (((x)>>8)&0x7) #define GET_APIC_DELIVERY_MODE(x) (((x)>>8)&0x7)
#define SET_APIC_DELIVERY_MODE(x,y) (((x)&~0x700)|((y)<<8)) #define SET_APIC_DELIVERY_MODE(x, y) (((x)&~0x700)|((y)<<8))
#define APIC_MODE_FIXED 0x0 #define APIC_MODE_FIXED 0x0
#define APIC_MODE_NMI 0x4 #define APIC_MODE_NMI 0x4
#define APIC_MODE_EXTINT 0x7 #define APIC_MODE_EXTINT 0x7
...@@ -116,6 +116,14 @@ ...@@ -116,6 +116,14 @@
#define APIC_TDR_DIV_32 0x8 #define APIC_TDR_DIV_32 0x8
#define APIC_TDR_DIV_64 0x9 #define APIC_TDR_DIV_64 0x9
#define APIC_TDR_DIV_128 0xA #define APIC_TDR_DIV_128 0xA
#define K8_APIC_EXT_LVT_BASE 0x500
#define K8_APIC_EXT_INT_MSG_FIX 0x0
#define K8_APIC_EXT_INT_MSG_SMI 0x2
#define K8_APIC_EXT_INT_MSG_NMI 0x4
#define K8_APIC_EXT_INT_MSG_EXT 0x7
#define K8_APIC_EXT_LVT_ENTRY_THRESHOLD 0
#define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) #define APIC_BASE (fix_to_virt(FIX_APIC_BASE))
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或