Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-06-07 12:44:54 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-06-14 17:58:30 +0200
commit16459102252ee0c6b7fbd69a1d8d4cf07fda4bd3 (patch)
treec27527d808537b4a65f92837a330c94f02654214
parent19adec4ff44a3614b59430e6791c0e1867970dc5 (diff)
s390/airq: recognize directed interrupts (jsc#SLE-5789
FATE#327042 bsc#1134730 LTC#173388).
-rw-r--r--patches.arch/s390-airq-recognize-directed-interrupts121
-rw-r--r--series.conf1
2 files changed, 122 insertions, 0 deletions
diff --git a/patches.arch/s390-airq-recognize-directed-interrupts b/patches.arch/s390-airq-recognize-directed-interrupts
new file mode 100644
index 0000000000..38a819649e
--- /dev/null
+++ b/patches.arch/s390-airq-recognize-directed-interrupts
@@ -0,0 +1,121 @@
+From: Sebastian Ott <sebott@linux.ibm.com>
+Date: Sun, 28 Oct 2018 11:51:56 +0100
+Subject: s390/airq: recognize directed interrupts
+Git-commit: 30e63ef2ef43f014bf2039bd57cc917780d6a44b
+Patch-mainline: v5.2-rc1
+References: jsc#SLE-5789 FATE#327042 bsc#1134730 LTC#173388
+
+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>
+[ ptesarik: Removed the hunk that patches gib_alert_irq_handler in
+ arch/s390/kvm/interrupt.c, because it depends on upstream commit
+ 9f30f62163786a0b80e0886046b5c66e714e7e71. ]
+Signed-off-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/s390/include/asm/airq.h | 2 +-
+ arch/s390/pci/pci_irq.c | 2 +-
+ drivers/s390/cio/airq.c | 2 +-
+ drivers/s390/cio/cio.h | 2 +-
+ drivers/s390/cio/qdio_thinint.c | 4 ++--
+ drivers/s390/crypto/ap_bus.c | 4 ++--
+ drivers/s390/virtio/virtio_ccw.c | 2 +-
+ 7 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/arch/s390/include/asm/airq.h
++++ b/arch/s390/include/asm/airq.h
+@@ -13,7 +13,7 @@
+
+ struct airq_struct {
+ 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_mask; /* Local-Summary-Indicator mask */
+ u8 isc; /* Interrupt-subclass */
+--- a/arch/s390/pci/pci_irq.c
++++ b/arch/s390/pci/pci_irq.c
+@@ -56,7 +56,7 @@ static struct irq_chip zpci_irq_chip = {
+ .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;
+ struct airq_iv *aibv;
+--- a/drivers/s390/cio/airq.c
++++ b/drivers/s390/cio/airq.c
+@@ -94,7 +94,7 @@ static irqreturn_t do_airq_interrupt(int
+ rcu_read_lock();
+ hlist_for_each_entry_rcu(airq, head, list)
+ if ((*airq->lsi_ptr & airq->lsi_mask) != 0)
+- airq->handler(airq);
++ airq->handler(airq, !tpi_info->directed_irq);
+ rcu_read_unlock();
+
+ return IRQ_HANDLED;
+--- a/drivers/s390/cio/cio.h
++++ b/drivers/s390/cio/cio.h
+@@ -50,7 +50,7 @@ struct tpi_info {
+ struct subchannel_id schid;
+ u32 intparm;
+ u32 adapter_IO:1;
+- u32 :1;
++ u32 directed_irq:1;
+ u32 isc:3;
+ u32 :27;
+ u32 type:3;
+--- a/drivers/s390/cio/qdio_thinint.c
++++ b/drivers/s390/cio/qdio_thinint.c
+@@ -39,7 +39,7 @@ static LIST_HEAD(tiq_list);
+ static DEFINE_MUTEX(tiq_list_lock);
+
+ /* 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 = {
+ .handler = tiqdio_thinint_handler,
+@@ -182,7 +182,7 @@ static inline void tiqdio_call_inq_handl
+ * tiqdio_thinint_handler - thin interrupt handler for qdio
+ * @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();
+ struct qdio_q *q;
+--- a/drivers/s390/crypto/ap_bus.c
++++ b/drivers/s390/crypto/ap_bus.c
+@@ -130,7 +130,7 @@ static int user_set_domain;
+ static struct bus_type ap_bus_type;
+
+ /* 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;
+
+@@ -407,7 +407,7 @@ static enum hrtimer_restart ap_poll_time
+ * ap_interrupt_handler() - Schedule ap_tasklet on interrupt
+ * @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);
+ if (!ap_suspend_flag)
+--- a/drivers/s390/virtio/virtio_ccw.c
++++ b/drivers/s390/virtio/virtio_ccw.c
+@@ -185,7 +185,7 @@ static void drop_airq_indicator(struct v
+ 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);
+ unsigned long ai;
diff --git a/series.conf b/series.conf
index 53dc91a9fd..b12922992a 100644
--- a/series.conf
+++ b/series.conf
@@ -46256,6 +46256,7 @@
patches.arch/s390-pci-remove-unused-define
patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c
patches.arch/s390-sclp-detect-dirq-facility
+ patches.arch/s390-airq-recognize-directed-interrupts
patches.fixes/ACPI-button-reinitialize-button-state-upon-resume.patch
patches.fixes/ACPI-property-restore-_DSD-data-subnodes-GUID-commen.patch
patches.fixes/ACPI-property-fix-handling-of-data_nodes-in-acpi_get.patch