iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/airq: recognize directed interrupts

Browse Source 
Add an extra parameter for airq handlers to recognize
floating vs. directed interrupts.

Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott
2018-10-28 11:51:56 +01:00
committed by Martin Schwidefsky
parent 0a9fddfaa8
commit 30e63ef2ef
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/include/asm/airq.h
View File

@ -14,7 +14,7 @@
struct airq_struct { struct airq_struct {
struct hlist_node list; /* Handler queueing. */ struct hlist_node list; /* Handler queueing. */
void (*handler)(struct airq_struct *); /* Thin-interrupt handler */ void (*handler)(struct airq_struct *airq, bool floating);
u8 *lsi_ptr; /* Local-Summary-Indicator pointer */ u8 *lsi_ptr; /* Local-Summary-Indicator pointer */
u8 lsi_mask; /* Local-Summary-Indicator mask */ u8 lsi_mask; /* Local-Summary-Indicator mask */
u8 isc; /* Interrupt-subclass */ u8 isc; /* Interrupt-subclass */

2
arch/s390/kvm/interrupt.c
View File

@ -3194,7 +3194,7 @@ out:
} }
EXPORT_SYMBOL_GPL(kvm_s390_gisc_unregister); EXPORT_SYMBOL_GPL(kvm_s390_gisc_unregister);
static void gib_alert_irq_handler(struct airq_struct *airq) static void gib_alert_irq_handler(struct airq_struct *airq, bool floating)
{ {
inc_irq_stat(IRQIO_GAL); inc_irq_stat(IRQIO_GAL);
process_gib_alert_list(); process_gib_alert_list();

2
arch/s390/pci/pci_irq.c
View File

@ -56,7 +56,7 @@ static struct irq_chip zpci_irq_chip = {
.irq_mask = pci_msi_mask_irq, .irq_mask = pci_msi_mask_irq,
}; };
static void zpci_irq_handler(struct airq_struct *airq) static void zpci_irq_handler(struct airq_struct *airq, bool floating)
{ {
unsigned long si, ai; unsigned long si, ai;
struct airq_iv *aibv; struct airq_iv *aibv;

2
drivers/s390/cio/airq.c
View File

@ -95,7 +95,7 @@ static irqreturn_t do_airq_interrupt(int irq, void *dummy)
rcu_read_lock(); rcu_read_lock();
hlist_for_each_entry_rcu(airq, head, list) hlist_for_each_entry_rcu(airq, head, list)
if ((*airq->lsi_ptr & airq->lsi_mask) != 0) if ((*airq->lsi_ptr & airq->lsi_mask) != 0)
airq->handler(airq); airq->handler(airq, !tpi_info->directed_irq);
rcu_read_unlock(); rcu_read_unlock();
return IRQ_HANDLED; return IRQ_HANDLED;

2
drivers/s390/cio/cio.h
View File

@ -51,7 +51,7 @@ struct tpi_info {
struct subchannel_id schid; struct subchannel_id schid;
u32 intparm; u32 intparm;
u32 adapter_IO:1; u32 adapter_IO:1;
u32 :1; u32 directed_irq:1;
u32 isc:3; u32 isc:3;
u32 :27; u32 :27;
u32 type:3; u32 type:3;

4
drivers/s390/cio/qdio_thinint.c
View File

@ -40,7 +40,7 @@ static LIST_HEAD(tiq_list);
static DEFINE_MUTEX(tiq_list_lock); static DEFINE_MUTEX(tiq_list_lock);
/* Adapter interrupt definitions */ /* Adapter interrupt definitions */
static void tiqdio_thinint_handler(struct airq_struct *airq); static void tiqdio_thinint_handler(struct airq_struct *airq, bool floating);
static struct airq_struct tiqdio_airq = { static struct airq_struct tiqdio_airq = {
.handler = tiqdio_thinint_handler, .handler = tiqdio_thinint_handler,
@ -179,7 +179,7 @@ static inline void tiqdio_call_inq_handlers(struct qdio_irq *irq)
* tiqdio_thinint_handler - thin interrupt handler for qdio * tiqdio_thinint_handler - thin interrupt handler for qdio
* @airq: pointer to adapter interrupt descriptor * @airq: pointer to adapter interrupt descriptor
*/ */
static void tiqdio_thinint_handler(struct airq_struct *airq) static void tiqdio_thinint_handler(struct airq_struct *airq, bool floating)
{ {
u32 si_used = clear_shared_ind(); u32 si_used = clear_shared_ind();
struct qdio_q *q; struct qdio_q *q;

4
drivers/s390/crypto/ap_bus.c
View File

@ -116,7 +116,7 @@ static int user_set_domain;
static struct bus_type ap_bus_type; static struct bus_type ap_bus_type;
/* Adapter interrupt definitions */ /* Adapter interrupt definitions */
static void ap_interrupt_handler(struct airq_struct *airq); static void ap_interrupt_handler(struct airq_struct *airq, bool floating);
static int ap_airq_flag; static int ap_airq_flag;
@ -393,7 +393,7 @@ static enum hrtimer_restart ap_poll_timeout(struct hrtimer *unused)
* ap_interrupt_handler() - Schedule ap_tasklet on interrupt * ap_interrupt_handler() - Schedule ap_tasklet on interrupt
* @airq: pointer to adapter interrupt descriptor * @airq: pointer to adapter interrupt descriptor
*/ */
static void ap_interrupt_handler(struct airq_struct *airq) static void ap_interrupt_handler(struct airq_struct *airq, bool floating)
{ {
inc_irq_stat(IRQIO_APB); inc_irq_stat(IRQIO_APB);
if (!ap_suspend_flag) if (!ap_suspend_flag)

2
drivers/s390/virtio/virtio_ccw.c
View File

@ -182,7 +182,7 @@ static void drop_airq_indicator(struct virtqueue *vq, struct airq_info *info)
write_unlock_irqrestore(&info->lock, flags); write_unlock_irqrestore(&info->lock, flags);
} }
static void virtio_airq_handler(struct airq_struct *airq) static void virtio_airq_handler(struct airq_struct *airq, bool floating)
{ {
struct airq_info *info = container_of(airq, struct airq_info, airq); struct airq_info *info = container_of(airq, struct airq_info, airq);
unsigned long ai; unsigned long ai;