Skip to content

Commit

Permalink
s390/pci: add parameter to force floating irqs
Browse files Browse the repository at this point in the history
Provide a kernel parameter to force the usage of floating interrupts.

Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Sebastian Ott authored and Martin Schwidefsky committed Apr 29, 2019
1 parent 07e3ec3 commit fbfe07d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3394,6 +3394,7 @@
bridges without forcing it upstream. Note:
this removes isolation between devices and
may put more devices in an IOMMU group.
force_floating [S390] Force usage of floating interrupts.

pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
Management.
Expand Down
1 change: 1 addition & 0 deletions arch/s390/include/asm/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,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
Expand Down
5 changes: 5 additions & 0 deletions arch/s390/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,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)
Expand All @@ -749,6 +750,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;
}

Expand Down
3 changes: 3 additions & 0 deletions arch/s390/pci/pci_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit fbfe07d

Please sign in to comment.