m68k patches
Subsystems (10)
cover m68k patches
Hi,
A series of m68k related patches, the first patches are mostly bug fixes and the rest are a major cleanup of the m68k irq system, which gets it a lot closer to the generic code.
bye, Roman
--
arch/m68k/amiga/amiga_ksyms.c | 2 arch/m68k/amiga/amiints.c | 384 +++---------------------------- arch/m68k/amiga/cia.c | 156 ++++++------ arch/m68k/amiga/config.c | 15 - arch/m68k/apollo/Makefile | 2 arch/m68k/apollo/config.c | 24 - arch/m68k/apollo/dn_ints.c | 137 ++--------- arch/m68k/atari/ataints.c | 278 +++------------------- arch/m68k/atari/config.c | 11 arch/m68k/bvme6000/Makefile | 2 arch/m68k/bvme6000/bvmeints.c | 160 ------------- arch/m68k/bvme6000/config.c | 21 - arch/m68k/hp300/Makefile | 2 arch/m68k/hp300/config.c | 11 arch/m68k/hp300/ints.c | 175 -------------- arch/m68k/hp300/ints.h | 9 arch/m68k/hp300/time.c | 3 arch/m68k/kernel/Makefile | 4 arch/m68k/kernel/dma.c | 129 ++++++++++ arch/m68k/kernel/entry.S | 100 +++----- arch/m68k/kernel/ints.c | 378 ++++++++++++++++++++---------- arch/m68k/kernel/m68k_ksyms.c | 2 arch/m68k/kernel/setup.c | 3 arch/m68k/kernel/traps.c | 180 ++++++-------- arch/m68k/mac/baboon.c | 2 arch/m68k/mac/config.c | 20 - arch/m68k/mac/iop.c | 2 arch/m68k/mac/macints.c | 503 ++++++++++------------------------------- arch/m68k/mac/oss.c | 14 - arch/m68k/mac/psc.c | 10 arch/m68k/mac/via.c | 18 - arch/m68k/mm/kmap.c | 6 arch/m68k/mvme147/147ints.c | 145 ----------- arch/m68k/mvme147/Makefile | 2 arch/m68k/mvme147/config.c | 22 - arch/m68k/mvme16x/16xints.c | 149 ------------ arch/m68k/mvme16x/Makefile | 2 arch/m68k/mvme16x/config.c | 23 - arch/m68k/q40/config.c | 13 - arch/m68k/q40/q40ints.c | 485 +++++++++++++-------------------------- arch/m68k/sun3/config.c | 8 arch/m68k/sun3/sun3ints.c | 210 ++--------------- arch/m68k/sun3x/config.c | 7 drivers/block/amiflop.c | 1 drivers/macintosh/via-pmu68k.c | 3 drivers/net/sun3lance.c | 2 drivers/scsi/mac_esp.c | 7 drivers/scsi/mac_scsi.c | 7 drivers/scsi/sun3x_esp.c | 8 include/asm-m68k/amigaints.h | 94 +++---- include/asm-m68k/apollohw.h | 4 include/asm-m68k/atari_stdma.h | 2 include/asm-m68k/atariints.h | 11 include/asm-m68k/bvme6000hw.h | 30 +- include/asm-m68k/cacheflush.h | 40 +-- include/asm-m68k/dma-mapping.h | 90 ++++++- include/asm-m68k/irq.h | 110 ++++---- include/asm-m68k/mac_oss.h | 10 include/asm-m68k/machdep.h | 6 include/asm-m68k/macintosh.h | 10 include/asm-m68k/macints.h | 14 - include/asm-m68k/mvme147hw.h | 44 +-- include/asm-m68k/mvme16xhw.h | 40 +-- include/asm-m68k/scatterlist.h | 9 include/asm-m68k/signal.h | 19 + include/asm-m68k/sun3ints.h | 22 - include/asm-m68k/traps.h | 7 include/asm-m68k/uaccess.h | 234 ++++++++++--------- 68 files changed, 1519 insertions(+), 3134 deletions(-)
PATCH 1/21 fix uaccess.h for gcc-3.x
gcc-3.x has a few problems detecting a constant parameter.
---
include/asm-m68k/uaccess.h | 234 ++++++++++++++++++++++++-------------------- 1 files changed, 127 insertions(+), 107 deletions(-)
fc73eb3c1c20f01114bd452fc8140ead1575e447
include/asm-m68k/uaccess.h +127 -107
@@ -181,144 +181,164 @@ #define get_user(x, ptr) __get_user(x, punsigned long __generic_copy_from_user (void *to,const void __user *from,unsigned long n);unsigned long __generic_copy_to_user (void __user *to,const void *from,unsigned long n); +#define __constant_copy_from_user_asm (res, to, from, tmp, n, s1, s2, s3)\ + asm volatile ("\n" \ + "1: moves."#s1" (%2)+,%3\n" \ + " move."#s1" %3,(%1)+\n" \ + "2: moves."#s2" (%2)+,%3\n" \ + " move."#s2" %3,(%1)+\n" \ + " .ifnc \""#s3"\",\"\"\n" \ + "3: moves."#s3" (%2)+,%3\n" \ + " move."#s3" %3,(%1)+\n" \ + " .endif\n" \ + "4:\n" \ + " .section __ex_table,\"a\"\n" \ + " .align 4\n" \ + " .long 1b,10f\n" \ + " .long 2b,20f\n" \ + " .ifnc \""#s3"\",\"\"\n" \ + " .long 3b,30f\n" \ + " .endif\n" \ + " .previous\n" \ + "\n" \ + " .section .fixup,\"ax\"\n" \ + " .even\n" \ + "10: clr."#s1" (%1)+\n" \ + "20: clr."#s2" (%1)+\n" \ + " .ifnc \""#s3"\",\"\"\n" \ + "30: clr."#s3" (%1)+\n" \ + " .endif\n" \ + " moveq.l #"#n",%0\n" \ + " jra 4b\n" \ + " .previous\n" \ + : "+d" (res), "+&a" (to), "+a" (from), "=&d" (tmp) \ + : : "memory") +static __always_inline unsigned long __constant_copy_from_user (void *to,const void __user *from,unsigned long n) {unsigned long res =0 , tmp; -/* limit the inlined version to 3 moves */ -if (n ==11 || n >12 ) -return __generic_copy_from_user (to, from, n); -switch (n) {case 1 :__get_user_asm (res, *(u8 *)to, (u8 *)from, u8, b, d,1 ); -return res; +break ;case 2 :__get_user_asm (res, *(u16 *)to, (u16 *)from, u16, w, d,2 ); -return res; +break ; +case 3 : + __constant_copy_from_user_asm(res, to, from, tmp, 3, w, b,); +break ;case 4 :__get_user_asm (res, *(u32 *)to, (u32 *)from, u32, l, r,4 ); -return res; +break ; +case 5 : + __constant_copy_from_user_asm(res, to, from, tmp, 5, l, b,); +break ; +case 6 : + __constant_copy_from_user_asm(res, to, from, tmp, 6, l, w,); +break ; +case 7 : +__constant_copy_from_user_asm (res, to, from, tmp,7 , l, w, b); +break ; +case 8 : + __constant_copy_from_user_asm(res, to, from, tmp, 8, l, l,); +break ; +case 9 : +__constant_copy_from_user_asm (res, to, from, tmp,9 , l, l, b); +break ; +case 10 : +__constant_copy_from_user_asm (res, to, from, tmp,10 , l, l, w); +break ; +case 12 : +__constant_copy_from_user_asm (res, to, from, tmp,12 , l, l, l); +break ; +default : +/* we limit the inlined version to 3 moves */ +return __generic_copy_from_user (to, from, n); } - asmvolatile ("\n" -" .ifndef .Lfrom_user\n" -" .set .Lfrom_user,1\n" -" .macro copy_from_user to,from,tmp\n" -" .if .Lcnt >= 4\n" -"1: moves.l (\\from)+,\\tmp\n" -" move.l \\tmp,(\\to)+\n" -" .set .Lcnt,.Lcnt-4\n" -" .elseif .Lcnt & 2\n" -"1: moves.w (\\from)+,\\tmp\n" -" move.w \\tmp,(\\to)+\n" -" .set .Lcnt,.Lcnt-2\n" -" .elseif .Lcnt & 1\n" -"1: moves.b (\\from)+,\\tmp\n" -" move.b \\tmp,(\\to)+\n" -" .set .Lcnt,.Lcnt-1\n" -" .else\n" -" .exitm\n" -" .endif\n" -"\n" -" .section __ex_table,\"a\"\n" -" .align 4\n" -" .long 1b,3f\n" -" .previous\n" -" .endm\n" -" .endif\n" -"\n" -" .set .Lcnt,%c4\n" -" copy_from_user %1,%2,%3\n" -" copy_from_user %1,%2,%3\n" -" copy_from_user %1,%2,%3\n" -"2:\n" -" .section .fixup,\"ax\"\n" -" .even\n" -"3: moveq.l %4,%0\n" -" move.l %5,%1\n" -" .rept %c4 / 4\n" -" clr.l (%1)+\n" -" .endr\n" -" .if %c4 & 2\n" -" clr.w (%1)+\n" -" .endif\n" -" .if %c4 & 1\n" -" clr.b (%1)+\n" -" .endif\n" -" jra 2b\n" -" .previous\n" - :"+r" (res),"+a" (to),"+a" (from),"=&d" (tmp) - :"i" (n),"g" (to) - :"memory" ); -return res; } +#define __constant_copy_to_user_asm (res, to, from, tmp, n, s1, s2, s3) \ + asm volatile ("\n" \ + " move."#s1" (%2)+,%3\n" \ + "11: moves."#s1" %3,(%1)+\n" \ + "12: move."#s2" (%2)+,%3\n" \ + "21: moves."#s2" %3,(%1)+\n" \ + "22:\n" \ + " .ifnc \""#s3"\",\"\"\n" \ + " move."#s3" (%2)+,%3\n" \ + "31: moves."#s3" %3,(%1)+\n" \ + "32:\n" \ + " .endif\n" \ + "4:\n" \ + "\n" \ + " .section __ex_table,\"a\"\n" \ + " .align 4\n" \ + " .long 11b,5f\n" \ + " .long 12b,5f\n" \ + " .long 21b,5f\n" \ + " .long 22b,5f\n" \ + " .ifnc \""#s3"\",\"\"\n" \ + " .long 31b,5f\n" \ + " .long 32b,5f\n" \ + " .endif\n" \ + " .previous\n" \ + "\n" \ + " .section .fixup,\"ax\"\n" \ + " .even\n" \ + "5: moveq.l #"#n",%0\n" \ + " jra 4b\n" \ + " .previous\n" \ + : "+d" (res), "+a" (to), "+a" (from), "=&d" (tmp) \ + : : "memory") +static __always_inline unsigned long __constant_copy_to_user (void __user *to,const void *from,unsigned long n) {unsigned long res =0 , tmp; -/* limit the inlined version to 3 moves */ -if (n ==11 || n >12 ) -return __generic_copy_to_user (to, from, n); -switch (n) {case 1 :__put_user_asm (res, *(u8 *)from, (u8 *)to, b, d,1 ); -return res; +break ;case 2 :__put_user_asm (res, *(u16 *)from, (u16 *)to, w, d,2 ); -return res; +break ; +case 3 : + __constant_copy_to_user_asm(res, to, from, tmp, 3, w, b,); +break ;case 4 :__put_user_asm (res, *(u32 *)from, (u32 *)to, l, r,4 ); -return res; +break ; +case 5 : + __constant_copy_to_user_asm(res, to, from, tmp, 5, l, b,); +break ; +case 6 : + __constant_copy_to_user_asm(res, to, from, tmp, 6, l, w,); +break ; +case 7 : +__constant_copy_to_user_asm (res, to, from, tmp,7 , l, w, b); +break ; +case 8 : + __constant_copy_to_user_asm(res, to, from, tmp, 8, l, l,); +break ; +case 9 : +__constant_copy_to_user_asm (res, to, from, tmp,9 , l, l, b); +break ; +case 10 : +__constant_copy_to_user_asm (res, to, from, tmp,10 , l, l, w); +break ; +case 12 : +__constant_copy_to_user_asm (res, to, from, tmp,12 , l, l, l); +break ; +default : +/* limit the inlined version to 3 moves */ +return __generic_copy_to_user (to, from, n); } - asmvolatile ("\n" -" .ifndef .Lto_user\n" -" .set .Lto_user,1\n" -" .macro copy_to_user to,from,tmp\n" -" .if .Lcnt >= 4\n" -" move.l (\\from)+,\\tmp\n" -"11: moves.l \\tmp,(\\to)+\n" -"12: .set .Lcnt,.Lcnt-4\n" -" .elseif .Lcnt & 2\n" -" move.w (\\from)+,\\tmp\n" -"11: moves.w \\tmp,(\\to)+\n" -"12: .set .Lcnt,.Lcnt-2\n" -" .elseif .Lcnt & 1\n" -" move.b (\\from)+,\\tmp\n" -"11: moves.b \\tmp,(\\to)+\n" -"12: .set .Lcnt,.Lcnt-1\n" -" .else\n" -" .exitm\n" -" .endif\n" -"\n" -" .section __ex_table,\"a\"\n" -" .align 4\n" -" .long 11b,3f\n" -" .long 12b,3f\n" -" .previous\n" -" .endm\n" -" .endif\n" -"\n" -" .set .Lcnt,%c4\n" -" copy_to_user %1,%2,%3\n" -" copy_to_user %1,%2,%3\n" -" copy_to_user %1,%2,%3\n" -"2:\n" -" .section .fixup,\"ax\"\n" -" .even\n" -"3: moveq.l %4,%0\n" -" jra 2b\n" -" .previous\n" - :"+r" (res),"+a" (to),"+a" (from),"=&d" (tmp) - :"i" (n) - :"memory" ); -return res; }
Signature · 3 lines
1.3.3 --
PATCH 2/21 fix constraints of the signal functions and some cleanup
In reply to [email protected]---
include/asm-m68k/signal.h | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)
5bc06b9ae874f25bf2fd68ecd1aabcd09518d189
include/asm-m68k/signal.h +14 -5
@@ -156,13 +156,17 @@ #define __HAVE_ARCH_SIG_BITOPSstatic inline void sigaddset (sigset_t *set,int _sig) { - __asm__("bfset %0{%1,#1}" :"=m" (*set) :"id" ((_sig -1 ) ^31 ) + asm ("bfset %0{%1,#1}" + :"+od" (*set) + :"id" ((_sig -1 ) ^31 ) :"cc" ); }static inline void sigdelset (sigset_t *set,int _sig) { - __asm__("bfclr %0{%1,#1}" :"=m" (*set) :"id" ((_sig -1 ) ^31 ) + asm ("bfclr %0{%1,#1}" + :"+od" (*set) + :"id" ((_sig -1 ) ^31 ) :"cc" ); }
@@ -175,8 +179,10 @@ static inline int __const_sigismember(sistatic inline int __gen_sigismember (sigset_t *set,int _sig) {int ret; - __asm__("bfextu %1{%2,#1},%0" - :"=d" (ret) :"m" (*set),"id" ((_sig-1 ) ^31 )); + asm ("bfextu %1{%2,#1},%0" + :"=d" (ret) + :"od" (*set),"id" ((_sig-1 ) ^31 ) + :"cc" );return ret; }
@@ -187,7 +193,10 @@ #define sigismember(set,sig) \static inline int sigfindinword (unsigned long word) { - __asm__("bfffo %1{#0,#0},%0" :"=d" (word) :"d" (word & -word) :"cc" ); + asm ("bfffo %1{#0,#0},%0" + :"=d" (word) + :"d" (word & -word) + :"cc" );return word ^31 ; }
Signature · 3 lines
1.3.3 --
PATCH 3/21 fix __iounmap for 030
In reply to [email protected]Ignore empty pmd entry during iomap (these are the holes between the mappings).
---
arch/m68k/mm/kmap.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
2a02d299d6158fb1cba1a2e7f0a446619db91648
arch/m68k/mm/kmap.c +4 -2
@@ -259,13 +259,15 @@ void __iounmap(void *addr, unsigned longif (CPU_IS_020_OR_030 ) {int pmd_off = (virtaddr/PTRTREESIZE ) &15 ; +int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK; -if ((pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK) == _PAGE_PRESENT) { +if (pmd_type == _PAGE_PRESENT) { pmd_dir->pmd[pmd_off] =0 ; virtaddr +=PTRTREESIZE ; size -=PTRTREESIZE ;continue ; - } + }else if (pmd_type ==0 ) +continue ; }if (pmd_bad (*pmd_dir)) {
Signature · 3 lines
1.3.3 --
PATCH 4/21 small flush_icache() cleanup
In reply to [email protected]Make flush_icache() an inline function and clean it up a litte.
---
include/asm-m68k/cacheflush.h | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-)
01911c188ddfe00537e598d3feaf5451627271a3
include/asm-m68k/cacheflush.h +20 -20
@@ -3,26 +3,30 @@ #define _M68K_CACHEFLUSH_H#include <linux/mm.h> +/* cache code */ +#define FLUSH_I_AND_D (0x00000808) +#define FLUSH_I (0x00000008) +/* * Cache handling functions */ -#define flush_icache () \ -({ \ - if (CPU_IS_040_OR_060) \ - __asm__ __volatile__("nop\n\t" \ - ".chip 68040\n\t" \ - "cinva %%ic\n\t" \ - ".chip 68k" : ); \ - else { \ - unsigned long _tmp; \ - __asm__ __volatile__("movec %%cacr,%0\n\t" \ - "orw %1,%0\n\t" \ - "movec %0,%%cacr" \ - : "=&d" (_tmp) \ - : "id" (FLUSH_I)); \ - } \ -}) +static inline void flush_icache (void ) +{ +if (CPU_IS_040_OR_060 ) + asmvolatile ("nop\n" +" .chip 68040\n" +" cpusha %bc\n" +" .chip 68k" ); +else { +unsigned long tmp; + asmvolatile ("movec %%cacr,%0\n" +" or.w %1,%0\n" +" movec %0,%%cacr" + :"=&d" (tmp) + :"id" (FLUSH_I )); + } +}/* * invalidate the cache for the specified memory range.
@@ -43,10 +47,6 @@ extern void cache_push(unsigned long pad*/ extern void cache_push_v (unsigned long vaddr,int len); -/* cache code */ -#define FLUSH_I_AND_D (0x00000808) -#define FLUSH_I (0x00000008) -/* This is needed whenever the virtual mapping of the current process changes. */ #define __flush_cache_all () \
Signature · 3 lines
1.3.3 --
PATCH 5/21 Add the generic dma API functions
In reply to [email protected]---
arch/m68k/apollo/Makefile | 2 - arch/m68k/kernel/Makefile | 4 + arch/m68k/kernel/dma.c | 129 ++++++++++++++++++++++++++++++++++++++++ drivers/scsi/sun3x_esp.c | 8 +- include/asm-m68k/dma-mapping.h | 62 ++++++++++++++++++- include/asm-m68k/scatterlist.h | 9 +-- 6 files changed, 197 insertions(+), 17 deletions(-) create mode 100644 arch/m68k/kernel/dma.c
dd943413f9dbf0b60111fae8dfd37fbd2b71d80d
arch/m68k/apollo/Makefile +1 -1
@@ -2,4 +2,4 @@ # # Makefile for Linux arch/m68k/amiga source directory # -obj-y := config.o dn_ints.o dma.o +obj-y := config.o dn_ints.o
arch/m68k/kernel/Makefile +2 -2
@@ -9,8 +9,8 @@ else endif extra-y += vmlinux.lds -obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \ - sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o +obj-y := entry.o process.o traps.o ints.o dma.o signal.o ptrace.o \ + sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o obj-$(CONFIG_PCI) += bios32.o obj-$(CONFIG_MODULES) += module.o
arch/m68k/kernel/dma.c new file +129 -0
129 lines not on this page · raw message
drivers/scsi/sun3x_esp.c +4 -4
@@ -332,11 +332,11 @@ static void dma_mmu_get_scsi_sgl (structstruct scatterlist *sg = sp->SCp.buffer;while (sz >=0 ) { - sg[sz].dvma_address =dvma_map ((unsigned long )page_address (sg[sz].page) + + sg[sz].dma_address =dvma_map ((unsigned long )page_address (sg[sz].page) + sg[sz].offset, sg[sz].length); sz--; } - sp->SCp.ptr=(char *)((unsigned long )sp->SCp.buffer->dvma_address); + sp->SCp.ptr=(char *)((unsigned long )sp->SCp.buffer->dma_address); }static void dma_mmu_release_scsi_one (struct NCR_ESP *esp,Scsi_Cmnd *sp)
@@ -350,14 +350,14 @@ static void dma_mmu_release_scsi_sgl (ststruct scatterlist *sg = (struct scatterlist *)sp->buffer;while (sz >=0 ) { -dvma_unmap ((char *)sg[sz].dvma_address); +dvma_unmap ((char *)sg[sz].dma_address); sz--; } }static void dma_advance_sg (Scsi_Cmnd *sp) { - sp->SCp.ptr = (char *)((unsigned long )sp->SCp.buffer->dvma_address); + sp->SCp.ptr = (char *)((unsigned long )sp->SCp.buffer->dma_address); }static int sun3x_esp_release (struct Scsi_Host *instance)
include/asm-m68k/dma-mapping.h +57 -5
68 lines not on this page · raw message
include/asm-m68k/scatterlist.h +4 -5
@@ -2,18 +2,17 @@ #ifndef _M68K_SCATTERLIST_H#define _M68K_SCATTERLIST_Hstruct scatterlist { -/* These two are only valid if ADDRESS member of this -* struct is NULL. -*/ struct page *page;unsigned int offset; -unsigned int length; -__u32 dvma_address;/* A place to hang host-specific addresses at. */ +__u32 dma_address;/* A place to hang host-specific addresses at. */ };/* This is bogus and should go away. */ #define ISA_DMA_THRESHOLD (0x00ffffff) +#define sg_dma_address (sg) ((sg)->dma_address) +#define sg_dma_len (sg) ((sg)->length) +#endif /* !(_M68K_SCATTERLIST_H) */
Signature · 3 lines
1.3.3 --
PATCH 6/21 dma API addition
In reply to [email protected]Additions to dma API with some small cleanups.
---
include/asm-m68k/dma-mapping.h | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-)
917fa3653132a17ee8b8ad27e906683cabe3dce1
include/asm-m68k/dma-mapping.h +28 -0
@@ -1,6 +1,8 @@#ifndef _M68K_DMA_MAPPING_H#define _M68K_DMA_MAPPING_H +#include <asm/cache.h> +struct scatterlist ;static inline int dma_supported (struct device *dev,u64 mask)
@@ -13,11 +15,37 @@ static inline int dma_set_mask(struct dereturn 0 ; } +static inline int dma_get_cache_alignment (void ) +{ +return 1 <<L1_CACHE_SHIFT ; +} + +static inline int dma_is_consistent (dma_addr_t dma_addr) +{ +return 0 ; +} +extern void *dma_alloc_coherent (struct device *,size_t ,dma_addr_t *,int );extern void dma_free_coherent (struct device *,size_t ,void *,dma_addr_t ); +static inline void *dma_alloc_noncoherent (struct device *dev,size_t size, +dma_addr_t *handle,int flag) +{ +return dma_alloc_coherent (dev, size, handle, flag); +} +static inline void dma_free_noncoherent (struct device *dev,size_t size, +void *addr,dma_addr_t handle) +{ +dma_free_coherent (dev, size, addr, handle); +} +static inline void dma_cache_sync (void *vaddr,size_t size, +enum dma_data_direction dir) +{ +/* we use coherent allocation, so not much to do here. */ +} +extern dma_addr_t dma_map_single (struct device *,void *,size_t ,enum dma_data_direction ); static inline void dma_unmap_single(struct device *dev, dma_addr_t addr,
Signature · 3 lines
1.3.3 --
PATCH 7/21 fix show_registers()
In reply to [email protected]Move some of the prints in die_if_kernel() to show_registers() and call that instead of show_stack(), so show_registers() prints now similiar info as other archs. Clean up the function a little.
---
arch/m68k/kernel/traps.c | 126 +++++++++++++++++++++++++--------------------- 1 files changed, 68 insertions(+), 58 deletions(-)
6288752cb5d99b7f532d9231248637ccad4b447f
arch/m68k/kernel/traps.c +68 -58
@@ -927,66 +927,88 @@ #endifvoid show_registers (struct pt_regs *regs) {struct frame *fp = (struct frame *)regs; +mm_segment_t old_fs =get_fs (); +u16 c, *cp;unsigned long addr;int i; +print_modules (); +printk ("PC: [<%08lx>]" ,regs->pc); +print_symbol (" %s" , regs->pc); +printk ("\nSR: %04x SP: %p a2: %08lx\n" , + regs->sr, regs, regs->a2); +printk ("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n" , + regs->d0, regs->d1, regs->d2, regs->d3); +printk ("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n" , + regs->d4, regs->d5, regs->a0, regs->a1); + +printk ("Process %s (pid: %d, task=%p)\n" , + current->comm, current->pid, current); addr = (unsigned long )&fp->un; -printk ("Frame format=%X " , fp->ptregs.format); -switch (fp->ptregs.format) { +printk ("Frame format=%X " , regs->format); +switch (regs->format) {case 0x2 : -printk ("instr addr=%08lx\n" , fp->un.fmt2.iaddr); - addr +=sizeof (fp->un.fmt2); -break ; +printk ("instr addr=%08lx\n" , fp->un.fmt2.iaddr); + addr +=sizeof (fp->un.fmt2); +break ;case 0x3 : -printk ("eff addr=%08lx\n" , fp->un.fmt3.effaddr); - addr +=sizeof (fp->un.fmt3); -break ; +printk ("eff addr=%08lx\n" , fp->un.fmt3.effaddr); + addr +=sizeof (fp->un.fmt3); +break ;case 0x4 : -printk ((CPU_IS_060 ?"fault addr=%08lx fslw=%08lx\n" - :"eff addr=%08lx pc=%08lx\n" ), - fp->un.fmt4.effaddr, fp->un.fmt4.pc); - addr +=sizeof (fp->un.fmt4); -break ; +printk ((CPU_IS_060 ?"fault addr=%08lx fslw=%08lx\n" + :"eff addr=%08lx pc=%08lx\n" ), + fp->un.fmt4.effaddr, fp->un.fmt4.pc); + addr +=sizeof (fp->un.fmt4); +break ;case 0x7 : -printk ("eff addr=%08lx ssw=%04x faddr=%08lx\n" , - fp->un.fmt7.effaddr, fp->un.fmt7.ssw, fp->un.fmt7.faddr); -printk ("wb 1 stat/addr/data: %04x %08lx %08lx\n" , - fp->un.fmt7.wb1s, fp->un.fmt7.wb1a, fp->un.fmt7.wb1dpd0); -printk ("wb 2 stat/addr/data: %04x %08lx %08lx\n" , - fp->un.fmt7.wb2s, fp->un.fmt7.wb2a, fp->un.fmt7.wb2d); -printk ("wb 3 stat/addr/data: %04x %08lx %08lx\n" , - fp->un.fmt7.wb3s, fp->un.fmt7.wb3a, fp->un.fmt7.wb3d); -printk ("push data: %08lx %08lx %08lx %08lx\n" , - fp->un.fmt7.wb1dpd0, fp->un.fmt7.pd1, fp->un.fmt7.pd2, - fp->un.fmt7.pd3); - addr +=sizeof (fp->un.fmt7); -break ; +printk ("eff addr=%08lx ssw=%04x faddr=%08lx\n" , + fp->un.fmt7.effaddr, fp->un.fmt7.ssw, fp->un.fmt7.faddr); +printk ("wb 1 stat/addr/data: %04x %08lx %08lx\n" , + fp->un.fmt7.wb1s, fp->un.fmt7.wb1a, fp->un.fmt7.wb1dpd0); +printk ("wb 2 stat/addr/data: %04x %08lx %08lx\n" , + fp->un.fmt7.wb2s, fp->un.fmt7.wb2a, fp->un.fmt7.wb2d); +printk ("wb 3 stat/addr/data: %04x %08lx %08lx\n" , + fp->un.fmt7.wb3s, fp->un.fmt7.wb3a, fp->un.fmt7.wb3d); +printk ("push data: %08lx %08lx %08lx %08lx\n" , + fp->un.fmt7.wb1dpd0, fp->un.fmt7.pd1, fp->un.fmt7.pd2, + fp->un.fmt7.pd3); + addr +=sizeof (fp->un.fmt7); +break ;case 0x9 : -printk ("instr addr=%08lx\n" , fp->un.fmt9.iaddr); - addr +=sizeof (fp->un.fmt9); -break ; +printk ("instr addr=%08lx\n" , fp->un.fmt9.iaddr); + addr +=sizeof (fp->un.fmt9); +break ;case 0xa : -printk ("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n" , - fp->un.fmta.ssw, fp->un.fmta.isc, fp->un.fmta.isb, - fp->un.fmta.daddr, fp->un.fmta.dobuf); - addr +=sizeof (fp->un.fmta); -break ; +printk ("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n" , + fp->un.fmta.ssw, fp->un.fmta.isc, fp->un.fmta.isb, + fp->un.fmta.daddr, fp->un.fmta.dobuf); + addr +=sizeof (fp->un.fmta); +break ;case 0xb : -printk ("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n" , - fp->un.fmtb.ssw, fp->un.fmtb.isc, fp->un.fmtb.isb, - fp->un.fmtb.daddr, fp->un.fmtb.dobuf); -printk ("baddr=%08lx dibuf=%08lx ver=%x\n" , - fp->un.fmtb.baddr, fp->un.fmtb.dibuf, fp->un.fmtb.ver); - addr +=sizeof (fp->un.fmtb); -break ; +printk ("ssw=%04x isc=%04x isb=%04x daddr=%08lx dobuf=%08lx\n" , + fp->un.fmtb.ssw, fp->un.fmtb.isc, fp->un.fmtb.isb, + fp->un.fmtb.daddr, fp->un.fmtb.dobuf); +printk ("baddr=%08lx dibuf=%08lx ver=%x\n" , + fp->un.fmtb.baddr, fp->un.fmtb.dibuf, fp->un.fmtb.ver); + addr +=sizeof (fp->un.fmtb); +break ;default : -printk ("\n" ); +printk ("\n" ); }show_stack (NULL , (unsigned long *)addr); -printk ("Code: " ); -for (i =0 ; i <10 ; i++) -printk ("%04x " ,0xffff & ((short *) fp->ptregs.pc)[i]); +printk ("Code:" ); +set_fs (KERNEL_DS ); + cp = (u16 *)regs->pc; +for (i =-8 ; i <16 ; i++) { +if (get_user (c, cp + i) && i >=0 ) { +printk (" Bad PC value." ); +break ; + } +printk (i ?" %04x" :" <%04x>" , c); + } +set_fs (old_fs);printk ("\n" ); }
@@ -1190,19 +1212,7 @@ void die_if_kernel (char *str, struct ptconsole_verbose ();printk ("%s: %08x\n" ,str,nr); -print_modules (); -printk ("PC: [<%08lx>]" ,fp->pc); -print_symbol (" %s\n" , fp->pc); -printk ("\nSR: %04x SP: %p a2: %08lx\n" , - fp->sr, fp, fp->a2); -printk ("d0: %08lx d1: %08lx d2: %08lx d3: %08lx\n" , - fp->d0, fp->d1, fp->d2, fp->d3); -printk ("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n" , - fp->d4, fp->d5, fp->a0, fp->a1); - -printk ("Process %s (pid: %d, stackpage=%08lx)\n" , - current->comm, current->pid,PAGE_SIZE +(unsigned long )current); -show_stack (NULL , (unsigned long *)fp); +show_registers (fp);do_exit (SIGSEGV ); }
Signature · 3 lines
1.3.3 --
PATCH 8/21 gcc 4 fix
In reply to [email protected]Fixes a "static qualifier follows non-static qualifier" error from gcc 4.
---
drivers/macintosh/via-pmu68k.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
35dfd8f879480cc93798d97ffcbff7eadf9e5f2e
drivers/macintosh/via-pmu68k.c +1 -2
@@ -112,7 +112,6 @@ static int pmu_send_request(struct adb_rstatic int pmu_autopoll (int devs);void pmu_poll (void );static int pmu_reset_bus (void ); -static int pmu_queue_request (struct adb_request *req);static void pmu_start (void );static void send_byte (int x);
@@ -477,7 +476,7 @@ pmu_request(struct adb_request *req, voireturn pmu_queue_request (req); } -static int +int pmu_queue_request (struct adb_request *req) {unsigned long flags;
Signature · 3 lines
1.3.3 --
Re: [PATCH 08/21] gcc 4 fix
Quoted 4 lines · On Fri, Jun 23, 2006 at 08:31:04PM +0200, [email protected] wrote:
Fixes a "static qualifier follows non-static qualifier" error from gcc 4.
Signed-off-by Finn Thain <[email protected]>Signed-off-by Roman Zippel <[email protected]>
Broken. Proper fix is to rename the function so that it wouldn't clash.
Re: [PATCH 08/21] gcc 4 fix
Hi,
Quoted 7 lines · Al Viro
Quoted 4 lines · On Fri, Jun 23, 2006 at 08:31:04PM +0200, [email protected] wrote:
Fixes a "static qualifier follows non-static qualifier" error from gcc 4.
Signed-off-by Finn Thain <[email protected]>Signed-off-by Roman Zippel <[email protected]>Broken. Proper fix is to rename the function so that it wouldn't clash.
Well, I wouldn't call it broken, as both versions can never be compiled into the same kernel, but I don't care much how it's fixed.
Does anyone know the relationship between via-pmu.c and via-pmu68k.c? If it's intended to keep the differences small, a rename would be the wrong fix.
bye, Roman
Re: [PATCH 08/21] gcc 4 fix
Quoted 14 lines · Roman Zippel
Hi,
Quoted 9 lines · Al Viro
Quoted 5 lines · On Fri, Jun 23, 2006 at 08:31:04PM +0200, [email protected] wrote:
Fixes a "static qualifier follows non-static qualifier" error from gcc 4.
Signed-off-by Finn Thain <[email protected]>Signed-off-by Roman Zippel <[email protected]>Broken. Proper fix is to rename the function so that it wouldn't clash.
Quoted 6 lines
Well, I wouldn't call it broken, as both versions can never be compiled into the same kernel, but I don't care much how it's fixed.
Does anyone know the relationship between
via-pmu.candvia-pmu68k.c? If it's intended to keep the differences small, a rename would be the wrong fix.
The relationship is (and was) just that they share the pmu.h header file declarations. In the patch in question I used the powerpc definition as well.
The powerpc version exports pmu_queue_request (apparently for the use of low_i2c.c). The m68k version doesn't, but if it needed to export it, I don't see why it shouldn't implement the same "API"?
-f
Quoted 2 lines
bye, Roman
Re: [PATCH 08/21] gcc 4 fix
Quoted 8 lines · Finn Thain
Quoted 7 lines · Roman Zippel
Quoted 2 lines · Al Viro
Broken. Proper fix is to rename the function so that it wouldn't clash.
Well, I wouldn't call it broken, as both versions can never be compiled into the same kernel, but I don't care much how it's fixed.
Quoted 7 lines
Quoted 3 lines
Does anyone know the relationship between
via-pmu.candvia-pmu68k.c? If it's intended to keep the differences small, a rename would be the wrong fix.The relationship is (and was) just that they share the
pmu.hheader file declarations. In the patch in question I used the powerpc definition as well.
I believe that pmu68k started out as a copy of pmu. The versions of PMU on the 68k PowerBooks are just older than the ones on ppc. They are fundamentally the same, it's just that the ppc systems have various fixes and new features. Ideally the files would be merged back together and split in a more logical fashion to share the code that is the same. Each one already supports multiple versions of the chip.
Quoted 3 lines
The powerpc version exports
pmu_queue_request(apparently for the use oflow_i2c.c). The m68k version doesn't, but if it needed to export it, I don't see why it shouldn't implement the same "API"?
Several other parts of the kernel submit pmu requests, but most of them use pmu_request(). It's probably better to unify this API set. The cuda and IIsi drivers have equivalent calls, for that matter. I wanted to make a generic call that would switch to the active one of those, but the idea didn't go over too well. It was probably due to the bad taste everyone had from when adb_request() was used for that purpose.
Brad Boyer
[email protected]
PATCH 9/21 separate handler for auto and user vector interrupt
In reply to [email protected]Use separate entry points for auto and user vector interrupts and cleanup naming a little.
---
arch/m68k/atari/ataints.c | 12 +++--- arch/m68k/kernel/entry.S | 84 +++++++++++++++++++++++---------------------- arch/m68k/kernel/ints.c | 21 +++++------ arch/m68k/kernel/traps.c | 55 ++++------------------------- include/asm-m68k/traps.h | 7 ++++ 5 files changed, 71 insertions(+), 108 deletions(-)
62d132c2030fdb80cb5dff1c65183e1b8d1bf3c5
arch/m68k/atari/ataints.c +6 -6
@@ -314,7 +314,7 @@ __ALIGN_STR "\n\t" "rte");/* Defined in entry.S; only increments 'num_spurious' */ -asmlinkage void bad_interrupt(void); +asmlinkage void bad_inthandler(void);extern void atari_microwire_cmd (int cmd );
@@ -337,7 +337,7 @@ void __init atari_init_IRQ(void)/* initialize the vector table */ for (i =0 ; i <NUM_INT_SOURCES ; ++i) { - vectors[IRQ_SOURCE_TO_VECTOR (i)] = bad_interrupt; + vectors[IRQ_SOURCE_TO_VECTOR (i)] = bad_inthandler; }/* Initialize the MFP(s) */
@@ -461,7 +461,7 @@ int atari_request_irq(unsigned int irq,return -EINVAL ; } -if (vectors[vector] == bad_interrupt) { +if (vectors[vector] == bad_inthandler) {/* int has no handler yet */ irq_handler[irq].handler = handler; irq_handler[irq].dev_id = dev_id;
@@ -528,7 +528,7 @@ void atari_free_irq(unsigned int irq, vo } vector =IRQ_SOURCE_TO_VECTOR (irq); -if (vectors[vector] == bad_interrupt) +if (vectors[vector] == bad_inthandler) goto not_found;local_irq_save (flags);
@@ -542,7 +542,7 @@ void atari_free_irq(unsigned int irq, vo irq_handler[irq].handler =NULL ; irq_handler[irq].dev_id =NULL ; irq_param[irq].devname =NULL ; - vectors[vector] = bad_interrupt; + vectors[vector] = bad_inthandler;/* If MFP int, also disable it */ atari_disable_irq (irq);atari_turnoff_irq (irq);
@@ -617,7 +617,7 @@ int show_atari_interrupts(struct seq_filint i;for (i =0 ; i <NUM_INT_SOURCES ; ++i) { -if (vectors[IRQ_SOURCE_TO_VECTOR (i)] == bad_interrupt) +if (vectors[IRQ_SOURCE_TO_VECTOR (i)] == bad_inthandler)continue ;if (i <STMFP_SOURCE_BASE ) seq_printf(p, "auto %2d: %10u ",
arch/m68k/kernel/entry.S +42 -42
120 lines not on this page · raw message
arch/m68k/kernel/ints.c +9 -12
@@ -248,19 +248,16 @@ static void dummy_free_irq(unsigned intprintk ("calling uninitialized disable_irq()\n" ); } -asmlinkage void process_int(unsigned long vec, struct pt_regs *fp) +asmlinkage void m68k_handle_int(unsigned int irq, struct pt_regs *regs) { -if (vec >=VEC_INT1 && vec <=VEC_INT7 && !MACH_IS_BVME6000 ) { - vec -=VEC_SPUR ; -kstat_cpu (0 ).irqs[vec]++; - irq_list[vec].handler (vec, irq_list[vec].dev_id, fp); - }else { -if (mach_process_int) -mach_process_int (vec, fp); -else -panic ("Can't process interrupt vector %ld\n" , vec); -return ; - } +kstat_cpu (0 ).irqs[irq]++; + irq_list[irq].handler (irq, irq_list[irq].dev_id, regs); +} + +asmlinkage void handle_badint(struct pt_regs *regs) +{ +kstat_cpu (0 ).irqs[0 ]++; +printk ("unexpected interrupt from %u\n" , regs->vector); }int show_interrupts (struct seq_file *p,void *v)
arch/m68k/kernel/traps.c +7 -48
77 lines not on this page · raw message
include/asm-m68k/traps.h +7 -0
@@ -13,8 +13,15 @@ #define _M68K_TRAPS_H#ifndef __ASSEMBLY__ +#include <linux/linkage.h> +#include <asm/ptrace.h> +typedef void (*e_vector )(void ); +asmlinkage void auto_inthandler(void); +asmlinkage void mach_inthandler(void); +asmlinkage void bad_inthandler(void); +extern e_vector vectors[];#endif
Signature · 3 lines
1.3.3 --
PATCH 10/21 cleanup generic irq names
In reply to [email protected]Rename IRQ1..IRQ7 to IRQ_AUTO_1..IRQ_AUTO_7 and remove the duplicate defintions.
---
arch/m68k/kernel/ints.c | 4 ++-- arch/m68k/q40/q40ints.c | 4 ++-- drivers/net/sun3lance.c | 2 +- include/asm-m68k/atariints.h | 11 ----------- include/asm-m68k/irq.h | 22 ++++++++++------------ include/asm-m68k/macints.h | 11 ----------- 6 files changed, 15 insertions(+), 39 deletions(-)
757f09a7cc7fb3e1c6d993fe92a62d3b7c28850f
arch/m68k/kernel/ints.c +2 -2
@@ -153,7 +153,7 @@ int cpu_request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *), unsigned long flags, const char *devname, void *dev_id) { - if (irq < IRQ1 || irq > IRQ7) { + if (irq < IRQ_AUTO_1 || irq > IRQ_AUTO_7) { printk("%s: Incorrect IRQ %d from %s\n", __FUNCTION__, irq, devname);return -ENXIO ;
@@ -183,7 +183,7 @@ #endifvoid cpu_free_irq (unsigned int irq,void *dev_id) { -if (irq <IRQ1 || irq >IRQ7 ) { +if (irq <IRQ_AUTO_1 || irq >IRQ_AUTO_7 ) {printk ("%s: Incorrect IRQ %d\n" , __FUNCTION__, irq);return ; }
arch/m68k/q40/q40ints.c +2 -2
@@ -93,8 +93,8 @@ void q40_init_IRQ (void) }/* setup handler for ISA ints */ -cpu_request_irq (IRQ2 , q40_irq2_handler,0 ,"q40 ISA and master chip" , -NULL ); +cpu_request_irq (IRQ_AUTO_2 , q40_irq2_handler,0 , +"q40 ISA and master chip" ,NULL );/* now enable some ints.. */ master_outb (1 ,EXT_ENABLE_REG );/* ISA IRQ 5-15 */
drivers/net/sun3lance.c +1 -1
@@ -55,7 +55,7 @@ #endif/* sun3/60 addr/irq for the lance chip. If your sun is different, change this. */ #define LANCE_OBIO 0x120000 -#define LANCE_IRQ IRQ3 +#define LANCE_IRQ IRQ_AUTO_3/* Debug level: * 0 = silent, print only serious errors
include/asm-m68k/atariints.h +0 -11
@@ -45,17 +45,6 @@ #define IRQ_TYPE_SLOW 0#define IRQ_TYPE_FAST 1#define IRQ_TYPE_PRIO 2 -#define IRQ_SPURIOUS (0) - -/* auto-vector interrupts */ -#define IRQ_AUTO_1 (1) -#define IRQ_AUTO_2 (2) -#define IRQ_AUTO_3 (3) -#define IRQ_AUTO_4 (4) -#define IRQ_AUTO_5 (5) -#define IRQ_AUTO_6 (6) -#define IRQ_AUTO_7 (7) -/* ST-MFP interrupts */ #define IRQ_MFP_BUSY (8)#define IRQ_MFP_DCD (9)
include/asm-m68k/irq.h +10 -12
@@ -4,7 +4,7 @@ #define _M68K_IRQ_H_#include <linux/interrupt.h> /* -* # of m68k interrupts +* # of m68k auto vector interrupts */ #define SYS_IRQS 8
@@ -40,19 +40,17 @@ #endif* that routine requires service. */ -#define IRQ1 (1)/* level 1 interrupt */ -#define IRQ2 (2)/* level 2 interrupt */ -#define IRQ3 (3)/* level 3 interrupt */ -#define IRQ4 (4)/* level 4 interrupt */ -#define IRQ5 (5)/* level 5 interrupt */ -#define IRQ6 (6)/* level 6 interrupt */ -#define IRQ7 (7)/* level 7 interrupt (non-maskable) */ +#define IRQ_SPURIOUS 0 -/* -* "Generic" interrupt sources -*/ +#define IRQ_AUTO_1 1/* level 1 interrupt */ +#define IRQ_AUTO_2 2/* level 2 interrupt */ +#define IRQ_AUTO_3 3/* level 3 interrupt */ +#define IRQ_AUTO_4 4/* level 4 interrupt */ +#define IRQ_AUTO_5 5/* level 5 interrupt */ +#define IRQ_AUTO_6 6/* level 6 interrupt */ +#define IRQ_AUTO_7 7/* level 7 interrupt (non-maskable) */ -#define IRQ_SCHED_TIMER (8)/* interrupt source for scheduling timer */ +#define IRQ_USER 8static __inline__int irq_canonicalize (int irq) {
include/asm-m68k/macints.h +0 -11
@@ -59,17 +59,6 @@ #define NUM_MAC_SOURCES 72#define IRQ_SRC (irq) (irq >> 3)#define IRQ_IDX (irq) (irq & 7) -#define IRQ_SPURIOUS (0) - -/* auto-vector interrupts */ -#define IRQ_AUTO_1 (1) -#define IRQ_AUTO_2 (2) -#define IRQ_AUTO_3 (3) -#define IRQ_AUTO_4 (4) -#define IRQ_AUTO_5 (5) -#define IRQ_AUTO_6 (6) -#define IRQ_AUTO_7 (7) -/* VIA1 interrupts */ #define IRQ_VIA1_0 (8)/* one second int. */ #define IRQ_VIA1_1 (9)/* VBlank int. */
Signature · 3 lines
1.3.3 --
PATCH 11/21 cleanup amiga irq numbering
In reply to [email protected]Fix amiga irq numbering, so they are after the generic IRQ_AUTO defines and remove the IRQ_AMIGA_AUTO defines.
---
arch/m68k/amiga/amiints.c | 74 +++++++++++++++++----------------- arch/m68k/amiga/cia.c | 11 ++--- include/asm-m68k/amigaints.h | 92 +++++++++++++++++------------------------- 3 files changed, 80 insertions(+), 97 deletions(-)
560b34e085caab7e18e396c180d6a13e59b6f472
arch/m68k/amiga/amiints.c +38 -36
@@ -61,25 +61,25 @@ extern int cia_get_irq_list(struct ciabastatic irq_node_t *ami_irq_list[AMI_STD_IRQS ];static unsigned short amiga_intena_vals[AMI_STD_IRQS ] = { - [IRQ_AMIGA_VERTB ] =IF_VERTB , - [IRQ_AMIGA_COPPER ] =IF_COPER , - [IRQ_AMIGA_AUD0 ] =IF_AUD0 , - [IRQ_AMIGA_AUD1 ] =IF_AUD1 , - [IRQ_AMIGA_AUD2 ] =IF_AUD2 , - [IRQ_AMIGA_AUD3 ] =IF_AUD3 , - [IRQ_AMIGA_BLIT ] =IF_BLIT , - [IRQ_AMIGA_DSKSYN ] =IF_DSKSYN , - [IRQ_AMIGA_DSKBLK ] =IF_DSKBLK , - [IRQ_AMIGA_RBF ] =IF_RBF , - [IRQ_AMIGA_TBE ] =IF_TBE , - [IRQ_AMIGA_SOFT ] =IF_SOFT , - [IRQ_AMIGA_PORTS ] =IF_PORTS , - [IRQ_AMIGA_EXTER ] =IF_EXTER + [IRQ_AMIGA_VERTB -IRQ_USER ] =IF_VERTB , + [IRQ_AMIGA_COPPER -IRQ_USER ] =IF_COPER , + [IRQ_AMIGA_AUD0 -IRQ_USER ] =IF_AUD0 , + [IRQ_AMIGA_AUD1 -IRQ_USER ] =IF_AUD1 , + [IRQ_AMIGA_AUD2 -IRQ_USER ] =IF_AUD2 , + [IRQ_AMIGA_AUD3 -IRQ_USER ] =IF_AUD3 , + [IRQ_AMIGA_BLIT -IRQ_USER ] =IF_BLIT , + [IRQ_AMIGA_DSKSYN -IRQ_USER ] =IF_DSKSYN , + [IRQ_AMIGA_DSKBLK -IRQ_USER ] =IF_DSKBLK , + [IRQ_AMIGA_RBF -IRQ_USER ] =IF_RBF , + [IRQ_AMIGA_TBE -IRQ_USER ] =IF_TBE , + [IRQ_AMIGA_SOFT -IRQ_USER ] =IF_SOFT , + [IRQ_AMIGA_PORTS -IRQ_USER ] =IF_PORTS , + [IRQ_AMIGA_EXTER -IRQ_USER ] =IF_EXTER };static const unsigned char ami_servers[AMI_STD_IRQS ] = { - [IRQ_AMIGA_VERTB ] =1 , - [IRQ_AMIGA_PORTS ] =1 , - [IRQ_AMIGA_EXTER ] =1 + [IRQ_AMIGA_VERTB -IRQ_USER ] =1 , + [IRQ_AMIGA_PORTS -IRQ_USER ] =1 , + [IRQ_AMIGA_EXTER -IRQ_USER ] =1 };static short ami_ablecount[AMI_IRQS ];
@@ -210,9 +210,8 @@ int amiga_request_irq(unsigned int irq,return -ENXIO ; } -if (irq >=IRQ_AMIGA_AUTO ) -return cpu_request_irq (irq -IRQ_AMIGA_AUTO , handler, - flags, devname, dev_id); +if (irq <IRQ_USER ) +return cpu_request_irq (irq, handler, flags, devname, dev_id);if (irq >=IRQ_AMIGA_CIAB ) return cia_request_irq(&ciab_base, irq - IRQ_AMIGA_CIAB,
@@ -222,6 +221,7 @@ int amiga_request_irq(unsigned int irq,return cia_request_irq (&ciaa_base, irq -IRQ_AMIGA_CIAA , handler, flags, devname, dev_id); + irq -=IRQ_USER ;/* * IRQ_AMIGA_PORTS & IRQ_AMIGA_EXTER defaults to shared, * we could add a check here for the SA_SHIRQ flag but all drivers
@@ -257,8 +257,8 @@ void amiga_free_irq(unsigned int irq, voreturn ; } -if (irq >=IRQ_AMIGA_AUTO ) -cpu_free_irq (irq -IRQ_AMIGA_AUTO , dev_id); +if (irq <IRQ_USER ) +cpu_free_irq (irq, dev_id);if (irq >=IRQ_AMIGA_CIAB ) {cia_free_irq (&ciab_base, irq -IRQ_AMIGA_CIAB , dev_id);
@@ -270,6 +270,7 @@ void amiga_free_irq(unsigned int irq, voreturn ; } + irq -=IRQ_USER ;if (ami_servers[irq]) {amiga_delete_irq (&ami_irq_list[irq], dev_id);/* if server list empty, disable the interrupt */
@@ -306,9 +307,9 @@ void amiga_enable_irq(unsigned int irq)return ;/* No action for auto-vector interrupts */ -if (irq >=IRQ_AMIGA_AUTO ){ +if (irq <IRQ_USER ) {printk ("%s: Trying to enable auto-vector IRQ %i\n" , - __FUNCTION__, irq -IRQ_AMIGA_AUTO ); + __FUNCTION__, irq);return ; }
@@ -327,7 +328,7 @@ void amiga_enable_irq(unsigned int irq) }/* enable the interrupt */ - amiga_custom.intena =IF_SETCLR | amiga_intena_vals[irq]; + amiga_custom.intena =IF_SETCLR | amiga_intena_vals[irq-IRQ_USER ]; }void amiga_disable_irq (unsigned int irq)
@@ -341,9 +342,9 @@ void amiga_disable_irq(unsigned int irq)return ;/* No action for auto-vector interrupts */ -if (irq >=IRQ_AMIGA_AUTO ) { +if (irq <IRQ_USER ) {printk ("%s: Trying to disable auto-vector IRQ %i\n" , - __FUNCTION__, irq -IRQ_AMIGA_AUTO ); + __FUNCTION__, irq);return ; }
@@ -358,24 +359,24 @@ void amiga_disable_irq(unsigned int irq) }/* disable the interrupt */ - amiga_custom.intena = amiga_intena_vals[irq]; + amiga_custom.intena = amiga_intena_vals[irq-IRQ_USER ]; }inline void amiga_do_irq (int irq,struct pt_regs *fp) { -kstat_cpu (0 ).irqs[SYS_IRQS + irq]++; - ami_irq_list[irq]->handler (irq, ami_irq_list[irq]->dev_id, fp); +kstat_cpu (0 ).irqs[irq]++; + ami_irq_list[irq-IRQ_USER ]->handler (irq, ami_irq_list[irq-IRQ_USER ]->dev_id, fp); }void amiga_do_irq_list (int irq,struct pt_regs *fp) {irq_node_t *node; -kstat_cpu (0 ).irqs[SYS_IRQS + irq]++; +kstat_cpu (0 ).irqs[irq]++; - amiga_custom.intreq = amiga_intena_vals[irq]; + amiga_custom.intreq = amiga_intena_vals[irq-IRQ_USER ]; -for (node = ami_irq_list[irq]; node; node = node->next) +for (node = ami_irq_list[irq-IRQ_USER ]; node; node = node->next) node->handler (irq, node->dev_id, fp); }
@@ -498,11 +499,12 @@ int show_amiga_interrupts(struct seq_filint i;irq_node_t *node; -for (i =0 ; i <AMI_STD_IRQS ; i++) { -if (!(node = ami_irq_list[i])) +for (i =IRQ_USER ; i <IRQ_AMIGA_CIAA ; i++) { + node = ami_irq_list[i -IRQ_USER ]; +if (!node)continue ;seq_printf (p,"ami %2d: %10u " , i, -kstat_cpu (0 ).irqs[SYS_IRQS + i]); +kstat_cpu (0 ).irqs[i]); do { if (node->flags & SA_INTERRUPT) seq_puts(p, "F ");
arch/m68k/amiga/cia.c +5 -6
@@ -33,14 +33,14 @@ struct ciabase { } ciaa_base = { .cia = &ciaa, .int_mask = IF_PORTS, - .handler_irq = IRQ_AMIGA_AUTO_2, + .handler_irq = IRQ_AUTO_2, .cia_irq = IRQ_AMIGA_CIAA, .server_irq = IRQ_AMIGA_PORTS, .name ="CIAA handler" }, ciab_base = { .cia = &ciab, .int_mask = IF_EXTER, - .handler_irq = IRQ_AMIGA_AUTO_6, + .handler_irq = IRQ_AUTO_6, .cia_irq = IRQ_AMIGA_CIAB, .server_irq =IRQ_AMIGA_EXTER , .name = "CIAB handler"
@@ -131,12 +131,11 @@ static irqreturn_t cia_handler(int irq,unsigned char ints; mach_irq = base->cia_irq; - irq =SYS_IRQS + mach_irq; ints =cia_set_irq (base,CIA_ICR_ALL ); amiga_custom.intreq = base->int_mask; -for (i =0 ; i <CIA_IRQS ; i++, irq++, mach_irq++) { +for (i =0 ; i <CIA_IRQS ; i++, mach_irq++) {if (ints &1 ) { -kstat_cpu (0 ).irqs[irq]++; +kstat_cpu (0 ).irqs[mach_irq]++; base->irq_list[i].handler (mach_irq, base->irq_list[i].dev_id, fp); } ints >>=1 ;
@@ -172,7 +171,7 @@ int cia_get_irq_list(struct ciabase *bas j = base->cia_irq;for (i =0 ; i <CIA_IRQS ; i++) {seq_printf (p,"cia %2d: %10d " , j + i, -kstat_cpu (0 ).irqs[SYS_IRQS + j + i]); +kstat_cpu (0 ).irqs[j + i]);seq_puts (p," " );seq_printf (p,"%s\n" , base->irq_list[i].devname); }
include/asm-m68k/amigaints.h +37 -55
115 lines not on this page · raw message
Signature · 3 lines
1.3.3 --
PATCH 12/21 introduce irq controller
In reply to [email protected]Introduce irq controller and use it to manage auto vector interrupts. Introduce setup_irq() which can be used for irq setup.
---
arch/m68k/amiga/amiints.c | 4 - arch/m68k/bvme6000/bvmeints.c | 1 arch/m68k/kernel/ints.c | 171 +++++++++++++++++++++++++++++----------- arch/m68k/mac/config.c | 15 ---- arch/m68k/mac/macints.c | 7 -- arch/m68k/mvme147/147ints.c | 1 arch/m68k/mvme16x/16xints.c | 1 arch/m68k/q40/config.c | 2 arch/m68k/q40/q40ints.c | 17 ---- drivers/block/amiflop.c | 1 include/asm-m68k/atari_stdma.h | 2 include/asm-m68k/irq.h | 25 ++++-- 12 files changed, 148 insertions(+), 99 deletions(-)
565955489c28c96c32f022d473c7c141e1856874
arch/m68k/amiga/amiints.c +1 -3
@@ -40,6 +40,7 @@ #include <linux/kernel.h>#include <linux/sched.h> #include <linux/kernel_stat.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/errno.h> #include <linux/seq_file.h>
@@ -484,13 +485,10 @@ static irqreturn_t ami_int7(int irq, voi }irqreturn_t (*amiga_default_handler[SYS_IRQS ])(int ,void *,struct pt_regs *) = { - [0 ] = ami_badint, [1 ] = ami_int1, - [2 ] = ami_badint, [3 ] = ami_int3, [4 ] = ami_int4, [5 ] = ami_int5, - [6 ] = ami_badint, [7 ] = ami_int7 };
arch/m68k/bvme6000/bvmeints.c +1 -0
@@ -14,6 +14,7 @@#include <linux/types.h> #include <linux/kernel.h> #include <linux/errno.h> +#include <linux/interrupt.h> #include <linux/seq_file.h> #include <asm/ptrace.h>
arch/m68k/kernel/ints.c +123 -48
235 lines not on this page · raw message
arch/m68k/mac/config.c +0 -15
@@ -94,20 +94,6 @@ static void mac_sched_init(irqreturn_t (via_init_clock (vector); } -extern irqreturn_t mac_default_handler (int ,void *,struct pt_regs *); - -irqreturn_t (*mac_handlers[8 ])(int ,void *,struct pt_regs *)= -{ - mac_default_handler, - mac_default_handler, - mac_default_handler, - mac_default_handler, - mac_default_handler, - mac_default_handler, - mac_default_handler, - mac_default_handler -}; -/* * Parse a Macintosh-specific record in the bootinfo */
@@ -188,7 +174,6 @@ void __init config_mac(void) enable_irq = mac_enable_irq; disable_irq = mac_disable_irq; mach_get_model = mac_get_model; - mach_default_handler = &mac_handlers; mach_get_irq_list = show_mac_interrupts; mach_gettimeoffset = mac_gettimeoffset;#warning move to adb/via init
arch/m68k/mac/macints.c +0 -7
@@ -637,13 +637,6 @@ int show_mac_interrupts(struct seq_filereturn 0 ; } -void mac_default_handler (int irq,void *dev_id,struct pt_regs *regs) -{ -#ifdef DEBUG_SPURIOUS -printk ("Unexpected IRQ %d on device %p\n" , irq, dev_id); -#endif -} -static int num_debug[8 ];irqreturn_t mac_debug_handler (int irq,void *dev_id,struct pt_regs *regs)
arch/m68k/mvme147/147ints.c +1 -0
@@ -14,6 +14,7 @@#include <linux/types.h> #include <linux/kernel.h> #include <linux/errno.h> +#include <linux/interrupt.h> #include <linux/seq_file.h> #include <asm/ptrace.h>
arch/m68k/mvme16x/16xints.c +1 -0
@@ -14,6 +14,7 @@#include <linux/types.h> #include <linux/kernel.h> #include <linux/errno.h> +#include <linux/interrupt.h> #include <linux/seq_file.h> #include <asm/system.h>
arch/m68k/q40/config.c +0 -2
@@ -37,7 +37,6 @@ #include <asm/machdep.h>#include <asm/q40_master.h> extern irqreturn_t q40_process_int (int level,struct pt_regs *regs); -extern irqreturn_t (*q40_default_handler[]) (int ,void *,struct pt_regs *);/* added just for debugging */ extern void q40_init_IRQ (void );extern void q40_free_irq (unsigned int ,void *);extern int show_q40_interrupts (struct seq_file *,void *);
@@ -181,7 +180,6 @@ void __init config_q40(void) mach_request_irq = q40_request_irq; enable_irq = q40_enable_irq; disable_irq = q40_disable_irq; - mach_default_handler = &q40_default_handler; mach_get_model = q40_get_model; mach_get_hardware_list = q40_get_hardware_list;
arch/m68k/q40/q40ints.c +0 -17
@@ -46,7 +46,6 @@ irqreturn_t q40_irq2_handler (int, voidstatic irqreturn_t q40_defhand (int irq,void *dev_id,struct pt_regs *fp); -static irqreturn_t default_handler (int lev,void *dev_id,struct pt_regs *regs);#define DEVNAME_SIZE 24
@@ -415,22 +414,6 @@ static irqreturn_t q40_defhand (int irq,else master_outb (-1 ,KEYBOARD_UNLOCK_REG );return IRQ_NONE ; } -static irqreturn_t default_handler (int lev,void *dev_id,struct pt_regs *regs) -{ -printk ("Uninitialised interrupt level %d\n" , lev); -return IRQ_NONE ; -} - -irqreturn_t (*q40_default_handler[SYS_IRQS ])(int ,void *,struct pt_regs *) = { - [0 ] = default_handler, - [1 ] = default_handler, - [2 ] = default_handler, - [3 ] = default_handler, - [4 ] = default_handler, - [5 ] = default_handler, - [6 ] = default_handler, - [7 ] = default_handler -};void q40_enable_irq (unsigned int irq)
drivers/block/amiflop.c +1 -0
@@ -64,6 +64,7 @@ #include <linux/amifd.h>#include <linux/buffer_head.h> #include <linux/blkdev.h> #include <linux/elevator.h> +#include <linux/interrupt.h> #include <asm/setup.h> #include <asm/uaccess.h>
include/asm-m68k/atari_stdma.h +1 -1
@@ -3,7 +3,7 @@ #ifndef _atari_stdma_h#define _atari_stdma_h -#include <asm/irq.h> +#include <linux/interrupt.h> /***************************** Prototypes *****************************/
include/asm-m68k/irq.h +19 -6
@@ -1,7 +1,8 @@#ifndef _M68K_IRQ_H_#define _M68K_IRQ_H_ -#include <linux/interrupt.h> +#include <linux/hardirq.h> +#include <linux/spinlock_types.h> /* * # of m68k auto vector interrupts
@@ -81,7 +82,7 @@ #define disable_irq_nosync disable_irqstruct pt_regs ;extern int cpu_request_irq (unsigned int , -irqreturn_t (*)(int ,void *,struct pt_regs *), +int (*)(int ,void *,struct pt_regs *),unsigned long ,const char *,void *);extern void cpu_free_irq (unsigned int ,void *);
@@ -103,23 +104,35 @@ #endif* interrupt source (if it supports chaining). */ typedef struct irq_node { -irqreturn_t (*handler)(int ,void *,struct pt_regs *); -unsigned long flags; +int (*handler)(int ,void *,struct pt_regs *);void *dev_id; -const char *devname;struct irq_node *next; +unsigned long flags; +const char *devname; }irq_node_t ;/* * This structure has only 4 elements for speed reasons */ typedef struct irq_handler { -irqreturn_t (*handler)(int ,void *,struct pt_regs *); +int (*handler)(int ,void *,struct pt_regs *);unsigned long flags;void *dev_id;const char *devname; }irq_handler_t ; +struct irq_controller { +const char *name; +spinlock_t lock; +int (*startup)(unsigned int irq); +void (*shutdown)(unsigned int irq); +void (*enable)(unsigned int irq); +void (*disable)(unsigned int irq); +}; + +extern int m68k_irq_startup (unsigned int ); +extern void m68k_irq_shutdown (unsigned int ); +/* count of spurious interrupts */ extern volatile unsigned int num_spurious;
Signature · 3 lines
1.3.3 --
PATCH 13/21 convert generic irq code to irq controller
In reply to [email protected]Convert the generic irq code to use irq controller, this gets rid of the machine specific callbacks and gives better control over irq handling without duplicating lots of code.
---
arch/m68k/kernel/entry.S | 11 +- arch/m68k/kernel/ints.c | 240 ++++++++++++++++++++++++++--------------- arch/m68k/kernel/m68k_ksyms.c | 2 arch/m68k/kernel/setup.c | 3 - arch/m68k/kernel/traps.c | 7 + include/asm-m68k/irq.h | 65 ++++------- include/asm-m68k/machdep.h | 6 - include/asm-m68k/traps.h | 2 8 files changed, 188 insertions(+), 148 deletions(-)
58f615bf9135a7bc00999b29deffd0c5f9cc971b
arch/m68k/kernel/entry.S +8 -3
@@ -48,6 +48,8 @@ #include <asm/asm-offsets.h> .globl sys_call_table .globl sys_fork, sys_clone, sys_vfork .globl ret_from_interrupt, bad_interrupt +.globl auto_irqhandler_fixup +.globl user_irqvec_fixup, user_irqhandler_fixup .text ENTRY(buserr)
@@ -212,6 +214,7 @@ #if defined(MACH_Q40_ONLY) && defined(CO jbra 3f 1: #endif +auto_irqhandler_fixup = . + 2 jsr m68k_handle_int | process the IRQ 3: addql #8,%sp | pop parameters off stack
@@ -234,17 +237,19 @@ ret_from_last_interrupt: /* Handler for user defined interrupt vectors */ -ENTRY(mach_inthandler) +ENTRY(user_inthandler) SAVE_ALL_INT GET_CURRENT(%d0) addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) | put exception # in d0 bfextu %sp@(PT_VECTOR){#4,#10},%d0 +user_irqvec_fixup = . + 2 + subw #VEC_USER,%d0 movel %sp,%sp@- movel %d0,%sp@- | put vector # on stack - movel mach_process_int,%a0 - jsr %a0@ | process the IRQ +user_irqhandler_fixup = . + 2 + jsr m68k_handle_int | process the IRQ addql #8,%sp | pop parameters off stack subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)
arch/m68k/kernel/ints.c +152 -88
340 lines not on this page · raw message
arch/m68k/kernel/m68k_ksyms.c +0 -2
@@ -57,8 +57,6 @@ EXPORT_SYMBOL(dump_thread);EXPORT_SYMBOL (strnlen);EXPORT_SYMBOL (strrchr);EXPORT_SYMBOL (strstr); -EXPORT_SYMBOL (enable_irq); -EXPORT_SYMBOL (disable_irq);EXPORT_SYMBOL (kernel_thread);#ifdef CONFIG_VME EXPORT_SYMBOL (vme_brdtype);
arch/m68k/kernel/setup.c +0 -3
@@ -68,11 +68,8 @@ char m68k_debug_device[6] = "";void (*mach_sched_init) (irqreturn_t (*handler)(int ,void *,struct pt_regs *))__initdata =NULL ;/* machine dependent irq functions */ void (*mach_init_IRQ) (void )__initdata =NULL ; -irqreturn_t (*(*mach_default_handler)[]) (int ,void *,struct pt_regs *);void (*mach_get_model) (char *model);int (*mach_get_hardware_list) (char *buffer); -int (*mach_get_irq_list) (struct seq_file *,void *); -irqreturn_t (*mach_process_int) (int ,struct pt_regs *);/* machine dependent timer functions */ unsigned long (*mach_gettimeoffset) (void );int (*mach_hwclk) (int ,struct rtc_time *);
arch/m68k/kernel/traps.c +3 -4
@@ -87,16 +87,15 @@ void __init trap_init (void) {int i; - vectors[VEC_SPUR ] = bad_inthandler; -for (i =VEC_INT1 ; i <=VEC_INT7 ; i++) - vectors[i] = auto_inthandler; +for (i =VEC_SPUR ; i <=VEC_INT7 ; i++) + vectors[i] = bad_inthandler;for (i =0 ; i <VEC_USER ; i++)if (!vectors[i]) vectors[i] = trap;for (i =VEC_USER ; i <256 ; i++) - vectors[i] = mach_inthandler; + vectors[i] = bad_inthandler;#ifdef CONFIG_M68KFPU_EMU if (FPU_IS_EMU )
include/asm-m68k/irq.h +24 -41
100 lines not on this page · raw message
include/asm-m68k/machdep.h +0 -6
@@ -13,14 +13,8 @@ struct buffer_head;extern void (*mach_sched_init) (irqreturn_t (*handler)(int ,void *,struct pt_regs *));/* machine dependent irq functions */ extern void (*mach_init_IRQ) (void ); -extern irqreturn_t (*(*mach_default_handler)[]) (int ,void *,struct pt_regs *); -extern int (*mach_request_irq) (unsigned int irq,irqreturn_t (*handler)(int ,void *,struct pt_regs *), -unsigned long flags,const char *devname,void *dev_id); -extern void (*mach_free_irq) (unsigned int irq,void *dev_id);extern void (*mach_get_model) (char *model);extern int (*mach_get_hardware_list) (char *buffer); -extern int (*mach_get_irq_list) (struct seq_file *p,void *v); -extern irqreturn_t (*mach_process_int) (int irq,struct pt_regs *fp);/* machine dependent timer functions */ extern unsigned long (*mach_gettimeoffset)(void );extern int (*mach_hwclk)(int ,struct rtc_time *);
include/asm-m68k/traps.h +1 -1
@@ -19,7 +19,7 @@ #include <asm/ptrace.h>typedef void (*e_vector )(void ); asmlinkage void auto_inthandler(void); -asmlinkage void mach_inthandler(void); +asmlinkage void user_inthandler(void); asmlinkage void bad_inthandler(void);extern e_vector vectors[];
Signature · 3 lines
1.3.3 --
PATCH 14/21 convert amiga irq code
In reply to [email protected]---
arch/m68k/amiga/amiga_ksyms.c | 2 arch/m68k/amiga/amiints.c | 382 ++++------------------------------------- arch/m68k/amiga/cia.c | 155 ++++++++--------- arch/m68k/amiga/config.c | 15 -- include/asm-m68k/amigaints.h | 8 - 5 files changed, 117 insertions(+), 445 deletions(-)
9a577b35b8785a9ce7c19782c65f41f064a1dab5
arch/m68k/amiga/amiga_ksyms.c +0 -2
@@ -23,8 +23,6 @@ EXPORT_SYMBOL(amiga_chip_avail);EXPORT_SYMBOL (amiga_chip_size);EXPORT_SYMBOL (amiga_audio_period);EXPORT_SYMBOL (amiga_audio_min_period); -EXPORT_SYMBOL (amiga_do_irq); -EXPORT_SYMBOL (amiga_do_irq_list);#ifdef CONFIG_AMIGA_PCMCIA EXPORT_SYMBOL (pcmcia_reset);
arch/m68k/amiga/amiints.c +36 -346
486 lines not on this page · raw message
arch/m68k/amiga/cia.c +78 -77
210 lines not on this page · raw message
arch/m68k/amiga/config.c +0 -15
@@ -87,17 +87,8 @@ extern char m68k_debug_device[];static void amiga_sched_init (irqreturn_t (*handler)(int ,void *,struct pt_regs *));/* amiga specific irq functions */ extern void amiga_init_IRQ (void ); -extern irqreturn_t (*amiga_default_handler[]) (int ,void *,struct pt_regs *); -extern int amiga_request_irq (unsigned int irq, -irqreturn_t (*handler)(int ,void *,struct pt_regs *), -unsigned long flags,const char *devname, -void *dev_id); -extern void amiga_free_irq (unsigned int irq,void *dev_id); -extern void amiga_enable_irq (unsigned int ); -extern void amiga_disable_irq (unsigned int );static void amiga_get_model (char *model);static int amiga_get_hardware_list (char *buffer); -extern int show_amiga_interrupts (struct seq_file *,void *);/* amiga specific timer functions */ static unsigned long amiga_gettimeoffset (void );static int a3000_hwclk (int ,struct rtc_time *);
@@ -392,14 +383,8 @@ void __init config_amiga(void) mach_sched_init = amiga_sched_init; mach_init_IRQ = amiga_init_IRQ; - mach_default_handler = &amiga_default_handler; - mach_request_irq = amiga_request_irq; - mach_free_irq = amiga_free_irq; - enable_irq = amiga_enable_irq; - disable_irq = amiga_disable_irq; mach_get_model = amiga_get_model; mach_get_hardware_list = amiga_get_hardware_list; - mach_get_irq_list = show_amiga_interrupts; mach_gettimeoffset = amiga_gettimeoffset;if (AMIGAHW_PRESENT (A3000_CLK )){ mach_hwclk = a3000_hwclk;
include/asm-m68k/amigaints.h +3 -5
@@ -37,8 +37,8 @@ #define IRQ_AMIGA_DSKSYN (IRQ_USER+12)#define IRQ_AMIGA_SOFT (IRQ_USER+2)/* interrupts from external hardware */ -#define IRQ_AMIGA_PORTS (IRQ_USER+3) -#define IRQ_AMIGA_EXTER (IRQ_USER+13) +#define IRQ_AMIGA_PORTS IRQ_AUTO_2 +#define IRQ_AMIGA_EXTER IRQ_AUTO_6/* copper interrupt */ #define IRQ_AMIGA_COPPER (IRQ_USER+4)
@@ -88,9 +88,6 @@ #define IF_SOFT 0x0004 /* software i#define IF_DSKBLK 0x0002/* diskblock DMA finished */ #define IF_TBE 0x0001/* serial transmit buffer empty interrupt */ -extern void amiga_do_irq (int irq,struct pt_regs *fp); -extern void amiga_do_irq_list (int irq,struct pt_regs *fp); -/* CIA interrupt control register bits */ #define CIA_ICR_TA 0x01
@@ -107,6 +104,7 @@ #define CIA_ICR_SETCLR 0x80extern struct ciabase ciaa_base, ciab_base; +extern void cia_init_IRQ (struct ciabase *base);extern unsigned char cia_set_irq (struct ciabase *base,unsigned char mask);extern unsigned char cia_able_irq (struct ciabase *base,unsigned char mask);
Signature · 3 lines
1.3.3 --
PATCH 15/21 convert apollo irq code
In reply to [email protected]---
arch/m68k/apollo/config.c | 24 ++------ arch/m68k/apollo/dn_ints.c | 137 +++++++++---------------------------------- include/asm-m68k/apollohw.h | 4 + 3 files changed, 37 insertions(+), 128 deletions(-)
5627860f622a2c9a2c6a63c6cc76183c672f0322
arch/m68k/apollo/config.c +5 -19
@@ -28,11 +28,6 @@ u_long apollo_model;extern void dn_sched_init (irqreturn_t (*handler)(int ,void *,struct pt_regs *));extern void dn_init_IRQ (void ); -extern int dn_request_irq (unsigned int irq,irqreturn_t (*handler)(int ,void *,struct pt_regs *),unsigned long flags,const char *devname,void *dev_id); -extern void dn_free_irq (unsigned int irq,void *dev_id); -extern void dn_enable_irq (unsigned int ); -extern void dn_disable_irq (unsigned int ); -extern int show_dn_interrupts (struct seq_file *,void *);extern unsigned long dn_gettimeoffset (void );extern int dn_dummy_hwclk (int ,struct rtc_time *);extern int dn_dummy_set_clock_mmss (unsigned long );
@@ -40,13 +35,11 @@ extern void dn_dummy_reset(void);extern void dn_dummy_waitbut (void );extern struct fb_info *dn_fb_init (long *);extern void dn_dummy_debug_init (void ); -extern void dn_dummy_video_setup (char *,int *);extern irqreturn_t dn_process_int (int irq,struct pt_regs *fp);#ifdef CONFIG_HEARTBEAT static void dn_heartbeat (int on);#endif static irqreturn_t dn_timer_int (int irq,void *,struct pt_regs *); -static irqreturn_t (*sched_timer_handler)(int ,void *,struct pt_regs *)=NULL ;static void dn_get_model (char *model);static const char *apollo_models[] = { [APOLLO_DN3000 -APOLLO_DN3000 ] ="DN3000 (Otter)" ,
@@ -164,17 +157,10 @@ void config_apollo(void) { mach_sched_init=dn_sched_init;/* */ mach_init_IRQ=dn_init_IRQ; - mach_default_handler=NULL ; - mach_request_irq = dn_request_irq; - mach_free_irq = dn_free_irq; - enable_irq = dn_enable_irq; - disable_irq = dn_disable_irq; - mach_get_irq_list = show_dn_interrupts; mach_gettimeoffset = dn_gettimeoffset; mach_max_dma_address =0xffffffff ; mach_hwclk = dn_dummy_hwclk;/* */ mach_set_clock_mmss = dn_dummy_set_clock_mmss;/* */ - mach_process_int = dn_process_int; mach_reset = dn_dummy_reset;/* */ #ifdef CONFIG_HEARTBEAT mach_heartbeat = dn_heartbeat;
@@ -189,11 +175,13 @@ #endif } -irqreturn_t dn_timer_int (int irq,void *dev_id,struct pt_regs *fp) { +irqreturn_t dn_timer_int (int irq,void *dev_id,struct pt_regs *fp) +{ +irqreturn_t (*timer_handler)(int ,void *,struct pt_regs *) = dev_id;volatile unsigned char x; -sched_timer_handler (irq,dev_id,fp); +timer_handler (irq, dev_id, fp); x=*(volatile unsigned char *)(timer+3 ); x=*(volatile unsigned char *)(timer+5 );
@@ -217,9 +205,7 @@ #if 0printk ("*(0x10803) %02x\n" ,*(volatile unsigned char *)(timer+0x3 ));#endif - sched_timer_handler=timer_routine; -request_irq (0 ,dn_timer_int,0 ,NULL ,NULL ); - +request_irq (IRQ_APOLLO , dn_timer_int,0 ,"time" , timer_routine); }unsigned long dn_gettimeoffset (void ) {
arch/m68k/apollo/dn_ints.c +28 -109
153 lines not on this page · raw message
include/asm-m68k/apollohw.h +4 -0
@@ -3,6 +3,8 @@#ifndef _ASMm68k_APOLLOHW_H_#define _ASMm68k_APOLLOHW_H_ +#include <linux/types.h> +/* apollo models */
@@ -101,4 +103,6 @@ #define addr_xlat_map ((unsigned short *#define isaIO2mem (x) (((((x) & 0x3f8) << 7) | (((x) & 0xfc00) >> 6) | ((x) & 0x7)) + 0x40000 + IO_BASE) +#define IRQ_APOLLO IRQ_USER +#endif
Signature · 3 lines
1.3.3 --
PATCH 16/21 convert atari irq code
In reply to [email protected]---
arch/m68k/atari/ataints.c | 278 +++++++-------------------------------------- arch/m68k/atari/config.c | 11 -- 2 files changed, 42 insertions(+), 247 deletions(-)
db0859143263b908e466609fc42856e5f522cae9
arch/m68k/atari/ataints.c +42 -236
@@ -104,6 +104,7 @@ #include <asm/entry.h>* the sr copy in the frame. */ +#if 0 #define NUM_INT_SOURCES (8 + NUM_ATARI_SOURCES)
@@ -133,13 +134,6 @@ static struct irqhandler irq_handler[NUM*/ static struct irqparam irq_param[NUM_INT_SOURCES ]; -/* -* Bitmap for free interrupt vector numbers -* (new vectors starting from 0x70 can be allocated by -* atari_register_vme_int()) -*/ -static int free_vme_vec_bitmap; -/* check for valid int number (complex, sigh...) */ #define IS_VALID_INTNO (n) \ ((n) > 0 && \
@@ -301,6 +295,14 @@ __asm__ (__ALIGN_STR "\n" ); for (;;); } +#endif + +/* +* Bitmap for free interrupt vector numbers +* (new vectors starting from 0x70 can be allocated by +* atari_register_vme_int()) +*/ +static int free_vme_vec_bitmap;/* GK: * HBL IRQ handler for Falcon. Nobody needs it :-)
@@ -313,13 +315,34 @@ __ALIGN_STR "\n\t""orw #0x200,%sp@\n\t" /* set saved ipl to 2 */ "rte"); -/* Defined in entry.S; only increments 'num_spurious' */ -asmlinkage void bad_inthandler(void); - -extern void atari_microwire_cmd (int cmd ); +extern void atari_microwire_cmd (int cmd);extern int atari_SCC_reset_done; +static int atari_startup_irq (unsigned int irq) +{ +m68k_irq_startup (irq); +atari_turnon_irq (irq); +atari_enable_irq (irq); +return 0 ; +} + +static void atari_shutdown_irq (unsigned int irq) +{ +atari_disable_irq (irq); +atari_turnoff_irq (irq); +m68k_irq_shutdown (irq); +} + +static struct irq_controller atari_irq_controller = { + .name ="atari" , + .lock =SPIN_LOCK_UNLOCKED , + .startup = atari_startup_irq, + .shutdown = atari_shutdown_irq, + .enable = atari_enable_irq, + .disable = atari_disable_irq, +}; +/* * void atari_init_IRQ (void) *
@@ -333,12 +356,8 @@ extern int atari_SCC_reset_done;void __init atari_init_IRQ (void ) { -int i; - -/* initialize the vector table */ -for (i =0 ; i <NUM_INT_SOURCES ; ++i) { - vectors[IRQ_SOURCE_TO_VECTOR (i)] = bad_inthandler; - } +m68k_setup_user_interrupt (VEC_USER ,192 ,NULL ); +m68k_setup_irq_controller (&atari_irq_controller,1 ,NUM_ATARI_SOURCES -1 );/* Initialize the MFP(s) */
@@ -378,8 +397,7 @@ #endif* enabled in VME mask */ tt_scu.vme_mask =0x60 ;/* enable MFP and SCC ints */ - } -else { + }else {/* If no SCU and no Hades, the HSYNC interrupt needs to be * disabled this way. (Else _inthandler in kernel/sys_call.S * gets overruns)
@@ -404,184 +422,6 @@ #endif } -static irqreturn_t atari_call_irq_list (int irq,void *dev_id,struct pt_regs *fp ) -{ -irq_node_t *node; - -for (node = (irq_node_t *)dev_id; node; node = node->next) - node->handler (irq, node->dev_id, fp); -return IRQ_HANDLED ; -} - - -/* -* atari_request_irq : add an interrupt service routine for a particular -* machine specific interrupt source. -* If the addition was successful, it returns 0. -*/ - -int atari_request_irq (unsigned int irq,irqreturn_t (*handler)(int ,void *,struct pt_regs *), -unsigned long flags,const char *devname,void *dev_id) -{ -int vector; -unsigned long oflags = flags; - -/* -* The following is a hack to make some PCI card drivers work, -* which set the SA_SHIRQ flag. -*/ - - flags &= ~SA_SHIRQ ; - -if (flags ==SA_INTERRUPT ) { -printk ("%s: SA_INTERRUPT changed to IRQ_TYPE_SLOW for %s\n" , - __FUNCTION__, devname); - flags =IRQ_TYPE_SLOW ; - } -if (flags <IRQ_TYPE_SLOW || flags >IRQ_TYPE_PRIO ) { -printk ("%s: Bad irq type 0x%lx <0x%lx> requested from %s\n" , - __FUNCTION__, flags, oflags, devname); -return -EINVAL ; - } -if (!IS_VALID_INTNO (irq)) { -printk ("%s: Unknown irq %d requested from %s\n" , - __FUNCTION__, irq, devname); -return -ENXIO ; - } - vector =IRQ_SOURCE_TO_VECTOR (irq); - -/* -* Check type/source combination: slow ints are (currently) -* only possible for MFP-interrupts. -*/ -if (flags ==IRQ_TYPE_SLOW && - (irq <STMFP_SOURCE_BASE || irq >=SCC_SOURCE_BASE )) { -printk ("%s: Slow irq requested for non-MFP source %d from %s\n" , - __FUNCTION__, irq, devname); -return -EINVAL ; - } - -if (vectors[vector] == bad_inthandler) { -/* int has no handler yet */ - irq_handler[irq].handler = handler; - irq_handler[irq].dev_id = dev_id; - irq_param[irq].flags = flags; - irq_param[irq].devname = devname; - vectors[vector] = - (flags ==IRQ_TYPE_SLOW ) ? slow_handlers[irq-STMFP_SOURCE_BASE ] : - (flags ==IRQ_TYPE_FAST ) ? atari_fast_irq_handler : - atari_prio_irq_handler; -/* If MFP int, also enable and umask it */ -atari_turnon_irq (irq); -atari_enable_irq (irq); - -return 0 ; - } -else if (irq_param[irq].flags == flags) { -/* old handler is of same type -> handlers can be chained */ -irq_node_t *node; -unsigned long flags; - -local_irq_save (flags); - -if (irq_handler[irq].handler != atari_call_irq_list) { -/* Only one handler yet, make a node for this first one */ -if (!(node =new_irq_node ())) -return -ENOMEM ; - node->handler = irq_handler[irq].handler; - node->dev_id = irq_handler[irq].dev_id; - node->devname = irq_param[irq].devname; - node->next =NULL ; - - irq_handler[irq].handler = atari_call_irq_list; - irq_handler[irq].dev_id = node; - irq_param[irq].devname ="chained" ; - } - -if (!(node =new_irq_node ())) -return -ENOMEM ; - node->handler = handler; - node->dev_id = dev_id; - node->devname = devname; -/* new handlers are put in front of the queue */ - node->next = irq_handler[irq].dev_id; - irq_handler[irq].dev_id = node; - -local_irq_restore (flags); -return 0 ; - }else { -printk ("%s: Irq %d allocated by other type int (call from %s)\n" , - __FUNCTION__, irq, devname); -return -EBUSY ; - } -} - -void atari_free_irq (unsigned int irq,void *dev_id) -{ -unsigned long flags; -int vector; -irq_node_t **list, *node; - -if (!IS_VALID_INTNO (irq)) { -printk ("%s: Unknown irq %d\n" , __FUNCTION__, irq); -return ; - } - - vector =IRQ_SOURCE_TO_VECTOR (irq); -if (vectors[vector] == bad_inthandler) - goto not_found; - -local_irq_save (flags); - -if (irq_handler[irq].handler != atari_call_irq_list) { -/* It's the only handler for the interrupt */ -if (irq_handler[irq].dev_id != dev_id) { -local_irq_restore (flags); - goto not_found; - } - irq_handler[irq].handler =NULL ; - irq_handler[irq].dev_id =NULL ; - irq_param[irq].devname =NULL ; - vectors[vector] = bad_inthandler; -/* If MFP int, also disable it */ -atari_disable_irq (irq); -atari_turnoff_irq (irq); - -local_irq_restore (flags); -return ; - } - -/* The interrupt is chained, find the irq on the list */ -for (list = (irq_node_t **)&irq_handler[irq].dev_id; *list; list = &(*list)->next) { -if ((*list)->dev_id == dev_id)break ; - } -if (!*list) { -local_irq_restore (flags); - goto not_found; - } - - (*list)->handler =NULL ;/* Mark it as free for reallocation */ - *list = (*list)->next; - -/* If there's now only one handler, unchain the interrupt, i.e. plug in -* the handler directly again and omit atari_call_irq_list */ - node = (irq_node_t *)irq_handler[irq].dev_id; -if (node && !node->next) { - irq_handler[irq].handler = node->handler; - irq_handler[irq].dev_id = node->dev_id; - irq_param[irq].devname = node->devname; - node->handler =NULL ;/* Mark it as free for reallocation */ - } - -local_irq_restore (flags); -return ; - -not_found: -printk ("%s: tried to remove invalid irq\n" , __FUNCTION__); -return ; -} - -/* * atari_register_vme_int() returns the number of a free interrupt vector for * hardware with a programmable int vector (probably a VME board).
@@ -591,58 +431,24 @@ unsigned long atari_register_vme_int(voi {int i; -for (i =0 ; i <32 ; i++) -if ((free_vme_vec_bitmap & (1 << i)) ==0 ) +for (i =0 ; i <32 ; i++) +if ((free_vme_vec_bitmap & (1 << i)) ==0 )break ; -if (i ==16 ) +if (i ==16 )return 0 ; free_vme_vec_bitmap |=1 << i; -return (VME_SOURCE_BASE + i); +return VME_SOURCE_BASE + i; }void atari_unregister_vme_int (unsigned long irq) { -if (irq >=VME_SOURCE_BASE && irq <VME_SOURCE_BASE +VME_MAX_SOURCES ) { +if (irq >=VME_SOURCE_BASE && irq <VME_SOURCE_BASE +VME_MAX_SOURCES ) { irq -=VME_SOURCE_BASE ; free_vme_vec_bitmap &= ~(1 << irq); } } -int show_atari_interrupts (struct seq_file *p,void *v) -{ -int i; - -for (i =0 ; i <NUM_INT_SOURCES ; ++i) { -if (vectors[IRQ_SOURCE_TO_VECTOR (i)] == bad_inthandler) -continue ; -if (i <STMFP_SOURCE_BASE ) -seq_printf (p,"auto %2d: %10u " , - i,kstat_cpu (0 ).irqs[i]); -else -seq_printf (p,"vec $%02x: %10u " , -IRQ_SOURCE_TO_VECTOR (i), -kstat_cpu (0 ).irqs[i]); - -if (irq_handler[i].handler != atari_call_irq_list) { -seq_printf (p,"%s\n" , irq_param[i].devname); - } -else { -irq_node_t *n; -for ( n = (irq_node_t *)irq_handler[i].dev_id; n; n = n->next ) { -seq_printf (p,"%s\n" , n->devname); -if (n->next) -seq_puts (p," " ); - } - } - } -if (num_spurious) -seq_printf (p,"spurio.: %10u\n" , num_spurious); - -return 0 ; -} - -
arch/m68k/atari/config.c +0 -11
@@ -57,12 +57,6 @@ static int atari_get_hardware_list(char/* atari specific irq functions */ extern void atari_init_IRQ (void ); -extern int atari_request_irq (unsigned int irq,irqreturn_t (*handler)(int ,void *,struct pt_regs *), -unsigned long flags,const char *devname,void *dev_id); -extern void atari_free_irq (unsigned int irq,void *dev_id); -extern void atari_enable_irq (unsigned int ); -extern void atari_disable_irq (unsigned int ); -extern int show_atari_interrupts (struct seq_file *,void *);extern void atari_mksound (unsigned int count,unsigned int ticks );#ifdef CONFIG_HEARTBEAT static void atari_heartbeat (int on );
@@ -232,13 +226,8 @@ void __init config_atari(void) mach_sched_init = atari_sched_init; mach_init_IRQ = atari_init_IRQ; - mach_request_irq = atari_request_irq; - mach_free_irq = atari_free_irq; - enable_irq = atari_enable_irq; - disable_irq = atari_disable_irq; mach_get_model = atari_get_model; mach_get_hardware_list = atari_get_hardware_list; - mach_get_irq_list = show_atari_interrupts; mach_gettimeoffset = atari_gettimeoffset; mach_reset = atari_reset; mach_max_dma_address =0xffffff ;
Signature · 3 lines
1.3.3 --
PATCH 17/21 convert hp300 irq code
In reply to [email protected]---
arch/m68k/hp300/Makefile | 2 - arch/m68k/hp300/config.c | 11 +-- arch/m68k/hp300/ints.c | 175 ---------------------------------------------- arch/m68k/hp300/ints.h | 9 -- arch/m68k/hp300/time.c | 3 - 5 files changed, 6 insertions(+), 194 deletions(-) delete mode 100644 arch/m68k/hp300/ints.c delete mode 100644 arch/m68k/hp300/ints.h
4170e111d26ddfeabdf6af7cdedc33f665f61dff
arch/m68k/hp300/Makefile +1 -1
@@ -2,4 +2,4 @@ # # Makefile for Linux arch/m68k/hp300 source directory # -obj-y := ksyms.o config.o ints.o time.o reboot.o +obj-y := ksyms.o config.o time.o reboot.o
arch/m68k/hp300/config.c +4 -7
@@ -21,7 +21,6 @@ #include <asm/io.h>#include <asm/hp300hw.h> #include <asm/rtc.h> -#include "ints.h" #include "time.h" unsigned long hp300_model;
@@ -64,8 +63,6 @@ static char *hp300_models[] __initdata =static char hp300_model_name[13 ] ="HP9000/" ;extern void hp300_reset (void ); -extern irqreturn_t (*hp300_default_handler[])(int ,void *,struct pt_regs *); -extern int show_hp300_interrupts (struct seq_file *,void *);#ifdef CONFIG_SERIAL_8250_CONSOLE extern int hp300_setup_serial_console (void )__init ;#endif
@@ -245,16 +242,16 @@ static unsigned int hp300_get_ss(void)hp300_rtc_read (RTC_REG_SEC2 ); } +static void __init hp300_init_IRQ (void ) +{ +} +void __init config_hp300 (void ) { mach_sched_init = hp300_sched_init; mach_init_IRQ = hp300_init_IRQ; - mach_request_irq = hp300_request_irq; - mach_free_irq = hp300_free_irq; mach_get_model = hp300_get_model; - mach_get_irq_list = show_hp300_interrupts; mach_gettimeoffset = hp300_gettimeoffset; - mach_default_handler = &hp300_default_handler; mach_hwclk = hp300_hwclk; mach_get_ss = hp300_get_ss; mach_reset = hp300_reset;
arch/m68k/hp300/ints.c deleted +0 -175
175 lines not on this page · raw message
arch/m68k/hp300/ints.h deleted +0 -9
@@ -1,9 +0,0 @@ -extern void hp300_init_IRQ (void ); -extern void (*hp300_handlers[8 ])(int ,void *,struct pt_regs *); -extern void hp300_free_irq (unsigned int irq,void *dev_id); -extern int hp300_request_irq (unsigned int irq, -irqreturn_t (*handler) (int ,void *,struct pt_regs *), -unsigned long flags,const char *devname,void *dev_id); - -/* number of interrupts, includes 0 (what's that?) */ -#define HP300_NUM_IRQS 8
arch/m68k/hp300/time.c +1 -2
@@ -18,7 +18,6 @@ #include <asm/io.h>#include <asm/system.h> #include <asm/traps.h> #include <asm/blinken.h> -#include "ints.h" /* Clock hardware definitions */
@@ -71,7 +70,7 @@ void __init hp300_sched_init(irqreturn_t asmvolatile (" movpw %0,%1@(5)" : :"d" (INTVAL ),"a" (CLOCKBASE )); -cpu_request_irq (6 , hp300_tick,IRQ_FLG_STD ,"timer tick" , vector); +request_irq (IRQ_AUTO_6 , hp300_tick,IRQ_FLG_STD ,"timer tick" , vector);out_8 (CLOCKBASE +CLKCR2 ,0x1 );/* select CR1 */ out_8 (CLOCKBASE +CLKCR1 ,0x40 );/* enable irq */
Signature · 3 lines
1.3.3 --
PATCH 18/21 convert mac irq code
In reply to [email protected]---
arch/m68k/mac/baboon.c | 2 arch/m68k/mac/config.c | 5 arch/m68k/mac/iop.c | 2 arch/m68k/mac/macints.c | 496 +++++++++++------------------------------- arch/m68k/mac/oss.c | 14 + arch/m68k/mac/psc.c | 10 - arch/m68k/mac/via.c | 18 +- drivers/scsi/mac_esp.c | 7 - drivers/scsi/mac_scsi.c | 7 - include/asm-m68k/mac_oss.h | 10 - include/asm-m68k/macintosh.h | 10 - include/asm-m68k/macints.h | 3 12 files changed, 159 insertions(+), 425 deletions(-)
aff4be075ffb377f41a24be05476deee040f8bfc
arch/m68k/mac/baboon.c +1 -1
@@ -81,7 +81,7 @@ #endiffor (i =0 , irq_bit =1 ; i <3 ; i++, irq_bit <<=1 ) {if (events & irq_bit/* & baboon_active*/ ) { baboon_active &= ~irq_bit; -mac_do_irq_list (IRQ_BABOON_0 + i, regs); +m68k_handle_int (IRQ_BABOON_0 + i, regs); baboon_active |= irq_bit; baboon->mb_ifr &= ~irq_bit; }
arch/m68k/mac/config.c +0 -5
@@ -169,12 +169,7 @@ void __init config_mac(void) mach_sched_init = mac_sched_init; mach_init_IRQ = mac_init_IRQ; - mach_request_irq = mac_request_irq; - mach_free_irq = mac_free_irq; - enable_irq = mac_enable_irq; - disable_irq = mac_disable_irq; mach_get_model = mac_get_model; - mach_get_irq_list = show_mac_interrupts; mach_gettimeoffset = mac_gettimeoffset;#warning move to adb/via init#if 0
arch/m68k/mac/iop.c +1 -1
@@ -317,7 +317,7 @@ void __init iop_register_interrupts(void {if (iop_ism_present) {if (oss_present) { -cpu_request_irq (OSS_IRQLEV_IOPISM , iop_ism_irq, +request_irq (OSS_IRQLEV_IOPISM , iop_ism_irq,IRQ_FLG_LOCK ,"ISM IOP" , (void *)IOP_NUM_ISM );oss_irq_enable (IRQ_MAC_ADB );
arch/m68k/mac/macints.c +127 -369
581 lines not on this page · raw message
arch/m68k/mac/oss.c +7 -7
@@ -67,15 +67,15 @@ void __init oss_init(void)void __init oss_register_interrupts (void ) { -cpu_request_irq (OSS_IRQLEV_SCSI , oss_irq,IRQ_FLG_LOCK , +request_irq (OSS_IRQLEV_SCSI , oss_irq,IRQ_FLG_LOCK ,"scsi" , (void *) oss); -cpu_request_irq (OSS_IRQLEV_IOPSCC , mac_scc_dispatch,IRQ_FLG_LOCK , +request_irq (OSS_IRQLEV_IOPSCC , mac_scc_dispatch,IRQ_FLG_LOCK ,"scc" , mac_scc_dispatch); -cpu_request_irq (OSS_IRQLEV_NUBUS , oss_nubus_irq,IRQ_FLG_LOCK , +request_irq (OSS_IRQLEV_NUBUS , oss_nubus_irq,IRQ_FLG_LOCK ,"nubus" , (void *) oss); -cpu_request_irq (OSS_IRQLEV_SOUND , oss_irq,IRQ_FLG_LOCK , +request_irq (OSS_IRQLEV_SOUND , oss_irq,IRQ_FLG_LOCK ,"sound" , (void *) oss); -cpu_request_irq (OSS_IRQLEV_VIA1 , via1_irq,IRQ_FLG_LOCK , +request_irq (OSS_IRQLEV_VIA1 , via1_irq,IRQ_FLG_LOCK ,"via1" , (void *) via1); }
@@ -113,7 +113,7 @@ #endif oss->irq_pending &= ~OSS_IP_SOUND ; }else if (events &OSS_IP_SCSI ) { oss->irq_level[OSS_SCSI ] =OSS_IRQLEV_DISABLED ; -mac_do_irq_list (IRQ_MAC_SCSI , regs); +m68k_handle_int (IRQ_MAC_SCSI , regs); oss->irq_pending &= ~OSS_IP_SCSI ; oss->irq_level[OSS_SCSI ] =OSS_IRQLEV_SCSI ; }else {
@@ -146,7 +146,7 @@ #endiffor (i =0 , irq_bit =1 ; i <6 ; i++, irq_bit <<=1 ) {if (events & irq_bit) { oss->irq_level[i] =OSS_IRQLEV_DISABLED ; -mac_do_irq_list (NUBUS_SOURCE_BASE + i, regs); +m68k_handle_int (NUBUS_SOURCE_BASE + i, regs); oss->irq_pending &= ~irq_bit; oss->irq_level[i] =OSS_IRQLEV_NUBUS ; }
arch/m68k/mac/psc.c +5 -5
@@ -117,10 +117,10 @@ #endifvoid __init psc_register_interrupts (void ) { -cpu_request_irq (3 , psc_irq,IRQ_FLG_LOCK ,"psc3" , (void *)0x30 ); -cpu_request_irq (4 , psc_irq,IRQ_FLG_LOCK ,"psc4" , (void *)0x40 ); -cpu_request_irq (5 , psc_irq,IRQ_FLG_LOCK ,"psc5" , (void *)0x50 ); -cpu_request_irq (6 , psc_irq,IRQ_FLG_LOCK ,"psc6" , (void *)0x60 ); +request_irq (IRQ_AUTO_3 , psc_irq,0 ,"psc3" , (void *)0x30 ); +request_irq (IRQ_AUTO_4 , psc_irq,0 ,"psc4" , (void *)0x40 ); +request_irq (IRQ_AUTO_5 , psc_irq,0 ,"psc5" , (void *)0x50 ); +request_irq (IRQ_AUTO_6 , psc_irq,0 ,"psc6" , (void *)0x60 ); }/*
@@ -149,7 +149,7 @@ #endiffor (i =0 , irq_bit =1 ; i <4 ; i++, irq_bit <<=1 ) {if (events & irq_bit) {psc_write_byte (pIER, irq_bit); -mac_do_irq_list (base_irq + i, regs); +m68k_handle_int (base_irq + i, regs);psc_write_byte (pIFR, irq_bit);psc_write_byte (pIER, irq_bit |0x80 ); }
arch/m68k/mac/via.c +9 -9
@@ -253,21 +253,21 @@ void __init via_init_clock(irqreturn_t (void __init via_register_interrupts (void ) {if (via_alt_mapping) { -cpu_request_irq (IRQ_AUTO_1 , via1_irq, +request_irq (IRQ_AUTO_1 , via1_irq,IRQ_FLG_LOCK |IRQ_FLG_FAST ,"software" , (void *) via1); -cpu_request_irq (IRQ_AUTO_6 , via1_irq, +request_irq (IRQ_AUTO_6 , via1_irq,IRQ_FLG_LOCK |IRQ_FLG_FAST ,"via1" , (void *) via1); }else { -cpu_request_irq (IRQ_AUTO_1 , via1_irq, +request_irq (IRQ_AUTO_1 , via1_irq,IRQ_FLG_LOCK |IRQ_FLG_FAST ,"via1" , (void *) via1); } -cpu_request_irq (IRQ_AUTO_2 , via2_irq,IRQ_FLG_LOCK |IRQ_FLG_FAST , +request_irq (IRQ_AUTO_2 , via2_irq,IRQ_FLG_LOCK |IRQ_FLG_FAST ,"via2" , (void *) via2);if (!psc_present) { -cpu_request_irq (IRQ_AUTO_4 , mac_scc_dispatch,IRQ_FLG_LOCK , +request_irq (IRQ_AUTO_4 , mac_scc_dispatch,IRQ_FLG_LOCK ,"scc" , mac_scc_dispatch); } request_irq(IRQ_MAC_NUBUS, via_nubus_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
@@ -424,7 +424,7 @@ irqreturn_t via1_irq(int irq, void *dev_for (i =0 , irq_bit =1 ; i <7 ; i++, irq_bit <<=1 )if (events & irq_bit) { via1[vIER] = irq_bit; -mac_do_irq_list (VIA1_SOURCE_BASE + i, regs); +m68k_handle_int (VIA1_SOURCE_BASE + i, regs); via1[vIFR] = irq_bit; via1[vIER] = irq_bit |0x80 ; }
@@ -439,7 +439,7 @@ #if 0 /* freakin' pmu is doing weird stu/* No, it won't be set. that's why we're doing this. */ via_irq_disable (IRQ_MAC_NUBUS );via_irq_clear (IRQ_MAC_NUBUS ); -mac_do_irq_list (IRQ_MAC_NUBUS , regs); +m68k_handle_int (IRQ_MAC_NUBUS , regs); via_irq_enable(IRQ_MAC_NUBUS); }#endif
@@ -459,7 +459,7 @@ irqreturn_t via2_irq(int irq, void *dev_if (events & irq_bit) { via2[gIER] = irq_bit; via2[gIFR] = irq_bit | rbv_clear; -mac_do_irq_list (VIA2_SOURCE_BASE + i, regs); +m68k_handle_int (VIA2_SOURCE_BASE + i, regs); via2[gIER] = irq_bit |0x80 ; }return IRQ_HANDLED ;
@@ -481,7 +481,7 @@ irqreturn_t via_nubus_irq(int irq, voidfor (i =0 , irq_bit =1 ; i <7 ; i++, irq_bit <<=1 ) {if (events & irq_bit) {via_irq_disable (NUBUS_SOURCE_BASE + i); -mac_do_irq_list (NUBUS_SOURCE_BASE + i, regs); +m68k_handle_int (NUBUS_SOURCE_BASE + i, regs);via_irq_enable (NUBUS_SOURCE_BASE + i); } }
drivers/scsi/mac_esp.c +2 -5
@@ -43,9 +43,6 @@ #include <asm/macintosh.h>/* #define DEBUG_MAC_ESP */ -#define mac_turnon_irq (x) mac_enable_irq(x) -#define mac_turnoff_irq (x) mac_disable_irq(x) -extern void esp_handle (struct NCR_ESP *esp);extern void mac_esp_intr (int irq,void *dev_id,struct pt_regs *pregs);
@@ -639,13 +636,13 @@ static void dma_init_write(struct NCR_ESstatic void dma_ints_off (struct NCR_ESP * esp) { -mac_turnoff_irq (esp->irq); +disable_irq (esp->irq); }static void dma_ints_on (struct NCR_ESP * esp) { -mac_turnon_irq (esp->irq); +enable_irq (esp->irq); }/*
drivers/scsi/mac_scsi.c +2 -5
@@ -65,9 +65,6 @@ #endif#define RESET_BOOT #define DRIVER_SETUP -#define ENABLE_IRQ () mac_enable_irq( IRQ_MAC_SCSI ); -#define DISABLE_IRQ () mac_disable_irq( IRQ_MAC_SCSI ); -extern void via_scsi_clear (void );#ifdef RESET_BOOT
@@ -351,7 +348,7 @@ static void mac_scsi_reset_boot(struct Sprintk (KERN_INFO "Macintosh SCSI: resetting the SCSI bus..." );/* switch off SCSI IRQ - catch an interrupt without IRQ bit set else */ -mac_disable_irq (IRQ_MAC_SCSI ); +disable_irq (IRQ_MAC_SCSI );/* get in phase */ NCR5380_write( TARGET_COMMAND_REG,
@@ -369,7 +366,7 @@ static void mac_scsi_reset_boot(struct Sbarrier ();/* switch on SCSI IRQ again */ -mac_enable_irq (IRQ_MAC_SCSI ); +enable_irq (IRQ_MAC_SCSI );printk (KERN_INFO " done\n" ); }
include/asm-m68k/mac_oss.h +5 -5
@@ -69,12 +69,12 @@ #define OSS_POWEROFF 0x80#define OSS_IRQLEV_DISABLED 0#define OSS_IRQLEV_IOPISM 1/* ADB? */ -#define OSS_IRQLEV_SCSI 2 -#define OSS_IRQLEV_NUBUS 3/* keep this on its own level */ -#define OSS_IRQLEV_IOPSCC 4/* matches VIA alternate mapping */ -#define OSS_IRQLEV_SOUND 5/* matches VIA alternate mapping */ +#define OSS_IRQLEV_SCSI IRQ_AUTO_2 +#define OSS_IRQLEV_NUBUS IRQ_AUTO_3/* keep this on its own level */ +#define OSS_IRQLEV_IOPSCC IRQ_AUTO_4/* matches VIA alternate mapping */ +#define OSS_IRQLEV_SOUND IRQ_AUTO_5/* matches VIA alternate mapping */ #define OSS_IRQLEV_60HZ 6/* matches VIA alternate mapping */ -#define OSS_IRQLEV_VIA1 6/* matches VIA alternate mapping */ +#define OSS_IRQLEV_VIA1 IRQ_AUTO_6/* matches VIA alternate mapping */ #define OSS_IRQLEV_PARITY 7/* matches VIA alternate mapping */ #ifndef __ASSEMBLY__
include/asm-m68k/macintosh.h +0 -10
@@ -11,17 +11,7 @@ #include <linux/interrupt.h>extern void mac_reset (void );extern void mac_poweroff (void );extern void mac_init_IRQ (void ); -extern int mac_request_irq (unsigned int ,irqreturn_t (*)(int ,void *, -struct pt_regs *), -unsigned long ,const char *,void *); -extern void mac_free_irq (unsigned int ,void *); -extern void mac_enable_irq (unsigned int ); -extern void mac_disable_irq (unsigned int );extern int mac_irq_pending (unsigned int ); -extern int show_mac_interrupts (struct seq_file *,void *); -#if 0 -extern void mac_default_handler (int irq); -#endif extern void mac_identify (void );extern void mac_report_hardware (void );extern void mac_debugging_penguin (int );
include/asm-m68k/macints.h +0 -3
@@ -152,7 +152,4 @@ #define IRQ2SLOT(x) (x - 47)#define INT_CLK 24576/* CLK while int_clk =2.456MHz and divide = 100 */ #define INT_TICKS 246/* to make sched_time = 99.902... HZ */ -extern irq_node_t *mac_irq_list[NUM_MAC_SOURCES ]; -extern void mac_do_irq_list (int irq,struct pt_regs *); -#endif /* asm/macints.h */
Signature · 3 lines
1.3.3 --
PATCH 19/21 convert q40 irq code
In reply to [email protected]---
arch/m68k/kernel/entry.S | 11 - arch/m68k/q40/config.c | 11 - arch/m68k/q40/q40ints.c | 464 +++++++++++++++++----------------------------- 3 files changed, 169 insertions(+), 317 deletions(-)
bce99c5ef50415ebd104bf5a562dd9cb4ac141a4
arch/m68k/kernel/entry.S +1 -10
@@ -205,18 +205,9 @@ ENTRY(auto_inthandler) movel %sp,%sp@- movel %d0,%sp@- | put vector # on stack -#if defined(MACH_Q40_ONLY) && defined(CONFIG_BLK_DEV_FD) - btstb #4,0xff000000 | Q40 floppy needs very special treatment ... - jbeq 1f - btstb #3,0xff000004 - jbeq 1f - jbsr floppy_hardint - jbra 3f -1: -#endif auto_irqhandler_fixup = . + 2 jsr m68k_handle_int | process the IRQ -3: addql #8,%sp | pop parameters off stack + addql #8,%sp | pop parameters off stack ret_from_interrupt: subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)
arch/m68k/q40/config.c +0 -11
@@ -38,13 +38,8 @@ #include <asm/q40_master.h>extern irqreturn_t q40_process_int (int level,struct pt_regs *regs);extern void q40_init_IRQ (void ); -extern void q40_free_irq (unsigned int ,void *); -extern int show_q40_interrupts (struct seq_file *,void *); -extern void q40_enable_irq (unsigned int ); -extern void q40_disable_irq (unsigned int );static void q40_get_model (char *model);static int q40_get_hardware_list (char *buffer); -extern int q40_request_irq (unsigned int irq,irqreturn_t (*handler)(int ,void *,struct pt_regs *),unsigned long flags,const char *devname,void *dev_id);extern void q40_sched_init (irqreturn_t (*handler)(int ,void *,struct pt_regs *));extern unsigned long q40_gettimeoffset (void );
@@ -174,12 +169,6 @@ void __init config_q40(void) mach_set_clock_mmss = q40_set_clock_mmss; mach_reset = q40_reset; - mach_free_irq = q40_free_irq; - mach_process_int = q40_process_int; - mach_get_irq_list = show_q40_interrupts; - mach_request_irq = q40_request_irq; - enable_irq = q40_enable_irq; - disable_irq = q40_disable_irq; mach_get_model = q40_get_model; mach_get_hardware_list = q40_get_hardware_list;
arch/m68k/q40/q40ints.c +168 -296
555 lines not on this page · raw message
Signature · 3 lines
1.3.3 --
PATCH 20/21 convert sun3 irq code
In reply to [email protected]---
arch/m68k/sun3/config.c | 8 -- arch/m68k/sun3/sun3ints.c | 208 ++++++------------------------------------- arch/m68k/sun3x/config.c | 7 - include/asm-m68k/sun3ints.h | 22 +---- 4 files changed, 32 insertions(+), 213 deletions(-)
34f1711015076d8df22cc1d463ece08c377f0806
arch/m68k/sun3/config.c +0 -8
@@ -36,7 +36,6 @@ extern char _text, _end;char sun3_reserved_pmeg[SUN3_PMEGS_NUM ];extern unsigned long sun3_gettimeoffset (void ); -extern int show_sun3_interrupts (struct seq_file *,void *);extern void sun3_sched_init (irqreturn_t (*handler)(int ,void *,struct pt_regs *));extern void sun3_get_model (char * model);extern void idprom_init (void );
@@ -147,13 +146,6 @@ void __init config_sun3(void) mach_sched_init = sun3_sched_init; mach_init_IRQ = sun3_init_IRQ; - mach_default_handler = &sun3_default_handler; - mach_request_irq = sun3_request_irq; - mach_free_irq = sun3_free_irq; - enable_irq = sun3_enable_irq; - disable_irq = sun3_disable_irq; - mach_process_int = sun3_process_int; - mach_get_irq_list = show_sun3_interrupts; mach_reset = sun3_reboot; mach_gettimeoffset = sun3_gettimeoffset; mach_get_model = sun3_get_model;
arch/m68k/sun3/sun3ints.c +27 -181
256 lines not on this page · raw message
arch/m68k/sun3x/config.c +0 -7
@@ -52,17 +52,10 @@ void __init config_sun3x(void)sun3x_prom_init (); - mach_get_irq_list = show_sun3_interrupts; mach_max_dma_address =0xffffffff ;/* we can DMA anywhere, whee */ - mach_default_handler = &sun3_default_handler; mach_sched_init = sun3x_sched_init; mach_init_IRQ = sun3_init_IRQ; - enable_irq = sun3_enable_irq; - disable_irq = sun3_disable_irq; - mach_request_irq = sun3_request_irq; - mach_free_irq = sun3_free_irq; - mach_process_int = sun3_process_int; mach_gettimeoffset = sun3x_gettimeoffset; mach_reset = sun3x_reboot;
include/asm-m68k/sun3ints.h +5 -17
@@ -12,37 +12,25 @@ #ifndef SUN3INTS_H#define SUN3INTS_H #include <linux/types.h> -#include <linux/kernel.h> -#include <linux/sched.h> -#include <linux/kernel_stat.h> #include <linux/interrupt.h> -#include <linux/seq_file.h> -#include <asm/segment.h> #include <asm/intersil.h> #include <asm/oplib.h> +#include <asm/traps.h> #define SUN3_INT_VECS 192void sun3_enable_irq (unsigned int irq);void sun3_disable_irq (unsigned int irq); -int sun3_request_irq (unsigned int irq, -irqreturn_t (*handler)(int ,void *,struct pt_regs *), -unsigned long flags,const char *devname,void *dev_id - );extern void sun3_init_IRQ (void ); -extern irqreturn_t (*sun3_default_handler[]) (int ,void *,struct pt_regs *); -extern void sun3_free_irq (unsigned int irq,void *dev_id);extern void sun3_enable_interrupts (void );extern void sun3_disable_interrupts (void ); -extern int show_sun3_interrupts (struct seq_file *,void *); -extern irqreturn_t sun3_process_int (int ,struct pt_regs *);extern volatile unsigned char * sun3_intreg;/* master list of VME vectors -- don't fuck with this */ -#define SUN3_VEC_FLOPPY 0x40 -#define SUN3_VEC_VMESCSI0 0x40 -#define SUN3_VEC_VMESCSI1 0x41 -#define SUN3_VEC_CG 0xA8 +#define SUN3_VEC_FLOPPY (IRQ_USER+0) +#define SUN3_VEC_VMESCSI0 (IRQ_USER+0) +#define SUN3_VEC_VMESCSI1 (IRQ_USER+1) +#define SUN3_VEC_CG (IRQ_USER+104)#endif /* SUN3INTS_H */
Signature · 3 lines
1.3.3 --
PATCH 21/21 convert VME irq code
In reply to [email protected]---
arch/m68k/bvme6000/Makefile | 2 - arch/m68k/bvme6000/bvmeints.c | 161 ----------------------------------------- arch/m68k/bvme6000/config.c | 21 ++--- arch/m68k/mvme147/147ints.c | 146 ------------------------------------- arch/m68k/mvme147/Makefile | 2 - arch/m68k/mvme147/config.c | 22 ++---- arch/m68k/mvme16x/16xints.c | 150 -------------------------------------- arch/m68k/mvme16x/Makefile | 2 - arch/m68k/mvme16x/config.c | 23 +++--- include/asm-m68k/bvme6000hw.h | 30 ++++---- include/asm-m68k/mvme147hw.h | 44 ++++++----- include/asm-m68k/mvme16xhw.h | 40 +++++----- 12 files changed, 88 insertions(+), 555 deletions(-) delete mode 100644 arch/m68k/bvme6000/bvmeints.c delete mode 100644 arch/m68k/mvme147/147ints.c delete mode 100644 arch/m68k/mvme16x/16xints.c
4be81c0899302a775885858280aa764829944393
arch/m68k/bvme6000/Makefile +1 -1
@@ -2,4 +2,4 @@ # # Makefile for Linux arch/m68k/bvme6000 source directory # -obj-y := config.o bvmeints.o rtc.o +obj-y := config.o rtc.o
arch/m68k/bvme6000/bvmeints.c deleted +0 -161
161 lines not on this page · raw message
arch/m68k/bvme6000/config.c +8 -13
@@ -36,15 +36,8 @@ #include <asm/rtc.h>#include <asm/machdep.h> #include <asm/bvme6000hw.h> -extern irqreturn_t bvme6000_process_int (int level,struct pt_regs *regs); -extern void bvme6000_init_IRQ (void ); -extern void bvme6000_free_irq (unsigned int ,void *); -extern int show_bvme6000_interrupts (struct seq_file *,void *); -extern void bvme6000_enable_irq (unsigned int ); -extern void bvme6000_disable_irq (unsigned int );static void bvme6000_get_model (char *model);static int bvme6000_get_hardware_list (char *buffer); -extern int bvme6000_request_irq (unsigned int irq,irqreturn_t (*handler)(int ,void *,struct pt_regs *),unsigned long flags,const char *devname,void *dev_id);extern void bvme6000_sched_init (irqreturn_t (*handler)(int ,void *,struct pt_regs *));extern unsigned long bvme6000_gettimeoffset (void );extern int bvme6000_hwclk (int ,struct rtc_time *);
@@ -100,6 +93,14 @@ static int bvme6000_get_hardware_list(chreturn 0 ; } +/* +* This function is called during kernel startup to initialize +* the bvme6000 IRQ handling routines. +*/ +static void bvme6000_init_IRQ (void ) +{ +m68k_setup_user_interrupt (VEC_USER ,192 ,NULL ); +}void __init config_bvme6000 (void ) {
@@ -127,12 +128,6 @@ #endif mach_hwclk = bvme6000_hwclk; mach_set_clock_mmss = bvme6000_set_clock_mmss; mach_reset = bvme6000_reset; - mach_free_irq = bvme6000_free_irq; - mach_process_int = bvme6000_process_int; - mach_get_irq_list = show_bvme6000_interrupts; - mach_request_irq = bvme6000_request_irq; - enable_irq = bvme6000_enable_irq; - disable_irq = bvme6000_disable_irq; mach_get_model = bvme6000_get_model; mach_get_hardware_list = bvme6000_get_hardware_list;
arch/m68k/mvme147/147ints.c deleted +0 -146
146 lines not on this page · raw message
arch/m68k/mvme147/Makefile +1 -1
@@ -2,4 +2,4 @@ # # Makefile for Linux arch/m68k/mvme147 source directory # -obj-y := config.o 147ints.o +obj-y := config.o
arch/m68k/mvme147/config.c +9 -13
@@ -36,15 +36,8 @@ #include <asm/machdep.h>#include <asm/mvme147hw.h> -extern irqreturn_t mvme147_process_int (int level,struct pt_regs *regs); -extern void mvme147_init_IRQ (void ); -extern void mvme147_free_irq (unsigned int ,void *); -extern int show_mvme147_interrupts (struct seq_file *,void *); -extern void mvme147_enable_irq (unsigned int ); -extern void mvme147_disable_irq (unsigned int );static void mvme147_get_model (char *model);static int mvme147_get_hardware_list (char *buffer); -extern int mvme147_request_irq (unsigned int irq,irqreturn_t (*handler)(int ,void *,struct pt_regs *),unsigned long flags,const char *devname,void *dev_id);extern void mvme147_sched_init (irqreturn_t (*handler)(int ,void *,struct pt_regs *));extern unsigned long mvme147_gettimeoffset (void );extern int mvme147_hwclk (int ,struct rtc_time *);
@@ -91,6 +84,15 @@ static int mvme147_get_hardware_list(chareturn 0 ; } +/* +* This function is called during kernel startup to initialize +* the mvme147 IRQ handling routines. +*/ + +void mvme147_init_IRQ (void ) +{ +m68k_setup_user_interrupt (VEC_USER ,192 ,NULL ); +}void __init config_mvme147 (void ) {
@@ -101,12 +103,6 @@ void __init config_mvme147(void) mach_hwclk = mvme147_hwclk; mach_set_clock_mmss = mvme147_set_clock_mmss; mach_reset = mvme147_reset; - mach_free_irq = mvme147_free_irq; - mach_process_int = mvme147_process_int; - mach_get_irq_list = show_mvme147_interrupts; - mach_request_irq = mvme147_request_irq; - enable_irq = mvme147_enable_irq; - disable_irq = mvme147_disable_irq; mach_get_model = mvme147_get_model; mach_get_hardware_list = mvme147_get_hardware_list;
arch/m68k/mvme16x/16xints.c deleted +0 -150
150 lines not on this page · raw message
arch/m68k/mvme16x/Makefile +1 -1
@@ -2,4 +2,4 @@ # # Makefile for Linux arch/m68k/mvme16x source directory # -obj-y := config.o 16xints.o rtc.o mvme16x_ksyms.o +obj-y := config.o rtc.o mvme16x_ksyms.o
arch/m68k/mvme16x/config.c +10 -13
@@ -40,15 +40,8 @@ extern t_bdid mvme_bdid;static MK48T08ptr_t volatile rtc = (MK48T08ptr_t )MVME_RTC_BASE ; -extern irqreturn_t mvme16x_process_int (int level,struct pt_regs *regs); -extern void mvme16x_init_IRQ (void ); -extern void mvme16x_free_irq (unsigned int ,void *); -extern int show_mvme16x_interrupts (struct seq_file *,void *); -extern void mvme16x_enable_irq (unsigned int ); -extern void mvme16x_disable_irq (unsigned int );static void mvme16x_get_model (char *model);static int mvme16x_get_hardware_list (char *buffer); -extern int mvme16x_request_irq (unsigned int irq,irqreturn_t (*handler)(int ,void *,struct pt_regs *),unsigned long flags,const char *devname,void *dev_id);extern void mvme16x_sched_init (irqreturn_t (*handler)(int ,void *,struct pt_regs *));extern unsigned long mvme16x_gettimeoffset (void );extern int mvme16x_hwclk (int ,struct rtc_time *);
@@ -120,6 +113,16 @@ static int mvme16x_get_hardware_list(chareturn (len); } +/* +* This function is called during kernel startup to initialize +* the mvme16x IRQ handling routines. Should probably ensure +* that the base vectors for the VMEChip2 and PCCChip2 are valid. +*/ + +static void mvme16x_init_IRQ (void ) +{ +m68k_setup_user_interrupt (VEC_USER ,192 ,NULL ); +}#define pcc2chip ((volatile u_char *)0xfff42000)#define PccSCCMICR 0x1d
@@ -138,12 +141,6 @@ void __init config_mvme16x(void) mach_hwclk = mvme16x_hwclk; mach_set_clock_mmss = mvme16x_set_clock_mmss; mach_reset = mvme16x_reset; - mach_free_irq = mvme16x_free_irq; - mach_process_int = mvme16x_process_int; - mach_get_irq_list = show_mvme16x_interrupts; - mach_request_irq = mvme16x_request_irq; - enable_irq = mvme16x_enable_irq; - disable_irq = mvme16x_disable_irq; mach_get_model = mvme16x_get_model; mach_get_hardware_list = mvme16x_get_hardware_list;
include/asm-m68k/bvme6000hw.h +15 -15
@@ -109,23 +109,23 @@ #define BVME_CONFIG_SW4 0x01#define BVME_IRQ_TYPE_PRIO 0 -#define BVME_IRQ_PRN 0x54 -#define BVME_IRQ_I596 0x1a -#define BVME_IRQ_SCSI 0x1b -#define BVME_IRQ_TIMER 0x59 -#define BVME_IRQ_RTC 0x1e -#define BVME_IRQ_ABORT 0x1f +#define BVME_IRQ_PRN (IRQ_USER+20) +#define BVME_IRQ_TIMER (IRQ_USER+25) +#define BVME_IRQ_I596 IRQ_AUTO_2 +#define BVME_IRQ_SCSI IRQ_AUTO_3 +#define BVME_IRQ_RTC IRQ_AUTO_6 +#define BVME_IRQ_ABORT IRQ_AUTO_7/* SCC interrupts */ -#define BVME_IRQ_SCC_BASE 0x40 -#define BVME_IRQ_SCCB_TX 0x40 -#define BVME_IRQ_SCCB_STAT 0x42 -#define BVME_IRQ_SCCB_RX 0x44 -#define BVME_IRQ_SCCB_SPCOND 0x46 -#define BVME_IRQ_SCCA_TX 0x48 -#define BVME_IRQ_SCCA_STAT 0x4a -#define BVME_IRQ_SCCA_RX 0x4c -#define BVME_IRQ_SCCA_SPCOND 0x4e +#define BVME_IRQ_SCC_BASE IRQ_USER +#define BVME_IRQ_SCCB_TX IRQ_USER +#define BVME_IRQ_SCCB_STAT (IRQ_USER+2) +#define BVME_IRQ_SCCB_RX (IRQ_USER+4) +#define BVME_IRQ_SCCB_SPCOND (IRQ_USER+6) +#define BVME_IRQ_SCCA_TX (IRQ_USER+8) +#define BVME_IRQ_SCCA_STAT (IRQ_USER+10) +#define BVME_IRQ_SCCA_RX (IRQ_USER+12) +#define BVME_IRQ_SCCA_SPCOND (IRQ_USER+14)/* Address control registers */
include/asm-m68k/mvme147hw.h +23 -21
68 lines not on this page · raw message
include/asm-m68k/mvme16xhw.h +20 -20
@@ -66,28 +66,28 @@ #define MVME_SCC_PCLK 10000000#define MVME162_IRQ_TYPE_PRIO 0 -#define MVME167_IRQ_PRN 0x54 -#define MVME16x_IRQ_I596 0x57 -#define MVME16x_IRQ_SCSI 0x55 -#define MVME16x_IRQ_FLY 0x7f -#define MVME167_IRQ_SER_ERR 0x5c -#define MVME167_IRQ_SER_MODEM 0x5d -#define MVME167_IRQ_SER_TX 0x5e -#define MVME167_IRQ_SER_RX 0x5f -#define MVME16x_IRQ_TIMER 0x59 -#define MVME167_IRQ_ABORT 0x6e -#define MVME162_IRQ_ABORT 0x5e +#define MVME167_IRQ_PRN (IRQ_USER+20) +#define MVME16x_IRQ_I596 (IRQ_USER+23) +#define MVME16x_IRQ_SCSI (IRQ_USER+21) +#define MVME16x_IRQ_FLY (IRQ_USER+63) +#define MVME167_IRQ_SER_ERR (IRQ_USER+28) +#define MVME167_IRQ_SER_MODEM (IRQ_USER+29) +#define MVME167_IRQ_SER_TX (IRQ_USER+30) +#define MVME167_IRQ_SER_RX (IRQ_USER+31) +#define MVME16x_IRQ_TIMER (IRQ_USER+25) +#define MVME167_IRQ_ABORT (IRQ_USER+46) +#define MVME162_IRQ_ABORT (IRQ_USER+30)/* SCC interrupts, for MVME162 */ -#define MVME162_IRQ_SCC_BASE 0x40 -#define MVME162_IRQ_SCCB_TX 0x40 -#define MVME162_IRQ_SCCB_STAT 0x42 -#define MVME162_IRQ_SCCB_RX 0x44 -#define MVME162_IRQ_SCCB_SPCOND 0x46 -#define MVME162_IRQ_SCCA_TX 0x48 -#define MVME162_IRQ_SCCA_STAT 0x4a -#define MVME162_IRQ_SCCA_RX 0x4c -#define MVME162_IRQ_SCCA_SPCOND 0x4e +#define MVME162_IRQ_SCC_BASE (IRQ_USER+0) +#define MVME162_IRQ_SCCB_TX (IRQ_USER+0) +#define MVME162_IRQ_SCCB_STAT (IRQ_USER+2) +#define MVME162_IRQ_SCCB_RX (IRQ_USER+4) +#define MVME162_IRQ_SCCB_SPCOND (IRQ_USER+6) +#define MVME162_IRQ_SCCA_TX (IRQ_USER+8) +#define MVME162_IRQ_SCCA_STAT (IRQ_USER+10) +#define MVME162_IRQ_SCCA_RX (IRQ_USER+12) +#define MVME162_IRQ_SCCA_SPCOND (IRQ_USER+14)/* MVME162 version register */
Signature · 3 lines
1.3.3 --