Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pci-v4.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:

- fix for a Qualcomm driver issue that causes a use-before-set crash

- fix for DesignWare iATU unroll support that causes external aborts
when enabling the host bridge

* tag 'pci-v4.9-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: designware: Check for iATU unroll support after initializing host
PCI: qcom: Fix pp->dev usage before assignment

+6 -3
+5 -2
drivers/pci/host/pcie-designware.c
··· 637 637 } 638 638 } 639 639 640 - pp->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pp); 641 - 642 640 if (pp->ops->host_init) 643 641 pp->ops->host_init(pp); 644 642 ··· 806 808 void dw_pcie_setup_rc(struct pcie_port *pp) 807 809 { 808 810 u32 val; 811 + 812 + /* get iATU unroll support */ 813 + pp->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pp); 814 + dev_dbg(pp->dev, "iATU unroll: %s\n", 815 + pp->iatu_unroll_enabled ? "enabled" : "disabled"); 809 816 810 817 /* set the number of lanes */ 811 818 val = dw_pcie_readl_rc(pp, PCIE_PORT_LINK_CONTROL);
+1 -1
drivers/pci/host/pcie-qcom.c
··· 533 533 if (IS_ERR(pcie->phy)) 534 534 return PTR_ERR(pcie->phy); 535 535 536 + pp->dev = dev; 536 537 ret = pcie->ops->get_resources(pcie); 537 538 if (ret) 538 539 return ret; 539 540 540 - pp->dev = dev; 541 541 pp->root_bus_nr = -1; 542 542 pp->ops = &qcom_pcie_dw_ops; 543 543