Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-06-18 12:24:24 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-06-18 21:49:59 +0200
commit35042db17ef7ca829f8a8c0f9688a6b6908e0fba (patch)
treee0e000399538da63cce0fd53b3c262c0431743a1
parent8fd732197dacc3e9404ea4dc2d3160ed0d132861 (diff)
- s390/pci: map IOV resources (jsc#SLE-5803 FATE#327056).SLE15-SP1
- Refresh patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c. - Refresh patches.arch/s390-pci-provide-support-for-mio-instructions.
-rw-r--r--patches.arch/s390-pci-map-iov-resources53
-rw-r--r--patches.arch/s390-pci-move-everything-irq-related-to-pci_irq-c6
-rw-r--r--patches.arch/s390-pci-provide-support-for-mio-instructions2
-rw-r--r--series.conf1
4 files changed, 58 insertions, 4 deletions
diff --git a/patches.arch/s390-pci-map-iov-resources b/patches.arch/s390-pci-map-iov-resources
new file mode 100644
index 0000000000..ca0954b319
--- /dev/null
+++ b/patches.arch/s390-pci-map-iov-resources
@@ -0,0 +1,53 @@
+From: Sebastian Ott <sebott@linux.ibm.com>
+Date: Wed, 12 Sep 2018 12:47:37 +0200
+Subject: s390/pci: map IOV resources
+Git-commit: cfbb4a7ab6bd5df7aca826b92ebb3565efd3d801
+Patch-mainline: v5.1-rc1
+References: jsc#SLE-5803 FATE#327056
+
+Map IOV resources such that pci common code recognizes the IOV
+capability of PFs.
+
+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/pci/pci.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+--- a/arch/s390/pci/pci.c
++++ b/arch/s390/pci/pci.c
+@@ -487,6 +487,15 @@ void arch_teardown_msi_irqs(struct pci_d
+ }
+ }
+
++#ifdef CONFIG_PCI_IOV
++static struct resource iov_res = {
++ .name = "PCI IOV res",
++ .start = 0,
++ .end = -1,
++ .flags = IORESOURCE_MEM,
++};
++#endif
++
+ static void zpci_map_resources(struct pci_dev *pdev)
+ {
+ resource_size_t len;
+@@ -500,6 +509,17 @@ static void zpci_map_resources(struct pc
+ (resource_size_t __force) pci_iomap(pdev, i, 0);
+ pdev->resource[i].end = pdev->resource[i].start + len - 1;
+ }
++
++#ifdef CONFIG_PCI_IOV
++ i = PCI_IOV_RESOURCES;
++
++ for (; i < PCI_SRIOV_NUM_BARS + PCI_IOV_RESOURCES; i++) {
++ len = pci_resource_len(pdev, i);
++ if (!len)
++ continue;
++ pdev->resource[i].parent = &iov_res;
++ }
++#endif
+ }
+
+ static void zpci_unmap_resources(struct pci_dev *pdev)
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
index e5f70bc23b..e5d53bd030 100644
--- 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
@@ -263,9 +263,9 @@ Acked-by: Petr Tesarik <ptesarik@suse.com>
- }
-}
-
- static void zpci_map_resources(struct pci_dev *pdev)
- {
- resource_size_t len;
+ #ifdef CONFIG_PCI_IOV
+ static struct resource iov_res = {
+ .name = "PCI IOV res",
@@ -514,41 +333,6 @@ static void zpci_unmap_resources(struct
}
}
diff --git a/patches.arch/s390-pci-provide-support-for-mio-instructions b/patches.arch/s390-pci-provide-support-for-mio-instructions
index bc5bc31e7d..c2bae3c646 100644
--- a/patches.arch/s390-pci-provide-support-for-mio-instructions
+++ b/patches.arch/s390-pci-provide-support-for-mio-instructions
@@ -331,7 +331,7 @@ Acked-by: Petr Tesarik <ptesarik@suse.com>
+ (resource_size_t __force) pci_iomap(pdev, i, 0);
pdev->resource[i].end = pdev->resource[i].start + len - 1;
}
- }
+
@@ -325,6 +431,9 @@ static void zpci_unmap_resources(struct
resource_size_t len;
int i;
diff --git a/series.conf b/series.conf
index 3622f19357..9a649f099f 100644
--- a/series.conf
+++ b/series.conf
@@ -45316,6 +45316,7 @@
patches.fixes/crypto-crypto4xx-add-missing-of_node_put-after-of_de.patch
patches.arch/s390-setup-set-control-program-code-via-diag-318
patches.arch/s390-pci-improve-bar-check
+ patches.arch/s390-pci-map-iov-resources
patches.arch/s390-ism-ignore-some-errors-during-deregistration
patches.fixes/0001-s390-vfio_ap-link-the-vfio_ap-devices-to-the-vfio_ap.patch
patches.drivers/clocksource-drivers-sun5i-Fail-gracefully-when-clock.patch