Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2eb7bea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI fixes from Bjorn Helgaas:

 - fix ThunderX legacy firmware resources

 - fix ARTPEC-6 and DesignWare platform driver NULL pointer dereferences

 - fix HiSilicon link error

* tag 'pci-v4.11-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: dwc: Fix dw_pcie_ops NULL pointer dereference
  PCI: dwc: Select PCI_HOST_COMMON for hisi
  PCI: thunder-pem: Fix legacy firmware PEM-specific resources
parents 81d4bab4 794a8604

drivers/pci/dwc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ config PCI_HISI 
	depends on PCI_MSI_IRQ_DOMAIN

	select PCIEPORTBUS

	select PCIE_DW_HOST

	select PCI_HOST_COMMON

	help

	  Say Y here if you want PCIe controller support on HiSilicon

	  Hip05 and Hip06 SoCs

drivers/pci/dwc/pcie-artpec6.c

+4 −0
Original line number Diff line number Diff line
@@ -234,6 +234,9 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, 
	return 0;

}



static const struct dw_pcie_ops dw_pcie_ops = {

};



static int artpec6_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -252,6 +255,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
		return -ENOMEM;



	pci->dev = dev;

	pci->ops = &dw_pcie_ops;



	artpec6_pcie->pci = pci;

drivers/pci/dwc/pcie-designware-plat.c

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ static int dw_plat_add_pcie_port(struct pcie_port *pp, 
	return 0;

}



static const struct dw_pcie_ops dw_pcie_ops = {

};



static int dw_plat_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -103,6 +106,7 @@ static int dw_plat_pcie_probe(struct platform_device *pdev) 
		return -ENOMEM;



	pci->dev = dev;

	pci->ops = &dw_pcie_ops;



	dw_plat_pcie->pci = pci;

drivers/pci/host/pci-thunder-pem.c

+8 −2
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ static void thunder_pem_legacy_fw(struct acpi_pci_root *root, 
	index -= node * PEM_MAX_DOM_IN_NODE;

	res_pem->start = PEM_RES_BASE | FIELD_PREP(PEM_NODE_MASK, node) |

					FIELD_PREP(PEM_INDX_MASK, index);

	res_pem->end = res_pem->start + SZ_16M - 1;

	res_pem->flags = IORESOURCE_MEM;

}
@@ -399,8 +398,15 @@ static int thunder_pem_acpi_init(struct pci_config_window *cfg) 
	 */

	if (ret) {

		thunder_pem_legacy_fw(root, res_pem);

		/* Reserve PEM-specific resources and PCI configuration space */

		/*

		 * Reserve 64K size PEM specific resources. The full 16M range

		 * size is required for thunder_pem_init() call.

		 */

		res_pem->end = res_pem->start + SZ_64K - 1;

		thunder_pem_reserve_range(dev, root->segment, res_pem);

		res_pem->end = res_pem->start + SZ_16M - 1;



		/* Reserve PCI configuration space as well. */

		thunder_pem_reserve_range(dev, root->segment, &cfg->res);

	}