Commit 4e8e56c6 authored by Peter Oberparleiter's avatar Peter Oberparleiter Committed by Martin Schwidefsky

[S390] cio: Extend adapter interrupt interface.

From: Cornelia Huck <cornelia.huck@de.ibm.com>

Change the adapter interrupt interface in order to allow multiple
adapter interrupt handlers to be registered. Indicators are now
allocated by cio instead of the device driver.

The qdio parts have been
Acked-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarPeter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent cd6b4f27
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
!Iinclude/asm-s390/ccwdev.h !Iinclude/asm-s390/ccwdev.h
!Edrivers/s390/cio/device.c !Edrivers/s390/cio/device.c
!Edrivers/s390/cio/device_ops.c !Edrivers/s390/cio/device_ops.c
!Edrivers/s390/cio/airq.c
</sect1> </sect1>
<sect1 id="cmf"> <sect1 id="cmf">
<title>The channel-measurement facility</title> <title>The channel-measurement facility</title>
......
/* /*
* drivers/s390/cio/airq.c * drivers/s390/cio/airq.c
* S/390 common I/O routines -- support for adapter interruptions * Support for adapter interruptions
* *
* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, * Copyright IBM Corp. 1999,2007
* IBM Corporation * Author(s): Ingo Adlung <adlung@de.ibm.com>
* Author(s): Ingo Adlung (adlung@de.ibm.com) * Cornelia Huck <cornelia.huck@de.ibm.com>
* Cornelia Huck (cornelia.huck@de.ibm.com) * Arnd Bergmann <arndb@de.ibm.com>
* Arnd Bergmann (arndb@de.ibm.com) * Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
*/ */
#include <linux/init.h> #include <linux/init.h>
...@@ -14,72 +14,131 @@ ...@@ -14,72 +14,131 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <asm/airq.h>
#include "cio.h"
#include "cio_debug.h" #include "cio_debug.h"
#include "airq.h"
static adapter_int_handler_t adapter_handler; #define NR_AIRQS 32
#define NR_AIRQS_PER_WORD sizeof(unsigned long)
#define NR_AIRQ_WORDS (NR_AIRQS / NR_AIRQS_PER_WORD)
/* union indicator_t {
* register for adapter interrupts unsigned long word[NR_AIRQ_WORDS];
* unsigned char byte[NR_AIRQS];
* With HiperSockets the zSeries architecture provides for } __attribute__((packed));
* means of adapter interrups, pseudo I/O interrupts that are
* not tied to an I/O subchannel, but to an adapter. However,
* it doesn't disclose the info how to enable/disable them, but
* to recognize them only. Perhaps we should consider them
* being shared interrupts, and thus build a linked list
* of adapter handlers ... to be evaluated ...
*/
int
s390_register_adapter_interrupt (adapter_int_handler_t handler)
{
int ret;
char dbf_txt[15];
CIO_TRACE_EVENT (4, "rgaint"); struct airq_t {
adapter_int_handler_t handler;
void *drv_data;
};
if (handler == NULL) static union indicator_t indicators;
ret = -EINVAL; static struct airq_t *airqs[NR_AIRQS];
else
ret = (cmpxchg(&adapter_handler, NULL, handler) ? -EBUSY : 0);
if (!ret)
synchronize_sched(); /* Allow interrupts to complete. */
sprintf (dbf_txt, "ret:%d", ret); static int register_airq(struct airq_t *airq)
CIO_TRACE_EVENT (4, dbf_txt); {
int i;
return ret; for (i = 0; i < NR_AIRQS; i++)
if (!cmpxchg(&airqs[i], NULL, airq))
return i;
return -ENOMEM;
} }
int /**
s390_unregister_adapter_interrupt (adapter_int_handler_t handler) * s390_register_adapter_interrupt() - register adapter interrupt handler
* @handler: adapter handler to be registered
* @drv_data: driver data passed with each call to the handler
*
* Returns:
* Pointer to the indicator to be used on success
* ERR_PTR() if registration failed
*/
void *s390_register_adapter_interrupt(adapter_int_handler_t handler,
void *drv_data)
{ {
struct airq_t *airq;
char dbf_txt[16];
int ret; int ret;
char dbf_txt[15];
CIO_TRACE_EVENT (4, "urgaint"); airq = kmalloc(sizeof(struct airq_t), GFP_KERNEL);
if (!airq) {
if (handler == NULL) ret = -ENOMEM;
ret = -EINVAL; goto out;
else {
adapter_handler = NULL;
synchronize_sched(); /* Allow interrupts to complete. */
ret = 0;
} }
sprintf (dbf_txt, "ret:%d", ret); airq->handler = handler;
CIO_TRACE_EVENT (4, dbf_txt); airq->drv_data = drv_data;
ret = register_airq(airq);
return ret; if (ret < 0)
kfree(airq);
out:
snprintf(dbf_txt, sizeof(dbf_txt), "rairq:%d", ret);
CIO_TRACE_EVENT(4, dbf_txt);
if (ret < 0)
return ERR_PTR(ret);
else
return &indicators.byte[ret];
} }
EXPORT_SYMBOL(s390_register_adapter_interrupt);
void /**
do_adapter_IO (void) * s390_unregister_adapter_interrupt - unregister adapter interrupt handler
* @ind: indicator for which the handler is to be unregistered
*/
void s390_unregister_adapter_interrupt(void *ind)
{ {
CIO_TRACE_EVENT (6, "doaio"); struct airq_t *airq;
char dbf_txt[16];
int i;
if (adapter_handler) i = (int) ((addr_t) ind) - ((addr_t) &indicators.byte[0]);
(*adapter_handler) (); snprintf(dbf_txt, sizeof(dbf_txt), "urairq:%d", i);
CIO_TRACE_EVENT(4, dbf_txt);
indicators.byte[i] = 0;
airq = xchg(&airqs[i], NULL);
/*
* Allow interrupts to complete. This will ensure that the airq handle
* is no longer referenced by any interrupt handler.
*/
synchronize_sched();
kfree(airq);
} }
EXPORT_SYMBOL(s390_unregister_adapter_interrupt);
EXPORT_SYMBOL (s390_register_adapter_interrupt); #define INDICATOR_MASK (0xffUL << ((NR_AIRQS_PER_WORD - 1) * 8))
EXPORT_SYMBOL (s390_unregister_adapter_interrupt);
void do_adapter_IO(void)
{
int w;
int i;
unsigned long word;
struct airq_t *airq;
/*
* Access indicator array in word-sized chunks to minimize storage
* fetch operations.
*/
for (w = 0; w < NR_AIRQ_WORDS; w++) {
word = indicators.word[w];
i = w * NR_AIRQS_PER_WORD;
/*
* Check bytes within word for active indicators.
*/
while (word) {
if (word & INDICATOR_MASK) {
airq = airqs[i];
if (likely(airq))
airq->handler(&indicators.byte[i],
airq->drv_data);
else
/*
* Reset ill-behaved indicator.
*/
indicators.byte[i] = 0;
}
word <<= 8;
i++;
}
}
}
#ifndef S390_AINTERRUPT_H
#define S390_AINTERRUPT_H
typedef int (*adapter_int_handler_t)(void);
extern int s390_register_adapter_interrupt(adapter_int_handler_t handler);
extern int s390_unregister_adapter_interrupt(adapter_int_handler_t handler);
extern void do_adapter_IO (void);
#endif
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <asm/reset.h> #include <asm/reset.h>
#include <asm/ipl.h> #include <asm/ipl.h>
#include <asm/chpid.h> #include <asm/chpid.h>
#include "airq.h" #include <asm/airq.h>
#include "cio.h" #include "cio.h"
#include "css.h" #include "css.h"
#include "chsc.h" #include "chsc.h"
......
...@@ -99,6 +99,7 @@ extern int cio_get_options (struct subchannel *); ...@@ -99,6 +99,7 @@ extern int cio_get_options (struct subchannel *);
extern int cio_modify (struct subchannel *); extern int cio_modify (struct subchannel *);
int cio_create_sch_lock(struct subchannel *); int cio_create_sch_lock(struct subchannel *);
void do_adapter_IO(void);
/* Use with care. */ /* Use with care. */
#ifdef CONFIG_CCW_CONSOLE #ifdef CONFIG_CCW_CONSOLE
......
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
#include <asm/debug.h> #include <asm/debug.h>
#include <asm/s390_rdev.h> #include <asm/s390_rdev.h>
#include <asm/qdio.h> #include <asm/qdio.h>
#include <asm/airq.h>
#include "cio.h" #include "cio.h"
#include "css.h" #include "css.h"
#include "device.h" #include "device.h"
#include "airq.h"
#include "qdio.h" #include "qdio.h"
#include "ioasm.h" #include "ioasm.h"
#include "chsc.h" #include "chsc.h"
...@@ -96,7 +96,7 @@ static debug_info_t *qdio_dbf_slsb_in; ...@@ -96,7 +96,7 @@ static debug_info_t *qdio_dbf_slsb_in;
static volatile struct qdio_q *tiq_list=NULL; /* volatile as it could change static volatile struct qdio_q *tiq_list=NULL; /* volatile as it could change
during a while loop */ during a while loop */
static DEFINE_SPINLOCK(ttiq_list_lock); static DEFINE_SPINLOCK(ttiq_list_lock);
static int register_thinint_result; static void *tiqdio_ind;
static void tiqdio_tl(unsigned long); static void tiqdio_tl(unsigned long);
static DECLARE_TASKLET(tiqdio_tasklet,tiqdio_tl,0); static DECLARE_TASKLET(tiqdio_tasklet,tiqdio_tl,0);
...@@ -399,7 +399,7 @@ qdio_get_indicator(void) ...@@ -399,7 +399,7 @@ qdio_get_indicator(void)
{ {
int i; int i;
for (i=1;i<INDICATORS_PER_CACHELINE;i++) for (i = 0; i < INDICATORS_PER_CACHELINE; i++)
if (!indicator_used[i]) { if (!indicator_used[i]) {
indicator_used[i]=1; indicator_used[i]=1;
return indicators+i; return indicators+i;
...@@ -1911,8 +1911,7 @@ qdio_fill_thresholds(struct qdio_irq *irq_ptr, ...@@ -1911,8 +1911,7 @@ qdio_fill_thresholds(struct qdio_irq *irq_ptr,
} }
} }
static int static void tiqdio_thinint_handler(void *ind, void *drv_data)
tiqdio_thinint_handler(void)
{ {
QDIO_DBF_TEXT4(0,trace,"thin_int"); QDIO_DBF_TEXT4(0,trace,"thin_int");
...@@ -1925,7 +1924,6 @@ tiqdio_thinint_handler(void) ...@@ -1925,7 +1924,6 @@ tiqdio_thinint_handler(void)
tiqdio_clear_global_summary(); tiqdio_clear_global_summary();
tiqdio_inbound_checks(); tiqdio_inbound_checks();
return 0;
} }
static void static void
...@@ -2445,7 +2443,7 @@ tiqdio_set_subchannel_ind(struct qdio_irq *irq_ptr, int reset_to_zero) ...@@ -2445,7 +2443,7 @@ tiqdio_set_subchannel_ind(struct qdio_irq *irq_ptr, int reset_to_zero)
real_addr_dev_st_chg_ind=0; real_addr_dev_st_chg_ind=0;
} else { } else {
real_addr_local_summary_bit= real_addr_local_summary_bit=
virt_to_phys((volatile void *)indicators); virt_to_phys((volatile void *)tiqdio_ind);
real_addr_dev_st_chg_ind= real_addr_dev_st_chg_ind=
virt_to_phys((volatile void *)irq_ptr->dev_st_chg_ind); virt_to_phys((volatile void *)irq_ptr->dev_st_chg_ind);
} }
...@@ -3740,23 +3738,25 @@ static void ...@@ -3740,23 +3738,25 @@ static void
tiqdio_register_thinints(void) tiqdio_register_thinints(void)
{ {
char dbf_text[20]; char dbf_text[20];
register_thinint_result=
s390_register_adapter_interrupt(&tiqdio_thinint_handler); tiqdio_ind =
if (register_thinint_result) { s390_register_adapter_interrupt(&tiqdio_thinint_handler, NULL);
sprintf(dbf_text,"regthn%x",(register_thinint_result&0xff)); if (IS_ERR(tiqdio_ind)) {
sprintf(dbf_text, "regthn%lx", PTR_ERR(tiqdio_ind));
QDIO_DBF_TEXT0(0,setup,dbf_text); QDIO_DBF_TEXT0(0,setup,dbf_text);
QDIO_PRINT_ERR("failed to register adapter handler " \ QDIO_PRINT_ERR("failed to register adapter handler " \
"(rc=%i).\nAdapter interrupts might " \ "(rc=%li).\nAdapter interrupts might " \
"not work. Continuing.\n", "not work. Continuing.\n",
register_thinint_result); PTR_ERR(tiqdio_ind));
tiqdio_ind = NULL;
} }
} }
static void static void
tiqdio_unregister_thinints(void) tiqdio_unregister_thinints(void)
{ {
if (!register_thinint_result) if (tiqdio_ind)
s390_unregister_adapter_interrupt(&tiqdio_thinint_handler); s390_unregister_adapter_interrupt(tiqdio_ind);
} }
static int static int
...@@ -3780,7 +3780,6 @@ qdio_release_qdio_memory(void) ...@@ -3780,7 +3780,6 @@ qdio_release_qdio_memory(void)
kfree(indicators); kfree(indicators);
} }
static void static void
qdio_unregister_dbf_views(void) qdio_unregister_dbf_views(void)
{ {
......
/*
* include/asm-s390/airq.h
*
* Copyright IBM Corp. 2002,2007
* Author(s): Ingo Adlung <adlung@de.ibm.com>
* Cornelia Huck <cornelia.huck@de.ibm.com>
* Arnd Bergmann <arndb@de.ibm.com>
* Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
*/
#ifndef _ASM_S390_AIRQ_H
#define _ASM_S390_AIRQ_H
typedef void (*adapter_int_handler_t)(void *, void *);
void *s390_register_adapter_interrupt(adapter_int_handler_t, void *);
void s390_unregister_adapter_interrupt(void *);
#endif /* _ASM_S390_AIRQ_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment