Merge tag 'pci-v5.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas: "Fix rockchip outbound ATU issue that prevented Google Kevin Chromebooks from booting (Enric Balletbo i Serra)" * tag 'pci-v5.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: rockchip: Fix IO outbound ATU register number

Linus Torvalds committed 6 years ago

Commit 1d76c072 parents 3b2ee61 ca01e791 file · +3 −1Browse files

Unified · Split

drivers/pci/controller/pcie-rockchip-host.c+3−1

@@ -834,10 +834,12 @@ static int rockchip_pcie_cfg_atu(struct rockchip_pcie *rockchip) · 833 unmodified lines
834	834	if (!entry)
835	835	return -ENODEV;
836	836
	837	+ /* store the register number offset to program RC io outbound ATU */
	838	+ offset = size >> 20;
	839	+
837	840	size = resource_size(entry->res);
838	841	pci_addr = entry->res->start - entry->offset;
839	842
840		− offset = size >> 20;
841	843	for (reg_no = 0; reg_no < (size >> 20); reg_no++) {
842	844	err = rockchip_pcie_prog_ob_atu(rockchip,
843	845	reg_no + 1 + offset,