Commit b1b75091 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] extint: get rid of early code plus cleanup 



Get rid of register/unregister_early_external_interrupt() and clean up
the code while at it.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 98b79980

arch/s390/include/asm/s390_ext.h

+7 −22
Original line number Diff line number Diff line 
#ifndef _S390_EXTINT_H

#define _S390_EXTINT_H



/*

 *  include/asm-s390/s390_ext.h

 *

 *  S390 version

 *    Copyright IBM Corp. 1999,2007

 *    Author(s): Holger Smolinski (Holger.Smolinski@de.ibm.com),

 *               Martin Schwidefsky (schwidefsky@de.ibm.com)

 *    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);



typedef struct ext_int_info_t {

	struct ext_int_info_t *next;

	ext_int_handler_t handler;

	__u16 code;

} ext_int_info_t;



extern ext_int_info_t *ext_int_hash[];



int register_external_interrupt(__u16 code, ext_int_handler_t handler);

int register_early_external_interrupt(__u16 code, ext_int_handler_t handler,

				      ext_int_info_t *info);

int unregister_external_interrupt(__u16 code, ext_int_handler_t handler);

int unregister_early_external_interrupt(__u16 code, ext_int_handler_t handler,

					ext_int_info_t *info);



#endif
 
#endif /* _S390_EXTINT_H */

arch/s390/kernel/s390_ext.c

+44 −81
Original line number Diff line number Diff line 
/*

 *  arch/s390/kernel/s390_ext.c

 *

 *  S390 version

 *    Copyright (C) 1999,2000 IBM Deutschland Entwicklung GmbH, IBM Corporation

 *    Author(s): Holger Smolinski (Holger.Smolinski@de.ibm.com),

 *               Martin Schwidefsky (schwidefsky@de.ibm.com)

 *    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/slab.h>

#include <linux/ftrace.h>

#include <linux/errno.h>

#include <linux/kernel_stat.h>

#include <linux/interrupt.h>

#include <asm/cputime.h>

#include <asm/lowcore.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. 

 */

ext_int_info_t *ext_int_hash[256] = { NULL, };

static struct ext_int_info *ext_int_hash[256];



static inline int ext_hash(__u16 code)

{
@@ -36,11 +39,11 @@ static inline int ext_hash(__u16 code) 


int register_external_interrupt(__u16 code, ext_int_handler_t handler)

{

        ext_int_info_t *p;

	struct ext_int_info *p;

	int index;



	p = kmalloc(sizeof(ext_int_info_t), GFP_ATOMIC);

        if (p == NULL)

	p = kmalloc(sizeof(*p), GFP_ATOMIC);

	if (!p)

		return -ENOMEM;

	p->code = code;

	p->handler = handler;
@@ -49,76 +52,39 @@ int register_external_interrupt(__u16 code, ext_int_handler_t handler) 
	ext_int_hash[index] = p;

	return 0;

}



int register_early_external_interrupt(__u16 code, ext_int_handler_t handler,

				      ext_int_info_t *p)

{

        int index;



        if (p == NULL)

                return -EINVAL;

        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)

{

        ext_int_info_t *p, *q;

	struct ext_int_info *p, *q;

	int index;



	index = ext_hash(code);

	q = NULL;

	p = ext_int_hash[index];

        while (p != NULL) {

	while (p) {

		if (p->code == code && p->handler == handler)

			break;

		q = p;

		p = p->next;

	}

        if (p == NULL)

	if (!p)

		return -ENOENT;

        if (q != NULL)

	if (q)

		q->next = p->next;

	else

		ext_int_hash[index] = p->next;

	kfree(p);

	return 0;

}



int unregister_early_external_interrupt(__u16 code, ext_int_handler_t handler,

					ext_int_info_t *p)

{

	ext_int_info_t *q;

	int index;



	if (p == NULL || p->code != code || p->handler != handler)

		return -EINVAL;

	index = ext_hash(code);

	q = ext_int_hash[index];

	if (p != q) {

		while (q != NULL) {

			if (q->next == p)

				break;

			q = q->next;

		}

		if (q == NULL)

			return -ENOENT;

		q->next = p->next;

	} else

		ext_int_hash[index] = p->next;

	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;

        ext_int_info_t *p;

	struct ext_int_info *p;

	int index;



	code = (unsigned short) ext_int_code;
@@ -140,6 +106,3 @@ void __irq_entry do_extint(struct pt_regs *regs, unsigned int ext_int_code, 
	irq_exit();

	set_irq_regs(old_regs);

}
 


EXPORT_SYMBOL(register_external_interrupt);

EXPORT_SYMBOL(unregister_external_interrupt);