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

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

Merge branches 'pci/host-mvebu' and 'pci/host-spear' into next 

* pci/host-mvebu:
  PCI: mvebu: Fix uninitialized variable in mvebu_get_tgt_attr()

* pci/host-spear:
  PCI: spear: Pass config resource through reg property
parents 783a28ec 56fab6e1 65aaae24

arch/arm/boot/dts/spear1310.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ 


		pcie0: pcie@b1000000 {

			compatible = "st,spear1340-pcie", "snps,dw-pcie";

			reg = <0xb1000000 0x4000>;

			reg = <0xb1000000 0x4000>, <0x80000000 0x20000>;

			reg-names = "dbi", "config";

			interrupts = <0 68 0x4>;

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

			interrupt-map = <0x0 0 &gic 0 68 0x4>;
@@ -95,15 +96,15 @@ 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			ranges = <0x00000800 0 0x80000000 0x80000000 0 0x00020000   /* configuration space */

				0x81000000 0 0	 0x80020000 0 0x00010000   /* downstream I/O */

			ranges = <0x81000000 0 0	 0x80020000 0 0x00010000   /* downstream I/O */

				0x82000000 0 0x80030000 0xc0030000 0 0x0ffd0000>; /* non-prefetchable memory */

			status = "disabled";

		};



		pcie1: pcie@b1800000 {

			compatible = "st,spear1340-pcie", "snps,dw-pcie";

			reg = <0xb1800000 0x4000>;

			reg = <0xb1800000 0x4000>, <0x90000000 0x20000>;

			reg-names = "dbi", "config";

			interrupts = <0 69 0x4>;

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

			interrupt-map = <0x0 0 &gic 0 69 0x4>;
@@ -113,15 +114,15 @@ 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			ranges = <0x00000800 0 0x90000000 0x90000000 0 0x00020000   /* configuration space */

				0x81000000 0 0  0x90020000 0 0x00010000   /* downstream I/O */

			ranges = <0x81000000 0 0  0x90020000 0 0x00010000   /* downstream I/O */

				0x82000000 0 0x90030000 0x90030000 0 0x0ffd0000>; /* non-prefetchable memory */

			status = "disabled";

		};



		pcie2: pcie@b4000000 {

			compatible = "st,spear1340-pcie", "snps,dw-pcie";

			reg = <0xb4000000 0x4000>;

			reg = <0xb4000000 0x4000>, <0xc0000000 0x20000>;

			reg-names = "dbi", "config";

			interrupts = <0 70 0x4>;

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

			interrupt-map = <0x0 0 &gic 0 70 0x4>;
@@ -131,8 +132,7 @@ 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			ranges = <0x00000800 0 0xc0000000 0xc0000000 0 0x00020000   /* configuration space */

				0x81000000 0 0	 0xc0020000 0 0x00010000   /* downstream I/O */

			ranges = <0x81000000 0 0	 0xc0020000 0 0x00010000   /* downstream I/O */

				0x82000000 0 0xc0030000 0xc0030000 0 0x0ffd0000>; /* non-prefetchable memory */

			status = "disabled";

		};

arch/arm/boot/dts/spear1340.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ 


		pcie0: pcie@b1000000 {

			compatible = "st,spear1340-pcie", "snps,dw-pcie";

			reg = <0xb1000000 0x4000>;

			reg = <0xb1000000 0x4000>, <0x80000000 0x20000>;

			reg-names = "dbi", "config";

			interrupts = <0 68 0x4>;

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

			interrupt-map = <0x0 0 &gic 0 68 0x4>;
@@ -60,8 +61,7 @@ 
			#address-cells = <3>;

			#size-cells = <2>;

			device_type = "pci";

			ranges = <0x00000800 0 0x80000000 0x80000000 0 0x00020000   /* configuration space */

				0x81000000 0 0	 0x80020000 0 0x00010000   /* downstream I/O */

			ranges = <0x81000000 0 0	 0x80020000 0 0x00010000   /* downstream I/O */

				0x82000000 0 0x80030000 0xc0030000 0 0x0ffd0000>; /* non-prefetchable memory */

			status = "disabled";

		};

drivers/pci/host/pci-mvebu.c

+3 −3
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ static int mvebu_get_tgt_attr(struct device_node *np, int devfn, 
	rangesz = pna + na + ns;

	nranges = rlen / sizeof(__be32) / rangesz;



	for (i = 0; i < nranges; i++) {

	for (i = 0; i < nranges; i++, range += rangesz) {

		u32 flags = of_read_number(range, 1);

		u32 slot = of_read_number(range + 1, 1);

		u64 cpuaddr = of_read_number(range + na, pna);
@@ -883,14 +883,14 @@ static int mvebu_get_tgt_attr(struct device_node *np, int devfn, 
			rtype = IORESOURCE_IO;

		else if (DT_FLAGS_TO_TYPE(flags) == DT_TYPE_MEM32)

			rtype = IORESOURCE_MEM;

		else

			continue;



		if (slot == PCI_SLOT(devfn) && type == rtype) {

			*tgt = DT_CPUADDR_TO_TARGET(cpuaddr);

			*attr = DT_CPUADDR_TO_ATTR(cpuaddr);

			return 0;

		}



		range += rangesz;

	}



	return -ENOENT;

drivers/pci/host/pcie-spear13xx.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int __init spear13xx_pcie_probe(struct platform_device *pdev) 


	pp->dev = dev;



	dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");

	pp->dbi_base = devm_ioremap_resource(dev, dbi_base);

	if (IS_ERR(pp->dbi_base)) {

		dev_err(dev, "couldn't remap dbi base %p\n", dbi_base);