summaryrefslogtreecommitdiff
path: root/arch/s390/pci/pci.c
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.ibm.com>2019-04-18 21:39:06 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2019-04-29 10:47:01 +0200
commit56271303808fb86375ec33183d56c21fdeb836ea (patch)
tree967c102ad201f82d36177cb694eecbdc28b5c14f /arch/s390/pci/pci.c
parent71ba41c9b1d91042960e9d92a5c8f52dc8531eda (diff)
s390/pci: add parameter to disable usage of MIO instructions
Allow users to disable usage of MIO instructions by specifying pci=nomio at the kernel command line. Signed-off-by: Sebastian Ott <sebott@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/pci/pci.c')
-rw-r--r--arch/s390/pci/pci.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index dff8f4526c8d..0ebb7c405a25 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -850,6 +850,7 @@ static void zpci_mem_exit(void)
}
static unsigned int s390_pci_probe __initdata = 1;
+static unsigned int s390_pci_no_mio __initdata;
unsigned int s390_pci_force_floating __initdata;
static unsigned int s390_pci_initialized;
@@ -859,6 +860,10 @@ char * __init pcibios_setup(char *str)
s390_pci_probe = 0;
return NULL;
}
+ if (!strcmp(str, "nomio")) {
+ s390_pci_no_mio = 1;
+ return NULL;
+ }
if (!strcmp(str, "force_floating")) {
s390_pci_force_floating = 1;
return NULL;
@@ -881,7 +886,7 @@ static int __init pci_base_init(void)
if (!test_facility(69) || !test_facility(71))
return 0;
- if (test_facility(153))
+ if (test_facility(153) && !s390_pci_no_mio)
static_branch_enable(&have_mio);
rc = zpci_debug_init();