Skip to content

Commit 29795de

Browse files
committed
Merge tag 'pci-v5.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas: - Fix build issue on 32-bit ARM with old compilers (Marek Szyprowski) - Update MAINTAINERS for recent Cadence driver file move (Lukas Bulwahn) * tag 'pci-v5.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: MAINTAINERS: Correct Cadence PCI driver path PCI: brcmstb: Fix build on 32bit ARM platforms with older compilers
2 parents 2edc78b + 5901b51 commit 29795de

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12739,7 +12739,7 @@ M: Tom Joseph <[email protected]>
1273912739
1274012740
S: Maintained
1274112741
F: Documentation/devicetree/bindings/pci/cdns,*.txt
12742-
F: drivers/pci/controller/pcie-cadence*
12742+
F: drivers/pci/controller/cadence/
1274312743

1274412744
PCI DRIVER FOR FREESCALE LAYERSCAPE
1274512745
M: Minghuan Lian <[email protected]>

drivers/pci/controller/pcie-brcmstb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie,
670670
* outbound memory @ 3GB). So instead it will start at the 1x
671671
* multiple of its size
672672
*/
673-
if (!*rc_bar2_size || *rc_bar2_offset % *rc_bar2_size ||
673+
if (!*rc_bar2_size || (*rc_bar2_offset & (*rc_bar2_size - 1)) ||
674674
(*rc_bar2_offset < SZ_4G && *rc_bar2_offset > SZ_2G)) {
675675
dev_err(dev, "Invalid rc_bar2_offset/size: size 0x%llx, off 0x%llx\n",
676676
*rc_bar2_size, *rc_bar2_offset);

0 commit comments

Comments
 (0)