summaryrefslogtreecommitdiffstats
path: root/arch/mips/dec/kn01-berr.c
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2005-07-01 16:10:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:31:35 +0100
commita5fc9c0bbee8b91025993a49a9176a88380aef3c (patch)
treee68ee45e852028ddde712abb18531777dba6e468 /arch/mips/dec/kn01-berr.c
parent7d7ee221213609319401d1b9d6dc4bf22ab928ea (diff)
downloadop-kernel-dev-a5fc9c0bbee8b91025993a49a9176a88380aef3c.zip
op-kernel-dev-a5fc9c0bbee8b91025993a49a9176a88380aef3c.tar.gz
Use physical addresses at the interface level, letting drivers remap
them as appropriate. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/dec/kn01-berr.c')
-rw-r--r--arch/mips/dec/kn01-berr.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/mips/dec/kn01-berr.c b/arch/mips/dec/kn01-berr.c
index 8ec7b30..b9271db 100644
--- a/arch/mips/dec/kn01-berr.c
+++ b/arch/mips/dec/kn01-berr.c
@@ -51,7 +51,7 @@ DEFINE_SPINLOCK(kn01_lock);
static inline void dec_kn01_be_ack(void)
{
- volatile u16 *csr = (void *)(KN01_SLOT_BASE + KN01_CSR);
+ volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);
unsigned long flags;
spin_lock_irqsave(&kn01_lock, flags);
@@ -64,7 +64,8 @@ static inline void dec_kn01_be_ack(void)
static int dec_kn01_be_backend(struct pt_regs *regs, int is_fixup, int invoker)
{
- volatile u32 *kn01_erraddr = (void *)(KN01_SLOT_BASE + KN01_ERRADDR);
+ volatile u32 *kn01_erraddr = (void *)CKSEG1ADDR(KN01_SLOT_BASE +
+ KN01_ERRADDR);
static const char excstr[] = "exception";
static const char intstr[] = "interrupt";
@@ -152,7 +153,7 @@ int dec_kn01_be_handler(struct pt_regs *regs, int is_fixup)
irqreturn_t dec_kn01_be_interrupt(int irq, void *dev_id,
struct pt_regs *regs)
{
- volatile u16 *csr = (void *)(KN01_SLOT_BASE + KN01_CSR);
+ volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);
int action;
if (!(*csr & KN01_CSR_MEMERR))
@@ -178,7 +179,7 @@ irqreturn_t dec_kn01_be_interrupt(int irq, void *dev_id,
void __init dec_kn01_be_init(void)
{
- volatile u16 *csr = (void *)(KN01_SLOT_BASE + KN01_CSR);
+ volatile u16 *csr = (void *)CKSEG1ADDR(KN01_SLOT_BASE + KN01_CSR);
unsigned long flags;
spin_lock_irqsave(&kn01_lock, flags);
OpenPOWER on IntegriCloud