summaryrefslogtreecommitdiff
path: root/arch/s390/include/asm
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.ibm.com>2019-07-10 13:08:06 +0200
committerVasily Gorbik <gor@linux.ibm.com>2019-07-11 20:40:02 +0200
commit9964f396f1d0eed72c50f7ae367119afd355ab9c (patch)
treedf4091195e90e2cbeaf1bb4e3644825e8d207e08 /arch/s390/include/asm
parent1b2be2071aca9aab22e3f902bcb0fca46a1d3b00 (diff)
downloadlinux-9964f396f1d0eed72c50f7ae367119afd355ab9c.tar.gz
s390: fix setting of mio addressing control
Move enablement of mio addressing control from detect_machine_facilities to pci_base_init. detect_machine_facilities runs so early that the static branches have not been toggled yet, thus mio addressing control was always off. In pci_base_init we have to use the SMP aware ctl_set_bit though. Fixes: 833b441ec0f6 ("s390: enable processes for mio instructions") Signed-off-by: Sebastian Ott <sebott@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/include/asm')
-rw-r--r--arch/s390/include/asm/pci_insn.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/s390/include/asm/pci_insn.h b/arch/s390/include/asm/pci_insn.h
index ff81ed19c506..61cf9531f68f 100644
--- a/arch/s390/include/asm/pci_insn.h
+++ b/arch/s390/include/asm/pci_insn.h
@@ -143,14 +143,4 @@ static inline int zpci_set_irq_ctrl(u16 ctl, u8 isc)
return __zpci_set_irq_ctrl(ctl, isc, &iib);
}
-#ifdef CONFIG_PCI
-static inline void enable_mio_ctl(void)
-{
- if (static_branch_likely(&have_mio))
- __ctl_set_bit(2, 5);
-}
-#else /* CONFIG_PCI */
-static inline void enable_mio_ctl(void) {}
-#endif /* CONFIG_PCI */
-
#endif