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:59:11 +0200
commit96f446a727c6e347e79033902b9bb2a18ea394dd (patch)
tree371c3876056faca0380454237caf887e0d7cc23a
parent16e8d9a91c56cff9b71f6a51f3df18c6b080b225 (diff)
s390/pci: add parameter to force floating irqs (jsc#SLE-5789SLE15-SP1
FATE#327042 bsc#1134730 LTC#173388). suse-commit: 8b0fa65a6be3228d66a314ef6b7e37d6b3879d61
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt1
-rw-r--r--arch/s390/include/asm/pci.h1
-rw-r--r--arch/s390/pci/pci.c5
-rw-r--r--arch/s390/pci/pci_irq.c3
4 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index b9d8b8fe84b8..5546533a9dc8 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3231,6 +3231,7 @@
Adding the window is slightly risky (it may
conflict with unreported devices), so this
taints the kernel.
+ force_floating [S390] Force usage of floating interrupts.
pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
Management.
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index bc78d16e1b6d..6382f2d8b5fa 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -157,6 +157,7 @@ static inline bool zdev_enabled(struct zpci_dev *zdev)
}
extern const struct attribute_group *zpci_attr_groups[];
+extern unsigned int s390_pci_force_floating __initdata;
/* -----------------------------------------------------------------------------
Prototypes
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 86b8f99baeb5..a6e40b183d85 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -715,6 +715,7 @@ static void zpci_mem_exit(void)
}
static unsigned int s390_pci_probe __initdata = 1;
+unsigned int s390_pci_force_floating __initdata;
static unsigned int s390_pci_initialized;
char * __init pcibios_setup(char *str)
@@ -723,6 +724,10 @@ char * __init pcibios_setup(char *str)
s390_pci_probe = 0;
return NULL;
}
+ if (!strcmp(str, "force_floating")) {
+ s390_pci_force_floating = 1;
+ return NULL;
+ }
return str;
}
diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c
index 17c39f8433ac..d3543c44cf9e 100644
--- a/arch/s390/pci/pci_irq.c
+++ b/arch/s390/pci/pci_irq.c
@@ -433,6 +433,9 @@ int __init zpci_irq_init(void)
int rc;
irq_delivery = sclp.has_dirq ? DIRECTED : FLOATING;
+ if (s390_pci_force_floating)
+ irq_delivery = FLOATING;
+
if (irq_delivery == DIRECTED)
zpci_airq.handler = zpci_directed_irq_handler;