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

Commit d9520971 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-hisi' into next 

* pci/host-hisi:
  PCI: generic: Call pci_fixup_irqs() only on ARM
  PCI: Disable MSI for HiSilicon Hip06/Hip07 Root Ports
  PCI: hisi: Rename config space accessors to remove "acpi"
  PCI: hisi: Add DT almost-ECAM support for Hip06/Hip07 host controllers
  PCI: hisi: Use of_device_get_match_data() to simplify probe

Conflicts:
	drivers/pci/dwc/pcie-hisi.c
parents b2e6d305 3fb55618

Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

+37 −0
Original line number Diff line number Diff line
@@ -42,3 +42,40 @@ Hip05 Example (note that Hip06 is the same except compatible): 
				 0x0 0 0 4 &mbigen_pcie 4 13>;

		status = "ok";

	};



HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description.

The properties and their meanings are identical to those described in

host-generic-pci.txt except as listed below.



Properties of the host controller node that differ from

host-generic-pci.txt:



- compatible     : Must be "hisilicon,pcie-almost-ecam"



- reg            : Two entries: First the ECAM configuration space for any

		   other bus underneath the root bus. Second, the base

		   and size of the HiSilicon host bridge registers include

		   the RC's own config space.



Example:

	pcie0: pcie@a0090000 {

		compatible = "hisilicon,pcie-almost-ecam";

		reg = <0 0xb0000000 0 0x2000000>,  /*  ECAM configuration space */

		      <0 0xa0090000 0 0x10000>; /* host bridge registers */

		bus-range = <0  31>;

		msi-map = <0x0000 &its_dsa 0x0000 0x2000>;

		msi-map-mask = <0xffff>;

		#address-cells = <3>;

		#size-cells = <2>;

		device_type = "pci";

		dma-coherent;

		ranges = <0x02000000 0 0xb2000000 0x0 0xb2000000 0 0x5ff0000

			  0x01000000 0 0 0 0xb7ff0000 0 0x10000>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0xf800 0 0 7>;

		interrupt-map = <0x0 0 0 1 &mbigen_pcie0 650 4

				 0x0 0 0 2 &mbigen_pcie0 650 4

				 0x0 0 0 3 &mbigen_pcie0 650 4

				 0x0 0 0 4 &mbigen_pcie0 650 4>;

		status = "ok";

	};

drivers/pci/dwc/pcie-hisi.c

+70 −12
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#include <linux/regmap.h>

#include "../pci.h"



#if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)

#if defined(CONFIG_PCI_HISI) || (defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS))



static int hisi_pcie_acpi_rd_conf(struct pci_bus *bus, u32 devfn, int where,

static int hisi_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,

			     int size, u32 *val)

