Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] paravirt: Add APIC accessors to paravirt-ops.

Browse Source 
Add APIC accessors to paravirt-ops.  Unfortunately, we need two write
functions, as some older broken hardware requires workarounds for
Pentium APIC errata - this is the purpose of apic_write_atomic.

AK: replaced __inline with inline

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
This commit is contained in:
Rusty Russell 2006-12-07 02:14:08 +01:00 committed by Andi Kleen
parent 6020c8f315
commit 13623d7930
3 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/i386/kernel/paravirt.c
View File

@ -29,6 +29,8 @@
#include <asm/time.h> #include <asm/time.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/fixmap.h>
#include <asm/apic.h>
/* nop stub */ /* nop stub */
static void native_nop(void) static void native_nop(void)
@ -446,6 +448,12 @@ struct paravirt_ops paravirt_ops = {
.io_delay = native_io_delay, .io_delay = native_io_delay,
.const_udelay = __const_udelay, .const_udelay = __const_udelay,
#ifdef CONFIG_X86_LOCAL_APIC
.apic_write = native_apic_write,
.apic_write_atomic = native_apic_write_atomic,
.apic_read = native_apic_read,
#endif
.irq_enable_sysexit = native_irq_enable_sysexit, .irq_enable_sysexit = native_irq_enable_sysexit,
.iret = native_iret, .iret = native_iret,
}; };

15
include/asm-i386/apic.h
View File

@ -37,18 +37,27 @@ extern void generic_apic_probe(void);
/* /*
* Basic functions accessing APICs. * Basic functions accessing APICs.
*/ */
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
#else
#define apic_write native_apic_write
#define apic_write_atomic native_apic_write_atomic
#define apic_read native_apic_read
#endif
static __inline void apic_write(unsigned long reg, unsigned long v) static __inline fastcall void native_apic_write(unsigned long reg,
unsigned long v)
{ {
*((volatile unsigned long *)(APIC_BASE+reg)) = v; *((volatile unsigned long *)(APIC_BASE+reg)) = v;
} }
static __inline void apic_write_atomic(unsigned long reg, unsigned long v) static __inline fastcall void native_apic_write_atomic(unsigned long reg,
unsigned long v)
{ {
xchg((volatile unsigned long *)(APIC_BASE+reg), v); xchg((volatile unsigned long *)(APIC_BASE+reg), v);
} }
static __inline unsigned long apic_read(unsigned long reg) 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));
} }

27
include/asm-i386/paravirt.h
View File

@ -115,6 +115,12 @@ struct paravirt_ops
void (fastcall *io_delay)(void); void (fastcall *io_delay)(void);
void (*const_udelay)(unsigned long loops); void (*const_udelay)(unsigned long loops);
#ifdef CONFIG_X86_LOCAL_APIC
void (fastcall *apic_write)(unsigned long reg, unsigned long v);
void (fastcall *apic_write_atomic)(unsigned long reg, unsigned long v);
unsigned long (fastcall *apic_read)(unsigned long reg);
#endif
/* These two are jmp to, not actually called. */ /* These two are jmp to, not actually called. */
void (fastcall *irq_enable_sysexit)(void); void (fastcall *irq_enable_sysexit)(void);
void (fastcall *iret)(void); void (fastcall *iret)(void);
@ -270,6 +276,27 @@ static inline void slow_down_io(void) {
#endif #endif
} }
#ifdef CONFIG_X86_LOCAL_APIC
/*
* Basic functions accessing APICs.
*/
static inline void apic_write(unsigned long reg, unsigned long v)
{
paravirt_ops.apic_write(reg,v);
}
static inline void apic_write_atomic(unsigned long reg, unsigned long v)
{
paravirt_ops.apic_write_atomic(reg,v);
}
static inline unsigned long apic_read(unsigned long reg)
{
return paravirt_ops.apic_read(reg);
}
#endif
/* These all sit in the .parainstructions section to tell us what to patch. */ /* These all sit in the .parainstructions section to tell us what to patch. */
struct paravirt_patch { struct paravirt_patch {
u8 *instr; /* original instructions */ u8 *instr; /* original instructions */