Skip to content

Commit acf00b5

Browse files
Benjamin-Blockhcahca
authored andcommitted
s390/airq: remove lsi_mask from airq_struct
Remove the field `lsi_mask` from `struct airq_struct` as it is not utilized for any adapter interrupt, other than setting it to the default value of 0xff. Because nobody is using this functionality, all it does is cost a little bit of time with each delivered adapter interrupt. Reviewed-by: Michael Mueller <mimu@linux.ibm.com> Tested-by: Michael Mueller <mimu@linux.ibm.com> Acked-by: Peter Oberparleiter <oberpar@linux.ibm.com> Signed-off-by: Benjamin Block <bblock@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent a7eb288 commit acf00b5

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

arch/s390/include/asm/airq.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ struct airq_struct {
1818
struct hlist_node list; /* Handler queueing. */
1919
void (*handler)(struct airq_struct *airq, struct tpi_info *tpi_info);
2020
u8 *lsi_ptr; /* Local-Summary-Indicator pointer */
21-
u8 lsi_mask; /* Local-Summary-Indicator mask */
2221
u8 isc; /* Interrupt-subclass */
2322
u8 flags;
2423
};

arch/s390/kvm/interrupt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3398,7 +3398,6 @@ static void gib_alert_irq_handler(struct airq_struct *airq,
33983398

33993399
static struct airq_struct gib_alert_irq = {
34003400
.handler = gib_alert_irq_handler,
3401-
.lsi_ptr = &gib_alert_irq.lsi_mask,
34023401
};
34033402

34043403
void kvm_s390_gib_destroy(void)
@@ -3438,6 +3437,8 @@ int __init kvm_s390_gib_init(u8 nisc)
34383437
rc = -EIO;
34393438
goto out_free_gib;
34403439
}
3440+
/* adapter interrupts used for AP (applicable here) don't use the LSI */
3441+
*gib_alert_irq.lsi_ptr = 0xff;
34413442

34423443
gib->nisc = nisc;
34433444
gib_origin = virt_to_phys(gib);

drivers/s390/cio/airq.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ int register_adapter_interrupt(struct airq_struct *airq)
4949
return -ENOMEM;
5050
airq->flags |= AIRQ_PTR_ALLOCATED;
5151
}
52-
if (!airq->lsi_mask)
53-
airq->lsi_mask = 0xff;
5452
snprintf(dbf_txt, sizeof(dbf_txt), "rairq:%p", airq);
5553
CIO_TRACE_EVENT(4, dbf_txt);
5654
isc_register(airq->isc);
@@ -98,7 +96,7 @@ static irqreturn_t do_airq_interrupt(int irq, void *dummy)
9896
head = &airq_lists[tpi_info->isc];
9997
rcu_read_lock();
10098
hlist_for_each_entry_rcu(airq, head, list)
101-
if ((*airq->lsi_ptr & airq->lsi_mask) != 0)
99+
if (*airq->lsi_ptr != 0)
102100
airq->handler(airq, tpi_info);
103101
rcu_read_unlock();
104102

drivers/s390/virtio/virtio_ccw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ static struct airq_info *new_airq_info(int index)
250250
info->airq.handler = virtio_airq_handler;
251251
info->summary_indicator_idx = index;
252252
info->airq.lsi_ptr = get_summary_indicator(info);
253-
info->airq.lsi_mask = 0xff;
254253
info->airq.isc = VIRTIO_AIRQ_ISC;
255254
rc = register_adapter_interrupt(&info->airq);
256255
if (rc) {

0 commit comments

Comments
 (0)