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:17 +0200
commitf20c7e2144e847f881c1f0d7bb440cd2909693ab (patch)
tree5d13a7023747910457aaf6e839a5ae6db13d01fe
parent0152b137c9f18b6dc412737b52983753c7651ce9 (diff)
s390/pci: move everything irq related to pci_irq.c (jsc#SLE-5789
FATE#327042 bsc#1134730 LTC#173388).
-rw-r--r--patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c535
-rw-r--r--series.conf1
2 files changed, 536 insertions, 0 deletions
diff --git a/patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c b/patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c
new file mode 100644
index 0000000000..e5f70bc23b
--- /dev/null
+++ b/patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c
@@ -0,0 +1,535 @@
+From: Sebastian Ott <sebott@linux.ibm.com>
+Date: Tue, 12 Feb 2019 18:39:46 +0100
+Subject: s390/pci: move everything irq related to pci_irq.c
+Git-commit: c840927cf5f24d080236775e4c3a934e778069f5
+Patch-mainline: v5.2-rc1
+References: jsc#SLE-5789 FATE#327042 bsc#1134730 LTC#173388
+
+Move everything interrupt related from pci.c to pci_irq.c.
+No functional change.
+
+Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/s390/include/asm/pci.h | 6 +
+ arch/s390/pci/Makefile | 2
+ arch/s390/pci/pci.c | 216 ------------------------------------------
+ arch/s390/pci/pci_irq.c | 222 ++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 229 insertions(+), 217 deletions(-)
+
+--- a/arch/s390/include/asm/pci.h
++++ b/arch/s390/include/asm/pci.h
+@@ -26,6 +26,9 @@ int pci_proc_domain(struct pci_bus *);
+ #define ZPCI_BUS_NR 0 /* default bus number */
+ #define ZPCI_DEVFN 0 /* default device number */
+
++#define ZPCI_NR_DMA_SPACES 1
++#define ZPCI_NR_DEVICES CONFIG_PCI_NR_FUNCTIONS
++
+ /* PCI Function Controls */
+ #define ZPCI_FC_FN_ENABLED 0x80
+ #define ZPCI_FC_ERROR 0x40
+@@ -209,6 +212,9 @@ struct zpci_dev *get_zdev_by_fid(u32);
+ int zpci_dma_init(void);
+ void zpci_dma_exit(void);
+
++int __init zpci_irq_init(void);
++void __init zpci_irq_exit(void);
++
+ /* FMB */
+ int zpci_fmb_enable_device(struct zpci_dev *);
+ int zpci_fmb_disable_device(struct zpci_dev *);
+--- a/arch/s390/pci/Makefile
++++ b/arch/s390/pci/Makefile
+@@ -2,5 +2,5 @@
+ # Makefile for the s390 PCI subsystem.
+ #
+
+-obj-$(CONFIG_PCI) += pci.o pci_dma.o pci_clp.o pci_sysfs.o \
++obj-$(CONFIG_PCI) += pci.o pci_irq.o pci_dma.o pci_clp.o pci_sysfs.o \
+ pci_event.o pci_debug.o pci_insn.o pci_mmio.o
+--- a/arch/s390/pci/pci.c
++++ b/arch/s390/pci/pci.c
+@@ -23,8 +23,6 @@
+ #include <linux/err.h>
+ #include <linux/export.h>
+ #include <linux/delay.h>
+-#include <linux/irq.h>
+-#include <linux/kernel_stat.h>
+ #include <linux/seq_file.h>
+ #include <linux/pci.h>
+ #include <linux/msi.h>
+@@ -36,28 +33,13 @@
+ #include <asm/pci_clp.h>
+ #include <asm/pci_dma.h>
+
+-#define SIC_IRQ_MODE_ALL 0
+-#define SIC_IRQ_MODE_SINGLE 1
+-
+-#define ZPCI_NR_DMA_SPACES 1
+-#define ZPCI_NR_DEVICES CONFIG_PCI_NR_FUNCTIONS
+-
+ /* list of all detected zpci devices */
+ static LIST_HEAD(zpci_list);
+ static DEFINE_SPINLOCK(zpci_list_lock);
+
+-static struct irq_chip zpci_irq_chip = {
+- .name = "zPCI",
+- .irq_unmask = pci_msi_unmask_irq,
+- .irq_mask = pci_msi_mask_irq,
+-};
+-
+ static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);
+ static DEFINE_SPINLOCK(zpci_domain_lock);
+
+-static struct airq_iv *zpci_aisb_iv;
+-static struct airq_iv *zpci_aibv[ZPCI_NR_DEVICES];
+-
+ #define ZPCI_IOMAP_ENTRIES \
+ min(((unsigned long) ZPCI_NR_DEVICES * PCI_BAR_COUNT / 2), \
+ ZPCI_IOMAP_MAX_ENTRIES)
+@@ -120,39 +102,6 @@ int pci_proc_domain(struct pci_bus *bus)
+ }
+ EXPORT_SYMBOL_GPL(pci_proc_domain);
+
+-/* Modify PCI: Register adapter interruptions */
+-static int zpci_set_airq(struct zpci_dev *zdev)
+-{
+- u64 req = ZPCI_CREATE_REQ(zdev->fh, 0, ZPCI_MOD_FC_REG_INT);
+- struct zpci_fib fib = {0};
+- u8 status;
+-
+- fib.isc = PCI_ISC;
+- fib.sum = 1; /* enable summary notifications */
+- fib.noi = airq_iv_end(zdev->aibv);
+- fib.aibv = (unsigned long) zdev->aibv->vector;
+- fib.aibvo = 0; /* each zdev has its own interrupt vector */
+- fib.aisb = (unsigned long) zpci_aisb_iv->vector + (zdev->aisb/64)*8;
+- fib.aisbo = zdev->aisb & 63;
+-
+- return zpci_mod_fc(req, &fib, &status) ? -EIO : 0;
+-}
+-
+-/* Modify PCI: Unregister adapter interruptions */
+-static int zpci_clear_airq(struct zpci_dev *zdev)
+-{
+- u64 req = ZPCI_CREATE_REQ(zdev->fh, 0, ZPCI_MOD_FC_DEREG_INT);
+- struct zpci_fib fib = {0};
+- u8 cc, status;
+-
+- cc = zpci_mod_fc(req, &fib, &status);
+- if (cc == 3 || (cc == 1 && status == 24))
+- /* Function already gone or IRQs already deregistered. */
+- cc = 0;
+-
+- return cc ? -EIO : 0;
+-}
+-
+ /* Modify PCI: Register I/O address translation parameters */
+ int zpci_register_ioat(struct zpci_dev *zdev, u8 dmaas,
+ u64 base, u64 limit, u64 iota)
+@@ -355,136 +304,6 @@ static struct pci_ops pci_root_ops = {
+ .write = pci_write,
+ };
+
+-static void zpci_irq_handler(struct airq_struct *airq)
+-{
+- unsigned long si, ai;
+- struct airq_iv *aibv;
+- int irqs_on = 0;
+-
+- inc_irq_stat(IRQIO_PCI);
+- for (si = 0;;) {
+- /* Scan adapter summary indicator bit vector */
+- si = airq_iv_scan(zpci_aisb_iv, si, airq_iv_end(zpci_aisb_iv));
+- if (si == -1UL) {
+- if (irqs_on++)
+- /* End of second scan with interrupts on. */
+- break;
+- /* First scan complete, reenable interrupts. */
+- if (zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC))
+- break;
+- si = 0;
+- continue;
+- }
+-
+- /* Scan the adapter interrupt vector for this device. */
+- aibv = zpci_aibv[si];
+- for (ai = 0;;) {
+- ai = airq_iv_scan(aibv, ai, airq_iv_end(aibv));
+- if (ai == -1UL)
+- break;
+- inc_irq_stat(IRQIO_MSI);
+- airq_iv_lock(aibv, ai);
+- generic_handle_irq(airq_iv_get_data(aibv, ai));
+- airq_iv_unlock(aibv, ai);
+- }
+- }
+-}
+-
+-int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
+-{
+- struct zpci_dev *zdev = to_zpci(pdev);
+- unsigned int hwirq, msi_vecs;
+- unsigned long aisb;
+- struct msi_desc *msi;
+- struct msi_msg msg;
+- int rc, irq;
+-
+- zdev->aisb = -1UL;
+- if (type == PCI_CAP_ID_MSI && nvec > 1)
+- return 1;
+- msi_vecs = min_t(unsigned int, nvec, zdev->max_msi);
+-
+- /* Allocate adapter summary indicator bit */
+- aisb = airq_iv_alloc_bit(zpci_aisb_iv);
+- if (aisb == -1UL)
+- return -EIO;
+- zdev->aisb = aisb;
+-
+- /* Create adapter interrupt vector */
+- zdev->aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK);
+- if (!zdev->aibv)
+- return -ENOMEM;
+-
+- /* Wire up shortcut pointer */
+- zpci_aibv[aisb] = zdev->aibv;
+-
+- /* Request MSI interrupts */
+- hwirq = 0;
+- for_each_pci_msi_entry(msi, pdev) {
+- if (hwirq >= msi_vecs)
+- break;
+- irq = irq_alloc_desc(0); /* Alloc irq on node 0 */
+- if (irq < 0)
+- return -ENOMEM;
+- rc = irq_set_msi_desc(irq, msi);
+- if (rc)
+- return rc;
+- irq_set_chip_and_handler(irq, &zpci_irq_chip,
+- handle_simple_irq);
+- msg.data = hwirq;
+- msg.address_lo = zdev->msi_addr & 0xffffffff;
+- msg.address_hi = zdev->msi_addr >> 32;
+- pci_write_msi_msg(irq, &msg);
+- airq_iv_set_data(zdev->aibv, hwirq, irq);
+- hwirq++;
+- }
+-
+- /* Enable adapter interrupts */
+- rc = zpci_set_airq(zdev);
+- if (rc)
+- return rc;
+-
+- return (msi_vecs == nvec) ? 0 : msi_vecs;
+-}
+-
+-void arch_teardown_msi_irqs(struct pci_dev *pdev)
+-{
+- struct zpci_dev *zdev = to_zpci(pdev);
+- struct msi_desc *msi;
+- int rc;
+-
+- /* Disable adapter interrupts */
+- rc = zpci_clear_airq(zdev);
+- if (rc)
+- return;
+-
+- /* Release MSI interrupts */
+- for_each_pci_msi_entry(msi, pdev) {
+- if (!msi->irq)
+- continue;
+- if (msi->msi_attrib.is_msix)
+- __pci_msix_desc_mask_irq(msi, 1);
+- else
+- __pci_msi_desc_mask_irq(msi, 1, 1);
+- irq_set_msi_desc(msi->irq, NULL);
+- irq_free_desc(msi->irq);
+- msi->msg.address_lo = 0;
+- msi->msg.address_hi = 0;
+- msi->msg.data = 0;
+- msi->irq = 0;
+- }
+-
+- if (zdev->aisb != -1UL) {
+- zpci_aibv[zdev->aisb] = NULL;
+- airq_iv_free_bit(zpci_aisb_iv, zdev->aisb);
+- zdev->aisb = -1UL;
+- }
+- if (zdev->aibv) {
+- airq_iv_release(zdev->aibv);
+- zdev->aibv = NULL;
+- }
+-}
+-
+ static void zpci_map_resources(struct pci_dev *pdev)
+ {
+ resource_size_t len;
+@@ -514,41 +333,6 @@ static void zpci_unmap_resources(struct
+ }
+ }
+
+-static struct airq_struct zpci_airq = {
+- .handler = zpci_irq_handler,
+- .isc = PCI_ISC,
+-};
+-
+-static int __init zpci_irq_init(void)
+-{
+- int rc;
+-
+- rc = register_adapter_interrupt(&zpci_airq);
+- if (rc)
+- goto out;
+- /* Set summary to 1 to be called every time for the ISC. */
+- *zpci_airq.lsi_ptr = 1;
+-
+- rc = -ENOMEM;
+- zpci_aisb_iv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC);
+- if (!zpci_aisb_iv)
+- goto out_airq;
+-
+- zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
+- return 0;
+-
+-out_airq:
+- unregister_adapter_interrupt(&zpci_airq);
+-out:
+- return rc;
+-}
+-
+-static void zpci_irq_exit(void)
+-{
+- airq_iv_release(zpci_aisb_iv);
+- unregister_adapter_interrupt(&zpci_airq);
+-}
+-
+ static int zpci_alloc_iomap(struct zpci_dev *zdev)
+ {
+ unsigned long entry;
+--- /dev/null
++++ b/arch/s390/pci/pci_irq.c
+@@ -0,0 +1,222 @@
++// SPDX-License-Identifier: GPL-2.0
++#define KMSG_COMPONENT "zpci"
++#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
++
++#include <linux/kernel.h>
++#include <linux/irq.h>
++#include <linux/kernel_stat.h>
++#include <linux/pci.h>
++#include <linux/msi.h>
++
++#include <asm/isc.h>
++#include <asm/airq.h>
++
++#define SIC_IRQ_MODE_ALL 0
++#define SIC_IRQ_MODE_SINGLE 1
++
++static struct airq_iv *zpci_aisb_iv;
++static struct airq_iv *zpci_aibv[ZPCI_NR_DEVICES];
++
++/* Modify PCI: Register adapter interruptions */
++static int zpci_set_airq(struct zpci_dev *zdev)
++{
++ u64 req = ZPCI_CREATE_REQ(zdev->fh, 0, ZPCI_MOD_FC_REG_INT);
++ struct zpci_fib fib = {0};
++ u8 status;
++
++ fib.isc = PCI_ISC;
++ fib.sum = 1; /* enable summary notifications */
++ fib.noi = airq_iv_end(zdev->aibv);
++ fib.aibv = (unsigned long) zdev->aibv->vector;
++ fib.aibvo = 0; /* each zdev has its own interrupt vector */
++ fib.aisb = (unsigned long) zpci_aisb_iv->vector + (zdev->aisb/64)*8;
++ fib.aisbo = zdev->aisb & 63;
++
++ return zpci_mod_fc(req, &fib, &status) ? -EIO : 0;
++}
++
++/* Modify PCI: Unregister adapter interruptions */
++static int zpci_clear_airq(struct zpci_dev *zdev)
++{
++ u64 req = ZPCI_CREATE_REQ(zdev->fh, 0, ZPCI_MOD_FC_DEREG_INT);
++ struct zpci_fib fib = {0};
++ u8 cc, status;
++
++ cc = zpci_mod_fc(req, &fib, &status);
++ if (cc == 3 || (cc == 1 && status == 24))
++ /* Function already gone or IRQs already deregistered. */
++ cc = 0;
++
++ return cc ? -EIO : 0;
++}
++
++static struct irq_chip zpci_irq_chip = {
++ .name = "zPCI",
++ .irq_unmask = pci_msi_unmask_irq,
++ .irq_mask = pci_msi_mask_irq,
++};
++
++static void zpci_irq_handler(struct airq_struct *airq)
++{
++ unsigned long si, ai;
++ struct airq_iv *aibv;
++ int irqs_on = 0;
++
++ inc_irq_stat(IRQIO_PCI);
++ for (si = 0;;) {
++ /* Scan adapter summary indicator bit vector */
++ si = airq_iv_scan(zpci_aisb_iv, si, airq_iv_end(zpci_aisb_iv));
++ if (si == -1UL) {
++ if (irqs_on++)
++ /* End of second scan with interrupts on. */
++ break;
++ /* First scan complete, reenable interrupts. */
++ if (zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC))
++ break;
++ si = 0;
++ continue;
++ }
++
++ /* Scan the adapter interrupt vector for this device. */
++ aibv = zpci_aibv[si];
++ for (ai = 0;;) {
++ ai = airq_iv_scan(aibv, ai, airq_iv_end(aibv));
++ if (ai == -1UL)
++ break;
++ inc_irq_stat(IRQIO_MSI);
++ airq_iv_lock(aibv, ai);
++ generic_handle_irq(airq_iv_get_data(aibv, ai));
++ airq_iv_unlock(aibv, ai);
++ }
++ }
++}
++
++int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
++{
++ struct zpci_dev *zdev = to_zpci(pdev);
++ unsigned int hwirq, msi_vecs;
++ unsigned long aisb;
++ struct msi_desc *msi;
++ struct msi_msg msg;
++ int rc, irq;
++
++ zdev->aisb = -1UL;
++ if (type == PCI_CAP_ID_MSI && nvec > 1)
++ return 1;
++ msi_vecs = min_t(unsigned int, nvec, zdev->max_msi);
++
++ /* Allocate adapter summary indicator bit */
++ aisb = airq_iv_alloc_bit(zpci_aisb_iv);
++ if (aisb == -1UL)
++ return -EIO;
++ zdev->aisb = aisb;
++
++ /* Create adapter interrupt vector */
++ zdev->aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK);
++ if (!zdev->aibv)
++ return -ENOMEM;
++
++ /* Wire up shortcut pointer */
++ zpci_aibv[aisb] = zdev->aibv;
++
++ /* Request MSI interrupts */
++ hwirq = 0;
++ for_each_pci_msi_entry(msi, pdev) {
++ if (hwirq >= msi_vecs)
++ break;
++ irq = irq_alloc_desc(0); /* Alloc irq on node 0 */
++ if (irq < 0)
++ return -ENOMEM;
++ rc = irq_set_msi_desc(irq, msi);
++ if (rc)
++ return rc;
++ irq_set_chip_and_handler(irq, &zpci_irq_chip,
++ handle_simple_irq);
++ msg.data = hwirq;
++ msg.address_lo = zdev->msi_addr & 0xffffffff;
++ msg.address_hi = zdev->msi_addr >> 32;
++ pci_write_msi_msg(irq, &msg);
++ airq_iv_set_data(zdev->aibv, hwirq, irq);
++ hwirq++;
++ }
++
++ /* Enable adapter interrupts */
++ rc = zpci_set_airq(zdev);
++ if (rc)
++ return rc;
++
++ return (msi_vecs == nvec) ? 0 : msi_vecs;
++}
++
++void arch_teardown_msi_irqs(struct pci_dev *pdev)
++{
++ struct zpci_dev *zdev = to_zpci(pdev);
++ struct msi_desc *msi;
++ int rc;
++
++ /* Disable adapter interrupts */
++ rc = zpci_clear_airq(zdev);
++ if (rc)
++ return;
++
++ /* Release MSI interrupts */
++ for_each_pci_msi_entry(msi, pdev) {
++ if (!msi->irq)
++ continue;
++ if (msi->msi_attrib.is_msix)
++ __pci_msix_desc_mask_irq(msi, 1);
++ else
++ __pci_msi_desc_mask_irq(msi, 1, 1);
++ irq_set_msi_desc(msi->irq, NULL);
++ irq_free_desc(msi->irq);
++ msi->msg.address_lo = 0;
++ msi->msg.address_hi = 0;
++ msi->msg.data = 0;
++ msi->irq = 0;
++ }
++
++ if (zdev->aisb != -1UL) {
++ zpci_aibv[zdev->aisb] = NULL;
++ airq_iv_free_bit(zpci_aisb_iv, zdev->aisb);
++ zdev->aisb = -1UL;
++ }
++ if (zdev->aibv) {
++ airq_iv_release(zdev->aibv);
++ zdev->aibv = NULL;
++ }
++}
++
++static struct airq_struct zpci_airq = {
++ .handler = zpci_irq_handler,
++ .isc = PCI_ISC,
++};
++
++int __init zpci_irq_init(void)
++{
++ int rc;
++
++ rc = register_adapter_interrupt(&zpci_airq);
++ if (rc)
++ goto out;
++ /* Set summary to 1 to be called every time for the ISC. */
++ *zpci_airq.lsi_ptr = 1;
++
++ rc = -ENOMEM;
++ zpci_aisb_iv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC);
++ if (!zpci_aisb_iv)
++ goto out_airq;
++
++ zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
++ return 0;
++
++out_airq:
++ unregister_adapter_interrupt(&zpci_airq);
++out:
++ return rc;
++}
++
++void __init zpci_irq_exit(void)
++{
++ airq_iv_release(zpci_aisb_iv);
++ unregister_adapter_interrupt(&zpci_airq);
++}
diff --git a/series.conf b/series.conf
index 5d4400e10c..eca230bb4f 100644
--- a/series.conf
+++ b/series.conf
@@ -46254,6 +46254,7 @@
patches.arch/x86-cpu-hygon-fix-phys_proc_id-calculation-logic-for-multi-die-processors.patch
patches.arch/s390-pci-mark-command-line-parser-data-_initdata
patches.arch/s390-pci-remove-unused-define
+ patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c
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