Skip to content

Commit fbfe07d

Browse files
sebottMartin Schwidefsky
authored andcommitted
s390/pci: add parameter to force floating irqs
Provide a kernel parameter to force the usage of floating interrupts. Signed-off-by: Sebastian Ott <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
1 parent 07e3ec3 commit fbfe07d

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3394,6 +3394,7 @@
33943394
bridges without forcing it upstream. Note:
33953395
this removes isolation between devices and
33963396
may put more devices in an IOMMU group.
3397+
force_floating [S390] Force usage of floating interrupts.
33973398

33983399
pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
33993400
Management.

arch/s390/include/asm/pci.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ static inline bool zdev_enabled(struct zpci_dev *zdev)
163163
}
164164

165165
extern const struct attribute_group *zpci_attr_groups[];
166+
extern unsigned int s390_pci_force_floating __initdata;
166167

167168
/* -----------------------------------------------------------------------------
168169
Prototypes

arch/s390/pci/pci.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,7 @@ static void zpci_mem_exit(void)
741741
}
742742

743743
static unsigned int s390_pci_probe __initdata = 1;
744+
unsigned int s390_pci_force_floating __initdata;
744745
static unsigned int s390_pci_initialized;
745746

746747
char * __init pcibios_setup(char *str)
@@ -749,6 +750,10 @@ char * __init pcibios_setup(char *str)
749750
s390_pci_probe = 0;
750751
return NULL;
751752
}
753+
if (!strcmp(str, "force_floating")) {
754+
s390_pci_force_floating = 1;
755+
return NULL;
756+
}
752757
return str;
753758
}
754759

arch/s390/pci/pci_irq.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,9 @@ int __init zpci_irq_init(void)
433433
int rc;
434434

435435
irq_delivery = sclp.has_dirq ? DIRECTED : FLOATING;
436+
if (s390_pci_force_floating)
437+
irq_delivery = FLOATING;
438+
436439
if (irq_delivery == DIRECTED)
437440
zpci_airq.handler = zpci_directed_irq_handler;
438441

0 commit comments

Comments
 (0)