{

	struct pci_config_window *cfg = bus->sysdata;
@@ -44,7 +44,7 @@ static int hisi_pcie_acpi_rd_conf(struct pci_bus *bus, u32 devfn, int where, 
	return pci_generic_config_read(bus, devfn, where, size, val);

}



static int hisi_pcie_acpi_wr_conf(struct pci_bus *bus, u32 devfn,

static int hisi_pcie_wr_conf(struct pci_bus *bus, u32 devfn,

			     int where, int size, u32 val)

{

	struct pci_config_window *cfg = bus->sysdata;
@@ -74,6 +74,8 @@ static void __iomem *hisi_pcie_map_bus(struct pci_bus *bus, unsigned int devfn, 
		return pci_ecam_map_bus(bus, devfn, where);

}



#if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)



static int hisi_pcie_init(struct pci_config_window *cfg)

{

	struct device *dev = cfg->parent;
@@ -110,8 +112,8 @@ struct pci_ecam_ops hisi_pcie_ops = { 
	.init         =  hisi_pcie_init,

	.pci_ops      = {

		.map_bus    = hisi_pcie_map_bus,

		.read       = hisi_pcie_acpi_rd_conf,

		.write      = hisi_pcie_acpi_wr_conf,

		.read       = hisi_pcie_rd_conf,

		.write      = hisi_pcie_wr_conf,

	}

};
@@ -139,7 +141,7 @@ struct hisi_pcie { 
	struct dw_pcie *pci;

	struct regmap *subctrl;

	u32 port_id;

	struct pcie_soc_ops *soc_ops;

	const struct pcie_soc_ops *soc_ops;

};



/* HipXX PCIe host only supports 32-bit config access */
@@ -265,7 +267,6 @@ static int hisi_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct dw_pcie *pci;

	struct hisi_pcie *hisi_pcie;

	const struct of_device_id *match;

	struct resource *reg;

	struct device_driver *driver;

	int ret;
@@ -283,8 +284,7 @@ static int hisi_pcie_probe(struct platform_device *pdev) 


	driver = dev->driver;



	match = of_match_device(driver->of_match_table, dev);

	hisi_pcie->soc_ops = (struct pcie_soc_ops *) match->data;

	hisi_pcie->soc_ops = of_device_get_match_data(dev);



	hisi_pcie->subctrl =

	    syscon_regmap_lookup_by_compatible("hisilicon,pcie-sas-subctrl");
@@ -336,4 +336,62 @@ static struct platform_driver hisi_pcie_driver = { 
};

builtin_platform_driver(hisi_pcie_driver);



static int hisi_pcie_almost_ecam_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct pci_ecam_ops *ops;



	ops = (struct pci_ecam_ops *)of_device_get_match_data(dev);

	return pci_host_common_probe(pdev, ops);

}



static int hisi_pcie_platform_init(struct pci_config_window *cfg)

{

	struct device *dev = cfg->parent;

	struct platform_device *pdev = to_platform_device(dev);

	struct resource *res;

	void __iomem *reg_base;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	if (!res) {

		dev_err(dev, "missing \"reg[1]\"property\n");

		return -EINVAL;

	}



	reg_base = devm_ioremap(dev, res->start, resource_size(res));

	if (!reg_base)

		return -ENOMEM;



	cfg->priv = reg_base;

	return 0;

}



struct pci_ecam_ops hisi_pcie_platform_ops = {

	.bus_shift    = 20,

	.init         =  hisi_pcie_platform_init,

	.pci_ops      = {

		.map_bus    = hisi_pcie_map_bus,

		.read       = hisi_pcie_rd_conf,

		.write      = hisi_pcie_wr_conf,

	}

};



static const struct of_device_id hisi_pcie_almost_ecam_of_match[] = {

	{

		.compatible = "hisilicon,pcie-almost-ecam",

		.data	    = (void *) &hisi_pcie_platform_ops,

	},

	{},

};



static struct platform_driver hisi_pcie_almost_ecam_driver = {

	.probe  = hisi_pcie_almost_ecam_probe,

	.driver = {

		   .name = "hisi-pcie-almost-ecam",

		   .of_match_table = hisi_pcie_almost_ecam_of_match,

	},

};

builtin_platform_driver(hisi_pcie_almost_ecam_driver);



#endif

#endif

drivers/pci/host/pci-host-common.c

+2 −0
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ int pci_host_common_probe(struct platform_device *pdev, 
		return -ENODEV;

	}



#ifdef CONFIG_ARM

	pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);

#endif



	/*

	 * We insert PCI resources into the iomem_resource and

drivers/pci/quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -1634,6 +1634,7 @@ static void quirk_pcie_mch(struct pci_dev *pdev) 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_E7520_MCH,	quirk_pcie_mch);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_E7320_MCH,	quirk_pcie_mch);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_E7525_MCH,	quirk_pcie_mch);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI,	0x1610,	quirk_pcie_mch);





/*

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -2516,6 +2516,8 @@ 
#define PCI_DEVICE_ID_KORENIX_JETCARDF2	0x1700

#define PCI_DEVICE_ID_KORENIX_JETCARDF3	0x17ff



#define PCI_VENDOR_ID_HUAWEI         	0x19e5



#define PCI_VENDOR_ID_NETRONOME		0x19ee

#define PCI_DEVICE_ID_NETRONOME_NFP3200	0x3200

#define PCI_DEVICE_ID_NETRONOME_NFP3240	0x3240