[S390] irq: merge irq.c and s390_ext.c
Merge irq.c and s390_ext.c into irq.c. That way all external interrupt related functions are together. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
parent
df7997ab1c
commit
d7b250e2a2
|
|
@ -2,6 +2,7 @@
|
|||
#define _ASM_IRQ_H
|
||||
|
||||
#include <linux/hardirq.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
enum interruption_class {
|
||||
EXTERNAL_INTERRUPT,
|
||||
|
|
@ -31,4 +32,11 @@ enum interruption_class {
|
|||
NR_IRQS,
|
||||
};
|
||||
|
||||
typedef void (*ext_int_handler_t)(unsigned int, unsigned int, unsigned long);
|
||||
|
||||
int register_external_interrupt(u16 code, ext_int_handler_t handler);
|
||||
int unregister_external_interrupt(u16 code, ext_int_handler_t handler);
|
||||
void service_subclass_irq_register(void);
|
||||
void service_subclass_irq_unregister(void);
|
||||
|
||||
#endif /* _ASM_IRQ_H */
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
/*
|
||||
* Copyright IBM Corp. 1999,2010
|
||||
* Author(s): Holger Smolinski <Holger.Smolinski@de.ibm.com>,
|
||||
* Martin Schwidefsky <schwidefsky@de.ibm.com>,
|
||||
*/
|
||||
|
||||
#ifndef _S390_EXTINT_H
|
||||
#define _S390_EXTINT_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
typedef void (*ext_int_handler_t)(unsigned int, unsigned int, unsigned long);
|
||||
|
||||
int register_external_interrupt(__u16 code, ext_int_handler_t handler);
|
||||
int unregister_external_interrupt(__u16 code, ext_int_handler_t handler);
|
||||
void service_subclass_irq_register(void);
|
||||
void service_subclass_irq_unregister(void);
|
||||
|
||||
#endif /* _S390_EXTINT_H */
|
||||
|
|
@ -20,10 +20,10 @@ CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'
|
|||
|
||||
CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
|
||||
|
||||
obj-y := bitmap.o traps.o time.o process.o base.o early.o setup.o \
|
||||
processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
|
||||
s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o \
|
||||
vdso.o vtime.o sysinfo.o nmi.o sclp.o jump_label.o
|
||||
obj-y := bitmap.o traps.o time.o process.o base.o early.o setup.o vtime.o \
|
||||
processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o \
|
||||
debug.o irq.o ipl.o dis.o diag.o mem_detect.o sclp.o vdso.o \
|
||||
sysinfo.o jump_label.o
|
||||
|
||||
obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o)
|
||||
obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@
|
|||
#include <asm/atomic.h>
|
||||
#include <asm/mathemu.h>
|
||||
#include <asm/cpcmd.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/lowcore.h>
|
||||
#include <asm/debug.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
#ifndef CONFIG_64BIT
|
||||
#define ONELONG "%08lx: "
|
||||
|
|
|
|||
|
|
@ -1,19 +1,28 @@
|
|||
/*
|
||||
* Copyright IBM Corp. 2004,2010
|
||||
* Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
|
||||
* Thomas Spatzier (tspat@de.ibm.com)
|
||||
* Copyright IBM Corp. 2004,2011
|
||||
* Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
|
||||
* Holger Smolinski <Holger.Smolinski@de.ibm.com>,
|
||||
* Thomas Spatzier <tspat@de.ibm.com>,
|
||||
*
|
||||
* This file contains interrupt related functions.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/kernel_stat.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/cpu.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/profile.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/ftrace.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/cpu.h>
|
||||
#include <asm/irq_regs.h>
|
||||
#include <asm/cputime.h>
|
||||
#include <asm/lowcore.h>
|
||||
#include <asm/irq.h>
|
||||
#include "entry.h"
|
||||
|
||||
struct irq_class {
|
||||
char *name;
|
||||
|
|
@ -82,8 +91,7 @@ int show_interrupts(struct seq_file *p, void *v)
|
|||
* For compatibilty only. S/390 specific setup of interrupts et al. is done
|
||||
* much later in init_channel_subsystem().
|
||||
*/
|
||||
void __init
|
||||
init_IRQ(void)
|
||||
void __init init_IRQ(void)
|
||||
{
|
||||
/* nothing... */
|
||||
}
|
||||
|
|
@ -134,3 +142,116 @@ void init_irq_proc(void)
|
|||
create_prof_cpu_mask(root_irq_dir);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* ext_int_hash[index] is the start of the list for all external interrupts
|
||||
* that hash to this index. With the current set of external interrupts
|
||||
* (0x1202 external call, 0x1004 cpu timer, 0x2401 hwc console, 0x4000
|
||||
* iucv and 0x2603 pfault) this is always the first element.
|
||||
*/
|
||||
|
||||
struct ext_int_info {
|
||||
struct ext_int_info *next;
|
||||
ext_int_handler_t handler;
|
||||
u16 code;
|
||||
};
|
||||
|
||||
static struct ext_int_info *ext_int_hash[256];
|
||||
|
||||
static inline int ext_hash(u16 code)
|
||||
{
|
||||
return (code + (code >> 9)) & 0xff;
|
||||
}
|
||||
|
||||
int register_external_interrupt(u16 code, ext_int_handler_t handler)
|
||||
{
|
||||
struct ext_int_info *p;
|
||||
int index;
|
||||
|
||||
p = kmalloc(sizeof(*p), GFP_ATOMIC);
|
||||
if (!p)
|
||||
return -ENOMEM;
|
||||
p->code = code;
|
||||
p->handler = handler;
|
||||
index = ext_hash(code);
|
||||
p->next = ext_int_hash[index];
|
||||
ext_int_hash[index] = p;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(register_external_interrupt);
|
||||
|
||||
int unregister_external_interrupt(u16 code, ext_int_handler_t handler)
|
||||
{
|
||||
struct ext_int_info *p, *q;
|
||||
int index;
|
||||
|
||||
index = ext_hash(code);
|
||||
q = NULL;
|
||||
p = ext_int_hash[index];
|
||||
while (p) {
|
||||
if (p->code == code && p->handler == handler)
|
||||
break;
|
||||
q = p;
|
||||
p = p->next;
|
||||
}
|
||||
if (!p)
|
||||
return -ENOENT;
|
||||
if (q)
|
||||
q->next = p->next;
|
||||
else
|
||||
ext_int_hash[index] = p->next;
|
||||
kfree(p);
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(unregister_external_interrupt);
|
||||
|
||||
void __irq_entry do_extint(struct pt_regs *regs, unsigned int ext_int_code,
|
||||
unsigned int param32, unsigned long param64)
|
||||
{
|
||||
struct pt_regs *old_regs;
|
||||
unsigned short code;
|
||||
struct ext_int_info *p;
|
||||
int index;
|
||||
|
||||
code = (unsigned short) ext_int_code;
|
||||
old_regs = set_irq_regs(regs);
|
||||
s390_idle_check(regs, S390_lowcore.int_clock,
|
||||
S390_lowcore.async_enter_timer);
|
||||
irq_enter();
|
||||
if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator)
|
||||
/* Serve timer interrupts first. */
|
||||
clock_comparator_work();
|
||||
kstat_cpu(smp_processor_id()).irqs[EXTERNAL_INTERRUPT]++;
|
||||
if (code != 0x1004)
|
||||
__get_cpu_var(s390_idle).nohz_delay = 1;
|
||||
index = ext_hash(code);
|
||||
for (p = ext_int_hash[index]; p; p = p->next) {
|
||||
if (likely(p->code == code))
|
||||
p->handler(ext_int_code, param32, param64);
|
||||
}
|
||||
irq_exit();
|
||||
set_irq_regs(old_regs);
|
||||
}
|
||||
|
||||
static DEFINE_SPINLOCK(sc_irq_lock);
|
||||
static int sc_irq_refcount;
|
||||
|
||||
void service_subclass_irq_register(void)
|
||||
{
|
||||
spin_lock(&sc_irq_lock);
|
||||
if (!sc_irq_refcount)
|
||||
ctl_set_bit(0, 9);
|
||||
sc_irq_refcount++;
|
||||
spin_unlock(&sc_irq_lock);
|
||||
}
|
||||
EXPORT_SYMBOL(service_subclass_irq_register);
|
||||
|
||||
void service_subclass_irq_unregister(void)
|
||||
{
|
||||
spin_lock(&sc_irq_lock);
|
||||
sc_irq_refcount--;
|
||||
if (!sc_irq_refcount)
|
||||
ctl_clear_bit(0, 9);
|
||||
spin_unlock(&sc_irq_lock);
|
||||
}
|
||||
EXPORT_SYMBOL(service_subclass_irq_unregister);
|
||||
|
|
|
|||
|
|
@ -1,131 +0,0 @@
|
|||
/*
|
||||
* Copyright IBM Corp. 1999,2010
|
||||
* Author(s): Holger Smolinski <Holger.Smolinski@de.ibm.com>,
|
||||
* Martin Schwidefsky <schwidefsky@de.ibm.com>,
|
||||
*/
|
||||
|
||||
#include <linux/kernel_stat.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/ftrace.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/slab.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/irq_regs.h>
|
||||
#include <asm/cputime.h>
|
||||
#include <asm/lowcore.h>
|
||||
#include <asm/irq.h>
|
||||
#include "entry.h"
|
||||
|
||||
struct ext_int_info {
|
||||
struct ext_int_info *next;
|
||||
ext_int_handler_t handler;
|
||||
__u16 code;
|
||||
};
|
||||
|
||||
/*
|
||||
* ext_int_hash[index] is the start of the list for all external interrupts
|
||||
* that hash to this index. With the current set of external interrupts
|
||||
* (0x1202 external call, 0x1004 cpu timer, 0x2401 hwc console, 0x4000
|
||||
* iucv and 0x2603 pfault) this is always the first element.
|
||||
*/
|
||||
static struct ext_int_info *ext_int_hash[256];
|
||||
|
||||
static inline int ext_hash(__u16 code)
|
||||
{
|
||||
return (code + (code >> 9)) & 0xff;
|
||||
}
|
||||
|
||||
int register_external_interrupt(__u16 code, ext_int_handler_t handler)
|
||||
{
|
||||
struct ext_int_info *p;
|
||||
int index;
|
||||
|
||||
p = kmalloc(sizeof(*p), GFP_ATOMIC);
|
||||
if (!p)
|
||||
return -ENOMEM;
|
||||
p->code = code;
|
||||
p->handler = handler;
|
||||
index = ext_hash(code);
|
||||
p->next = ext_int_hash[index];
|
||||
ext_int_hash[index] = p;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(register_external_interrupt);
|
||||
|
||||
int unregister_external_interrupt(__u16 code, ext_int_handler_t handler)
|
||||
{
|
||||
struct ext_int_info *p, *q;
|
||||
int index;
|
||||
|
||||
index = ext_hash(code);
|
||||
q = NULL;
|
||||
p = ext_int_hash[index];
|
||||
while (p) {
|
||||
if (p->code == code && p->handler == handler)
|
||||
break;
|
||||
q = p;
|
||||
p = p->next;
|
||||
}
|
||||
if (!p)
|
||||
return -ENOENT;
|
||||
if (q)
|
||||
q->next = p->next;
|
||||
else
|
||||
ext_int_hash[index] = p->next;
|
||||
kfree(p);
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(unregister_external_interrupt);
|
||||
|
||||
void __irq_entry do_extint(struct pt_regs *regs, unsigned int ext_int_code,
|
||||
unsigned int param32, unsigned long param64)
|
||||
{
|
||||
struct pt_regs *old_regs;
|
||||
unsigned short code;
|
||||
struct ext_int_info *p;
|
||||
int index;
|
||||
|
||||
code = (unsigned short) ext_int_code;
|
||||
old_regs = set_irq_regs(regs);
|
||||
s390_idle_check(regs, S390_lowcore.int_clock,
|
||||
S390_lowcore.async_enter_timer);
|
||||
irq_enter();
|
||||
if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator)
|
||||
/* Serve timer interrupts first. */
|
||||
clock_comparator_work();
|
||||
kstat_cpu(smp_processor_id()).irqs[EXTERNAL_INTERRUPT]++;
|
||||
if (code != 0x1004)
|
||||
__get_cpu_var(s390_idle).nohz_delay = 1;
|
||||
index = ext_hash(code);
|
||||
for (p = ext_int_hash[index]; p; p = p->next) {
|
||||
if (likely(p->code == code))
|
||||
p->handler(ext_int_code, param32, param64);
|
||||
}
|
||||
irq_exit();
|
||||
set_irq_regs(old_regs);
|
||||
}
|
||||
|
||||
static DEFINE_SPINLOCK(sc_irq_lock);
|
||||
static int sc_irq_refcount;
|
||||
|
||||
void service_subclass_irq_register(void)
|
||||
{
|
||||
spin_lock(&sc_irq_lock);
|
||||
if (!sc_irq_refcount)
|
||||
ctl_set_bit(0, 9);
|
||||
sc_irq_refcount++;
|
||||
spin_unlock(&sc_irq_lock);
|
||||
}
|
||||
EXPORT_SYMBOL(service_subclass_irq_register);
|
||||
|
||||
void service_subclass_irq_unregister(void)
|
||||
{
|
||||
spin_lock(&sc_irq_lock);
|
||||
sc_irq_refcount--;
|
||||
if (!sc_irq_refcount)
|
||||
ctl_clear_bit(0, 9);
|
||||
spin_unlock(&sc_irq_lock);
|
||||
}
|
||||
EXPORT_SYMBOL(service_subclass_irq_unregister);
|
||||
|
|
@ -44,7 +44,6 @@
|
|||
#include <asm/sigp.h>
|
||||
#include <asm/pgalloc.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/cpcmd.h>
|
||||
#include <asm/tlbflush.h>
|
||||
#include <asm/timer.h>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
#include <linux/kprobes.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/delay.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/div64.h>
|
||||
#include <asm/vdso.h>
|
||||
#include <asm/irq.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#include <linux/smp.h>
|
||||
#include <linux/cpuset.h>
|
||||
#include <asm/delay.h>
|
||||
#include <asm/s390_ext.h>
|
||||
|
||||
#define PTF_HORIZONTAL (0UL)
|
||||
#define PTF_VERTICAL (1UL)
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
#include <asm/atomic.h>
|
||||
#include <asm/mathemu.h>
|
||||
#include <asm/cpcmd.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/lowcore.h>
|
||||
#include <asm/debug.h>
|
||||
#include "entry.h"
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@
|
|||
#include <linux/cpu.h>
|
||||
#include <linux/kprobes.h>
|
||||
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/timer.h>
|
||||
#include <asm/irq_regs.h>
|
||||
#include <asm/cputime.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
static DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer);
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include <asm/asm-offsets.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/mmu_context.h>
|
||||
#include <asm/compat.h>
|
||||
#include "../kernel/entry.h"
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <linux/oprofile.h>
|
||||
|
||||
#include <asm/lowcore.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
#include "hwsampler.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <asm/debug.h>
|
||||
#include <asm/ebcdic.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/vtoc.h>
|
||||
#include <asm/diag.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
#include <linux/suspend.h>
|
||||
#include <linux/completion.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
#include <asm/kvm_para.h>
|
||||
#include <asm/kvm_virtio.h>
|
||||
#include <asm/setup.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/irq.h>
|
||||
|
||||
#define VIRTIO_SUBCODE_64 0x0D00
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
#include <asm/atomic.h>
|
||||
#include <asm/ebcdic.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/s390_ext.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/smp.h>
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue