x86: Remove inline for lapic access routines
Remove inline for lapic access routines and expose lapic_read() & lapic_write() as APIs to read/write lapic registers. Also move stop_this_cpu() to mp_init.c as it has nothing to do with lapic. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng
Simon Glass
parent
3d23287828
commit
a2d73fdba6
|
|
@ -8,9 +8,116 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/lapic.h>
|
||||
#include <asm/msr.h>
|
||||
#include <asm/msr-index.h>
|
||||
#include <asm/post.h>
|
||||
|
||||
unsigned long lapic_read(unsigned long reg)
|
||||
{
|
||||
return readl(LAPIC_DEFAULT_BASE + reg);
|
||||
}
|
||||
|
||||
#define xchg(ptr, v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v), (ptr), \
|
||||
sizeof(*(ptr))))
|
||||
|
||||
struct __xchg_dummy { unsigned long a[100]; };
|
||||
#define __xg(x) ((struct __xchg_dummy *)(x))
|
||||
|
||||
/*
|
||||
* Note: no "lock" prefix even on SMP. xchg always implies lock anyway.
|
||||
*
|
||||
* Note 2: xchg has side effect, so that attribute volatile is necessary,
|
||||
* but generally the primitive is invalid, *ptr is output argument.
|
||||
*/
|
||||
static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
|
||||
int size)
|
||||
{
|
||||
switch (size) {
|
||||
case 1:
|
||||
__asm__ __volatile__("xchgb %b0,%1"
|
||||
: "=q" (x)
|
||||
: "m" (*__xg(ptr)), "0" (x)
|
||||
: "memory");
|
||||
break;
|
||||
case 2:
|
||||
__asm__ __volatile__("xchgw %w0,%1"
|
||||
: "=r" (x)
|
||||
: "m" (*__xg(ptr)), "0" (x)
|
||||
: "memory");
|
||||
break;
|
||||
case 4:
|
||||
__asm__ __volatile__("xchgl %0,%1"
|
||||
: "=r" (x)
|
||||
: "m" (*__xg(ptr)), "0" (x)
|
||||
: "memory");
|
||||
break;
|
||||
}
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
void lapic_write(unsigned long reg, unsigned long v)
|
||||
{
|
||||
(void)xchg((volatile unsigned long *)(LAPIC_DEFAULT_BASE + reg), v);
|
||||
}
|
||||
|
||||
void enable_lapic(void)
|
||||
{
|
||||
msr_t msr;
|
||||
|
||||
msr = msr_read(MSR_IA32_APICBASE);
|
||||
msr.hi &= 0xffffff00;
|
||||
msr.lo |= MSR_IA32_APICBASE_ENABLE;
|
||||
msr.lo &= ~MSR_IA32_APICBASE_BASE;
|
||||
msr.lo |= LAPIC_DEFAULT_BASE;
|
||||
msr_write(MSR_IA32_APICBASE, msr);
|
||||
}
|
||||
|
||||
void disable_lapic(void)
|
||||
{
|
||||
msr_t msr;
|
||||
|
||||
msr = msr_read(MSR_IA32_APICBASE);
|
||||
msr.lo &= ~MSR_IA32_APICBASE_ENABLE;
|
||||
msr_write(MSR_IA32_APICBASE, msr);
|
||||
}
|
||||
|
||||
unsigned long lapicid(void)
|
||||
{
|
||||
return lapic_read(LAPIC_ID) >> 24;
|
||||
}
|
||||
|
||||
static void lapic_wait_icr_idle(void)
|
||||
{
|
||||
do { } while (lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY);
|
||||
}
|
||||
|
||||
int lapic_remote_read(int apicid, int reg, unsigned long *pvalue)
|
||||
{
|
||||
int timeout;
|
||||
unsigned long status;
|
||||
int result;
|
||||
|
||||
lapic_wait_icr_idle();
|
||||
lapic_write(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(apicid));
|
||||
lapic_write(LAPIC_ICR, LAPIC_DM_REMRD | (reg >> 4));
|
||||
|
||||
timeout = 0;
|
||||
do {
|
||||
status = lapic_read(LAPIC_ICR) & LAPIC_ICR_RR_MASK;
|
||||
} while (status == LAPIC_ICR_RR_INPROG && timeout++ < 1000);
|
||||
|
||||
result = -1;
|
||||
if (status == LAPIC_ICR_RR_VALID) {
|
||||
*pvalue = lapic_read(LAPIC_RRR);
|
||||
result = 0;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void lapic_setup(void)
|
||||
{
|
||||
#ifdef CONFIG_SMP
|
||||
|
|
@ -21,26 +128,26 @@ void lapic_setup(void)
|
|||
enable_lapic();
|
||||
|
||||
/* Set Task Priority to 'accept all' */
|
||||
lapic_write_around(LAPIC_TASKPRI,
|
||||
lapic_read_around(LAPIC_TASKPRI) & ~LAPIC_TPRI_MASK);
|
||||
lapic_write(LAPIC_TASKPRI,
|
||||
lapic_read(LAPIC_TASKPRI) & ~LAPIC_TPRI_MASK);
|
||||
|
||||
/* Put the local apic in virtual wire mode */
|
||||
lapic_write_around(LAPIC_SPIV, (lapic_read_around(LAPIC_SPIV) &
|
||||
~(LAPIC_VECTOR_MASK)) | LAPIC_SPIV_ENABLE);
|
||||
lapic_write_around(LAPIC_LVT0, (lapic_read_around(LAPIC_LVT0) &
|
||||
~(LAPIC_LVT_MASKED | LAPIC_LVT_LEVEL_TRIGGER |
|
||||
LAPIC_LVT_REMOTE_IRR | LAPIC_INPUT_POLARITY |
|
||||
LAPIC_SEND_PENDING | LAPIC_LVT_RESERVED_1 |
|
||||
LAPIC_DELIVERY_MODE_MASK)) |
|
||||
(LAPIC_LVT_REMOTE_IRR | LAPIC_SEND_PENDING |
|
||||
LAPIC_DELIVERY_MODE_EXTINT));
|
||||
lapic_write_around(LAPIC_LVT1, (lapic_read_around(LAPIC_LVT1) &
|
||||
~(LAPIC_LVT_MASKED | LAPIC_LVT_LEVEL_TRIGGER |
|
||||
LAPIC_LVT_REMOTE_IRR | LAPIC_INPUT_POLARITY |
|
||||
LAPIC_SEND_PENDING | LAPIC_LVT_RESERVED_1 |
|
||||
LAPIC_DELIVERY_MODE_MASK)) |
|
||||
(LAPIC_LVT_REMOTE_IRR | LAPIC_SEND_PENDING |
|
||||
LAPIC_DELIVERY_MODE_NMI));
|
||||
lapic_write(LAPIC_SPIV, (lapic_read(LAPIC_SPIV) &
|
||||
~(LAPIC_VECTOR_MASK)) | LAPIC_SPIV_ENABLE);
|
||||
lapic_write(LAPIC_LVT0, (lapic_read(LAPIC_LVT0) &
|
||||
~(LAPIC_LVT_MASKED | LAPIC_LVT_LEVEL_TRIGGER |
|
||||
LAPIC_LVT_REMOTE_IRR | LAPIC_INPUT_POLARITY |
|
||||
LAPIC_SEND_PENDING | LAPIC_LVT_RESERVED_1 |
|
||||
LAPIC_DELIVERY_MODE_MASK)) |
|
||||
(LAPIC_LVT_REMOTE_IRR | LAPIC_SEND_PENDING |
|
||||
LAPIC_DELIVERY_MODE_EXTINT));
|
||||
lapic_write(LAPIC_LVT1, (lapic_read(LAPIC_LVT1) &
|
||||
~(LAPIC_LVT_MASKED | LAPIC_LVT_LEVEL_TRIGGER |
|
||||
LAPIC_LVT_REMOTE_IRR | LAPIC_INPUT_POLARITY |
|
||||
LAPIC_SEND_PENDING | LAPIC_LVT_RESERVED_1 |
|
||||
LAPIC_DELIVERY_MODE_MASK)) |
|
||||
(LAPIC_LVT_REMOTE_IRR | LAPIC_SEND_PENDING |
|
||||
LAPIC_DELIVERY_MODE_NMI));
|
||||
|
||||
debug("apic_id: 0x%02lx, ", lapicid());
|
||||
#else /* !CONFIG_SMP */
|
||||
|
|
|
|||
|
|
@ -16,7 +16,9 @@
|
|||
#include <asm/interrupt.h>
|
||||
#include <asm/lapic.h>
|
||||
#include <asm/mp.h>
|
||||
#include <asm/msr.h>
|
||||
#include <asm/mtrr.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/sipi.h>
|
||||
#include <dm/device-internal.h>
|
||||
#include <dm/uclass-internal.h>
|
||||
|
|
@ -59,6 +61,13 @@ static inline void release_barrier(atomic_t *b)
|
|||
atomic_set(b, 1);
|
||||
}
|
||||
|
||||
static inline void stop_this_cpu(void)
|
||||
{
|
||||
/* Called by an AP when it is ready to halt and wait for a new task */
|
||||
for (;;)
|
||||
cpu_hlt();
|
||||
}
|
||||
|
||||
/* Returns 1 if timeout waiting for APs. 0 if target APs found */
|
||||
static int wait_for_aps(atomic_t *val, int target, int total_delay,
|
||||
int delay_step)
|
||||
|
|
@ -317,9 +326,9 @@ static int start_aps(int ap_count, atomic_t *num_aps)
|
|||
}
|
||||
|
||||
/* Send INIT IPI to all but self */
|
||||
lapic_write_around(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(0));
|
||||
lapic_write_around(LAPIC_ICR, LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT |
|
||||
LAPIC_DM_INIT);
|
||||
lapic_write(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(0));
|
||||
lapic_write(LAPIC_ICR, LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT |
|
||||
LAPIC_DM_INIT);
|
||||
debug("Waiting for 10ms after sending INIT.\n");
|
||||
mdelay(10);
|
||||
|
||||
|
|
@ -334,9 +343,9 @@ static int start_aps(int ap_count, atomic_t *num_aps)
|
|||
}
|
||||
}
|
||||
|
||||
lapic_write_around(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(0));
|
||||
lapic_write_around(LAPIC_ICR, LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT |
|
||||
LAPIC_DM_STARTUP | sipi_vector);
|
||||
lapic_write(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(0));
|
||||
lapic_write(LAPIC_ICR, LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT |
|
||||
LAPIC_DM_STARTUP | sipi_vector);
|
||||
debug("Waiting for 1st SIPI to complete...");
|
||||
if (apic_wait_timeout(10000, 50)) {
|
||||
debug("timed out.\n");
|
||||
|
|
@ -359,9 +368,9 @@ static int start_aps(int ap_count, atomic_t *num_aps)
|
|||
}
|
||||
}
|
||||
|
||||
lapic_write_around(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(0));
|
||||
lapic_write_around(LAPIC_ICR, LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT |
|
||||
LAPIC_DM_STARTUP | sipi_vector);
|
||||
lapic_write(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(0));
|
||||
lapic_write(LAPIC_ICR, LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT |
|
||||
LAPIC_DM_STARTUP | sipi_vector);
|
||||
debug("Waiting for 2nd SIPI to complete...");
|
||||
if (apic_wait_timeout(10000, 50)) {
|
||||
debug("timed out.\n");
|
||||
|
|
|
|||
|
|
@ -9,11 +9,6 @@
|
|||
#ifndef _ARCH_ASM_LAPIC_H
|
||||
#define _ARCH_ASM_LAPIC_H
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/msr.h>
|
||||
#include <asm/msr-index.h>
|
||||
#include <asm/processor.h>
|
||||
|
||||
#define LAPIC_DEFAULT_BASE 0xfee00000
|
||||
|
||||
#define LAPIC_ID 0x020
|
||||
|
|
@ -66,126 +61,17 @@
|
|||
#define LAPIC_DELIVERY_MODE_NMI (4 << 8)
|
||||
#define LAPIC_DELIVERY_MODE_EXTINT (7 << 8)
|
||||
|
||||
static inline __attribute__((always_inline))
|
||||
unsigned long lapic_read(unsigned long reg)
|
||||
{
|
||||
return readl(LAPIC_DEFAULT_BASE + reg);
|
||||
}
|
||||
unsigned long lapic_read(unsigned long reg);
|
||||
|
||||
static inline __attribute__((always_inline))
|
||||
void lapic_write(unsigned long reg, unsigned long val)
|
||||
{
|
||||
writel(val, LAPIC_DEFAULT_BASE + reg);
|
||||
}
|
||||
void lapic_write(unsigned long reg, unsigned long v);
|
||||
|
||||
static inline __attribute__((always_inline)) void lapic_wait_icr_idle(void)
|
||||
{
|
||||
do { } while (lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY);
|
||||
}
|
||||
void enable_lapic(void);
|
||||
|
||||
static inline void enable_lapic(void)
|
||||
{
|
||||
msr_t msr;
|
||||
void disable_lapic(void);
|
||||
|
||||
msr = msr_read(MSR_IA32_APICBASE);
|
||||
msr.hi &= 0xffffff00;
|
||||
msr.lo |= MSR_IA32_APICBASE_ENABLE;
|
||||
msr.lo &= ~MSR_IA32_APICBASE_BASE;
|
||||
msr.lo |= LAPIC_DEFAULT_BASE;
|
||||
msr_write(MSR_IA32_APICBASE, msr);
|
||||
}
|
||||
unsigned long lapicid(void);
|
||||
|
||||
static inline void disable_lapic(void)
|
||||
{
|
||||
msr_t msr;
|
||||
|
||||
msr = msr_read(MSR_IA32_APICBASE);
|
||||
msr.lo &= ~MSR_IA32_APICBASE_ENABLE;
|
||||
msr_write(MSR_IA32_APICBASE, msr);
|
||||
}
|
||||
|
||||
static inline __attribute__((always_inline)) unsigned long lapicid(void)
|
||||
{
|
||||
return lapic_read(LAPIC_ID) >> 24;
|
||||
}
|
||||
|
||||
static inline __attribute__((always_inline)) void stop_this_cpu(void)
|
||||
{
|
||||
/* Called by an AP when it is ready to halt and wait for a new task */
|
||||
for (;;)
|
||||
cpu_hlt();
|
||||
}
|
||||
|
||||
#define xchg(ptr, v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v), (ptr), \
|
||||
sizeof(*(ptr))))
|
||||
|
||||
struct __xchg_dummy { unsigned long a[100]; };
|
||||
#define __xg(x) ((struct __xchg_dummy *)(x))
|
||||
|
||||
/*
|
||||
* Note: no "lock" prefix even on SMP. xchg always implies lock anyway.
|
||||
*
|
||||
* Note 2: xchg has side effect, so that attribute volatile is necessary,
|
||||
* but generally the primitive is invalid, *ptr is output argument.
|
||||
*/
|
||||
static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
|
||||
int size)
|
||||
{
|
||||
switch (size) {
|
||||
case 1:
|
||||
__asm__ __volatile__("xchgb %b0,%1"
|
||||
: "=q" (x)
|
||||
: "m" (*__xg(ptr)), "0" (x)
|
||||
: "memory");
|
||||
break;
|
||||
case 2:
|
||||
__asm__ __volatile__("xchgw %w0,%1"
|
||||
: "=r" (x)
|
||||
: "m" (*__xg(ptr)), "0" (x)
|
||||
: "memory");
|
||||
break;
|
||||
case 4:
|
||||
__asm__ __volatile__("xchgl %0,%1"
|
||||
: "=r" (x)
|
||||
: "m" (*__xg(ptr)), "0" (x)
|
||||
: "memory");
|
||||
break;
|
||||
}
|
||||
|
||||
return x;
|
||||
}
|
||||
|
||||
static inline void lapic_write_atomic(unsigned long reg, unsigned long v)
|
||||
{
|
||||
(void)xchg((volatile unsigned long *)(LAPIC_DEFAULT_BASE + reg), v);
|
||||
}
|
||||
|
||||
#define lapic_read_around(x) lapic_read(x)
|
||||
#define lapic_write_around(x, y) lapic_write_atomic((x), (y))
|
||||
|
||||
static inline int lapic_remote_read(int apicid, int reg, unsigned long *pvalue)
|
||||
{
|
||||
int timeout;
|
||||
unsigned long status;
|
||||
int result;
|
||||
|
||||
lapic_wait_icr_idle();
|
||||
lapic_write_around(LAPIC_ICR2, SET_LAPIC_DEST_FIELD(apicid));
|
||||
lapic_write_around(LAPIC_ICR, LAPIC_DM_REMRD | (reg >> 4));
|
||||
|
||||
timeout = 0;
|
||||
do {
|
||||
status = lapic_read(LAPIC_ICR) & LAPIC_ICR_RR_MASK;
|
||||
} while (status == LAPIC_ICR_RR_INPROG && timeout++ < 1000);
|
||||
|
||||
result = -1;
|
||||
if (status == LAPIC_ICR_RR_VALID) {
|
||||
*pvalue = lapic_read(LAPIC_RRR);
|
||||
result = 0;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
int lapic_remote_read(int apicid, int reg, unsigned long *pvalue);
|
||||
|
||||
void lapic_setup(void);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue