Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/include/asm-mips/dec ioasic.h,NONE,1.1 interrupts.h,1.1.1.1,1.2 ioasic_addrs.h,1.1.1.1,1.2 kn02.h,1.1.1.1,1.2 kn02xa.h,1.1.1.1,1.2 kn03.h,1.1.1.1,1.2 tcmodule.h,1.1.1.1,1.2
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-mips/dec
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-mips/dec
Modified Files:
interrupts.h ioasic_addrs.h kn02.h kn02xa.h kn03.h tcmodule.h
Added Files:
ioasic.h
Log Message:
Synch to 2.4.15 commit 1
--- NEW FILE ---
/*
* linux/asm-mips/dec/ioasic.h
*
* Copyright (C) 2000 Maciej W. Rozycki
*
* DEC I/O ASIC access operations.
*/
#ifndef __ASM_DEC_IOASIC_H
#define __ASM_DEC_IOASIC_H
extern volatile unsigned int *ioasic_base;
extern inline void ioasic_write(unsigned int reg, unsigned int v)
{
ioasic_base[reg / 4] = v;
}
extern inline unsigned int ioasic_read(unsigned int reg)
{
return ioasic_base[reg / 4];
}
#endif /* __ASM_DEC_IOASIC_H */
Index: interrupts.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/dec/interrupts.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- interrupts.h 14 Jan 2001 16:50:53 -0000 1.1.1.1
+++ interrupts.h 9 Apr 2002 12:33:14 -0000 1.2
@@ -36,7 +36,7 @@
#define NR_INTS 11
-#ifndef _LANGUAGE_ASSEMBLY
+#ifndef __ASSEMBLY__
/*
* Data structure to hide the differences between the DECstation Interrupts
*
@@ -50,6 +50,12 @@
unsigned int iemask; /* enabling interrupts in IRQ Controller */
} decint_t;
+extern volatile unsigned int *isr;
+ /* address of the interrupt status register */
+extern volatile unsigned int *imr;
+ /* address of the interrupt mask register */
+extern decint_t dec_interrupt[NR_INTS];
+
/*
* Interrupt table structure to hide differences between different
* systems such.
@@ -68,10 +74,8 @@
extern void dec_intr_rtc(void);
extern void kn02_io_int(void);
-extern void kn02ba_io_int(void);
+extern void kn02xa_io_int(void);
extern void kn03_io_int(void);
-
-extern void intr_halt(void);
extern void asic_intr_unimplemented(void);
Index: ioasic_addrs.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/dec/ioasic_addrs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ioasic_addrs.h 14 Jan 2001 16:50:54 -0000 1.1.1.1
+++ ioasic_addrs.h 9 Apr 2002 12:33:14 -0000 1.2
@@ -17,25 +17,25 @@
#define CHUNK_SIZE 0x00040000
-#define SYSTEM_ROM 00*CHUNK_SIZE /* ??? */
-#define IOCTL 01*CHUNK_SIZE
-#define ESAR 02*CHUNK_SIZE
-#define LANCE 03*CHUNK_SIZE
-#define SCC0 04*CHUNK_SIZE
-#define VDAC_HI 05*CHUNK_SIZE /* maxine only */
-#define SCC1 06*CHUNK_SIZE
-#define VDAC_LO 07*CHUNK_SIZE /* maxine only */
-#define TOY 08*CHUNK_SIZE
-#define ISDN 09*CHUNK_SIZE /* maxine only */
-#define ERRADDR 09*CHUNK_SIZE /* 3maxplus only */
-#define CHKSYN 10*CHUNK_SIZE /* 3maxplus only */
-#define ACCESS_BUS 10*CHUNK_SIZE /* maxine only */
-#define MCR 11*CHUNK_SIZE /* 3maxplus only */
-#define FLOPPY 11*CHUNK_SIZE /* maxine only */
-#define SCSI 12*CHUNK_SIZE
-#define FLOPPY_DMA 13*CHUNK_SIZE /* maxine only */
-#define SCSI_DMA 14*CHUNK_SIZE
-#define RESERVED_4 15*CHUNK_SIZE
+#define SYSTEM_ROM (0*CHUNK_SIZE) /* ??? */
+#define IOCTL (1*CHUNK_SIZE)
+#define ESAR (2*CHUNK_SIZE)
+#define LANCE (3*CHUNK_SIZE)
+#define SCC0 (4*CHUNK_SIZE)
+#define VDAC_HI (5*CHUNK_SIZE) /* maxine only */
+#define SCC1 (6*CHUNK_SIZE)
+#define VDAC_LO (7*CHUNK_SIZE) /* maxine only */
+#define TOY (8*CHUNK_SIZE)
+#define ISDN (9*CHUNK_SIZE) /* maxine only */
+#define ERRADDR (9*CHUNK_SIZE) /* 3maxplus only */
+#define CHKSYN (10*CHUNK_SIZE) /* 3maxplus only */
+#define ACCESS_BUS (10*CHUNK_SIZE) /* maxine only */
+#define MCR (11*CHUNK_SIZE) /* 3maxplus only */
+#define FLOPPY (11*CHUNK_SIZE) /* maxine only */
+#define SCSI (12*CHUNK_SIZE)
+#define FLOPPY_DMA (13*CHUNK_SIZE) /* maxine only */
+#define SCSI_DMA (14*CHUNK_SIZE)
+#define RESERVED_4 (15*CHUNK_SIZE)
/*
* Offsets for IOCTL registers (relative to (system_base + IOCTL))
@@ -56,6 +56,7 @@
#define SSR 0x100 /* System Support Register */
#define SIR 0x110 /* System Interrupt Register */
#define SIMR 0x120 /* System Interrupt Mask Register */
+#define FCTR 0x1e0 /* Free-Running Counter */
/*
* Handle partial word SCSI DMA transfers
Index: kn02.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/dec/kn02.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- kn02.h 14 Jan 2001 16:50:55 -0000 1.1.1.1
+++ kn02.h 9 Apr 2002 12:33:14 -0000 1.2
@@ -28,6 +28,8 @@
#define KN02_RTC_BASE KSEG1ADDR(0x1fe80000)
#define KN02_DZ11_BASE KSEG1ADDR(0x1fe00000)
+#define KN02_CSR_BNK32M (1<<10) /* 32M stride */
+
/*
* Interrupt enable Bits
*/
Index: kn02xa.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/dec/kn02xa.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- kn02xa.h 14 Jan 2001 16:50:55 -0000 1.1.1.1
+++ kn02xa.h 9 Apr 2002 12:33:14 -0000 1.2
@@ -9,6 +9,7 @@
*
* Copyright (C) 1995,1996 by Paul M. Antoine, some code and definitions
* are by curteousy of Chris Fraser.
+ * Copyright (C) 2000 Maciej W. Rozycki
*
* These are addresses which have to be known early in the boot process.
* For other addresses refer to tc.h ioasic_addrs.h and friends.
@@ -19,16 +20,12 @@
#include <asm/addrspace.h>
/*
- * Motherboard regs (kseg1 addresses)
- */
-#define KN02XA_SSR_ADDR KSEG1ADDR(0x1c040100) /* system control & status reg */
-#define KN02XA_SIR_ADDR KSEG1ADDR(0x1c040110) /* system interrupt reg */
-#define KN02XA_SIRM_ADDR KSEG1ADDR(0x1c040120) /* system interrupt mask reg */
-
-/*
* Some port addresses...
* FIXME: these addresses are incomplete and need tidying up!
*/
-#define KN02XA_RTC_BASE (KSEG1ADDR(0x1c000000 + 0x200000)) /* ASIC + SL8 */
+#define KN02XA_IOASIC_BASE KSEG1ADDR(0x1c040000) /* I/O ASIC */
+#define KN02XA_RTC_BASE KSEG1ADDR(0x1c200000) /* RTC */
+
+#define KN02XA_IOASIC_REG(r) (KN02XA_IOASIC_BASE+(r))
#endif /* __ASM_MIPS_DEC_KN02XA_H */
Index: kn03.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/dec/kn03.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- kn03.h 14 Jan 2001 16:50:55 -0000 1.1.1.1
+++ kn03.h 9 Apr 2002 12:33:14 -0000 1.2
@@ -8,6 +8,7 @@
*
* Copyright (C) 1995,1996 by Paul M. Antoine, some code and definitions
* are by curteousy of Chris Fraser.
+ * Copyright (C) 2000 Maciej W. Rozycki
*
* These are addresses which have to be known early in the boot process.
* For other addresses refer to tc.h ioasic_addrs.h and friends.
@@ -18,16 +19,16 @@
#include <asm/addrspace.h>
/*
- * Motherboard regs (kseg1 addresses)
- */
-#define KN03_SSR_ADDR KSEG1ADDR(0x1f840100) /* system control & status reg */
-#define KN03_SIR_ADDR KSEG1ADDR(0x1f840110) /* system interrupt reg */
-#define KN03_SIRM_ADDR KSEG1ADDR(0x1f840120) /* system interrupt mask reg */
-
-/*
* Some port addresses...
* FIXME: these addresses are incomplete and need tidying up!
*/
-#define KN03_RTC_BASE (KSEG1ADDR(0x1f800000 + 0x200000)) /* ASIC + SL8 */
+#define KN03_IOASIC_BASE KSEG1ADDR(0x1f840000) /* I/O ASIC */
+#define KN03_RTC_BASE KSEG1ADDR(0x1fa00000) /* RTC */
+#define KN03_MCR_BASE KSEG1ADDR(0x1fac0000) /* MCR */
+
+#define KN03_MCR_BNK32M (1<<10) /* 32M stride */
+#define KN03_MCR_ECCEN (1<<13) /* ECC enabled */
+
+#define KN03_IOASIC_REG(r) (KN03_IOASIC_BASE+(r))
#endif /* __ASM_MIPS_DEC_KN03_H */
Index: tcmodule.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips/dec/tcmodule.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tcmodule.h 14 Jan 2001 16:50:56 -0000 1.1.1.1
+++ tcmodule.h 9 Apr 2002 12:33:14 -0000 1.2
@@ -15,21 +15,24 @@
*
* Jan.1998 Harald Koerfgen
*/
+#ifndef __ASM_DEC_TCMOULE_H
+#define __ASM_DEC_TCMOULE_H
#define OLDCARD 0x3c0000
-#define ROM_WIDTH 0x3e0
-#define ROM_STRIDE 0x3e4
-#define ROM_SIZE 0x3e8
-#define SLOT_SIZE 0x3ec
-#define PATTERN0 0x3f0
-#define PATTERN1 0x3f4
-#define PATTERN2 0x3f8
-#define PATTERN3 0x3fc
-#define FIRM_VER 0x400
-#define VENDOR 0x420
-#define MODULE 0x440
-#define FIRM_TYPE 0x460
-#define FLAGS 0x470
+#define TC_ROM_WIDTH 0x3e0
+#define TC_ROM_STRIDE 0x3e4
+#define TC_ROM_SIZE 0x3e8
+#define TC_SLOT_SIZE 0x3ec
+#define TC_PATTERN0 0x3f0
+#define TC_PATTERN1 0x3f4
+#define TC_PATTERN2 0x3f8
+#define TC_PATTERN3 0x3fc
+#define TC_FIRM_VER 0x400
+#define TC_VENDOR 0x420
+#define TC_MODULE 0x440
+#define TC_FIRM_TYPE 0x460
+#define TC_FLAGS 0x470
+#define TC_ROM_OBJECTS 0x480
-#define ROM_OBJECTS 0x480
+#endif /* __ASM_DEC_TCMOULE_H */
|
