Commit d2197485 authored by Matthew Rosato's avatar Matthew Rosato Committed by Christian Borntraeger
Browse files

s390/airq: pass more TPI info to airq handlers 



A subsequent patch will introduce an airq handler that requires additional
TPI information beyond directed vs floating, so pass the entire tpi_info
structure via the handler.  Only pci actually uses this information today,
for the other airq handlers this is effectively a no-op.

Reviewed-by: default avatarEric Farman <farman@linux.ibm.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Link: https://lore.kernel.org/r/20220606203325.110625-6-mjrosato@linux.ibm.com


Signed-off-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
parent b05a870c

arch/s390/include/asm/airq.h

+2 −1
Original line number Diff line number Diff line
@@ -12,10 +12,11 @@ 


#include <linux/bit_spinlock.h>

#include <linux/dma-mapping.h>

#include <asm/tpi.h>



struct airq_struct {

	struct hlist_node list;		/* Handler queueing. */

	void (*handler)(struct airq_struct *airq, bool floating);

	void (*handler)(struct airq_struct *airq, struct tpi_info *tpi_info);

	u8 *lsi_ptr;			/* Local-Summary-Indicator pointer */

	u8 lsi_mask;			/* Local-Summary-Indicator mask */

	u8 isc;				/* Interrupt-subclass */

arch/s390/kvm/interrupt.c

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <asm/switch_to.h>

#include <asm/nmi.h>

#include <asm/airq.h>

#include <asm/tpi.h>

#include "kvm-s390.h"

#include "gaccess.h"

#include "trace-s390.h"
@@ -3311,7 +3312,8 @@ int kvm_s390_gisc_unregister(struct kvm *kvm, u32 gisc) 
}

EXPORT_SYMBOL_GPL(kvm_s390_gisc_unregister);



static void gib_alert_irq_handler(struct airq_struct *airq, bool floating)

static void gib_alert_irq_handler(struct airq_struct *airq,

				  struct tpi_info *tpi_info)

{

	inc_irq_stat(IRQIO_GAL);

	process_gib_alert_list();

arch/s390/pci/pci_irq.c

+7 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <asm/isc.h>

#include <asm/airq.h>

#include <asm/tpi.h>



static enum {FLOATING, DIRECTED} irq_delivery;
@@ -216,8 +217,11 @@ static void zpci_handle_fallback_irq(void) 
	}

}



static void zpci_directed_irq_handler(struct airq_struct *airq, bool floating)

static void zpci_directed_irq_handler(struct airq_struct *airq,

				      struct tpi_info *tpi_info)

{

	bool floating = !tpi_info->directed_irq;



	if (floating) {

		inc_irq_stat(IRQIO_PCF);

		zpci_handle_fallback_irq();
@@ -227,7 +231,8 @@ static void zpci_directed_irq_handler(struct airq_struct *airq, bool floating) 
	}

}



static void zpci_floating_irq_handler(struct airq_struct *airq, bool floating)

static void zpci_floating_irq_handler(struct airq_struct *airq,

				      struct tpi_info *tpi_info)

{

	unsigned long si, ai;

	struct airq_iv *aibv;

drivers/s390/cio/airq.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static irqreturn_t do_airq_interrupt(int irq, void *dummy) 
	rcu_read_lock();

	hlist_for_each_entry_rcu(airq, head, list)

		if ((*airq->lsi_ptr & airq->lsi_mask) != 0)

			airq->handler(airq, !tpi_info->directed_irq);

			airq->handler(airq, tpi_info);

	rcu_read_unlock();



	return IRQ_HANDLED;

drivers/s390/cio/qdio_thinint.c

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <asm/qdio.h>

#include <asm/airq.h>

#include <asm/isc.h>

#include <asm/tpi.h>



#include "cio.h"

#include "ioasm.h"
@@ -93,9 +94,10 @@ static inline u32 clear_shared_ind(void) 
/**

 * tiqdio_thinint_handler - thin interrupt handler for qdio

 * @airq: pointer to adapter interrupt descriptor

 * @floating: flag to recognize floating vs. directed interrupts (unused)

 * @tpi_info: interrupt information (e.g. floating vs directed -- unused)

 */

static void tiqdio_thinint_handler(struct airq_struct *airq, bool floating)

static void tiqdio_thinint_handler(struct airq_struct *airq,

				   struct tpi_info *tpi_info)

{

	u64 irq_time = S390_lowcore.int_clock;

	u32 si_used = clear_shared_ind();