diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-09 13:31:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-09 13:31:08 -0800 |
commit | c68a2cf07ad726c09a8724258e25ca9400fdf9ee (patch) | |
tree | d1e00ffc55835af3ee697769f1561d1182feb4ea /drivers/pci | |
parent | 99d7d64b60d2c97373365a41554a12fa8a6e3f8f (diff) | |
parent | fc110ebdd014dd1368c98e7685b47789c31fab42 (diff) | |
download | linux-c68a2cf07ad726c09a8724258e25ca9400fdf9ee.tar.gz linux-c68a2cf07ad726c09a8724258e25ca9400fdf9ee.tar.bz2 linux-c68a2cf07ad726c09a8724258e25ca9400fdf9ee.zip |
Merge tag 'pci-v4.16-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- fix sparc build issue when OF_IRQ not enabled (Guenter Roeck)
- fix enumeration of devices below switches on DesignWare-based
controllers (Koen Vandeputte)
* tag 'pci-v4.16-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: dwc: Fix enumeration end when reaching root subordinate
PCI: Move of_irq_parse_and_map_pci() declaration under OF_IRQ
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/dwc/pcie-designware-host.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/dwc/pcie-designware-host.c b/drivers/pci/dwc/pcie-designware-host.c index 8de2d5c69b1d..dc9303abda42 100644 --- a/drivers/pci/dwc/pcie-designware-host.c +++ b/drivers/pci/dwc/pcie-designware-host.c @@ -613,7 +613,7 @@ void dw_pcie_setup_rc(struct pcie_port *pp) /* setup bus numbers */ val = dw_pcie_readl_dbi(pci, PCI_PRIMARY_BUS); val &= 0xff000000; - val |= 0x00010100; + val |= 0x00ff0100; dw_pcie_writel_dbi(pci, PCI_PRIMARY_BUS, val); /* setup command register */ |