[PATCH 1/2] PCI: layerscape: rename variable

[PATCH 1/2] PCI: layerscape: rename variable

[Sascha Hauer]

Rename 'arr' to 'msi_map' which is a better name when we add another
array in the next patch.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/pci/pci-layerscape.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/pci-layerscape.c b/drivers/pci/pci-layerscape.c
index ccdc025c2e..0e41321a9a 100644
--- a/drivers/pci/pci-layerscape.c
+++ b/drivers/pci/pci-layerscape.c
@@ -342,7 +342,7 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 	struct device_d *dev = pcie->pci.dev;
 	struct device_node *np;
 	char *name;
-	u32 *arr, phandle;
+	u32 *msi_map, phandle;
 	int nluts;
 	int ret, i;
 	u32 devid, stream_id;
@@ -364,7 +364,7 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 		return ret;
 	}
 
-	arr = xmalloc(nluts * sizeof(u32) * 4);
+	msi_map = xmalloc(nluts * sizeof(u32) * 4);
 
 	for (i = 0; i < nluts; i++) {
 		u32 udr = lut_readl(pcie, PCIE_LUT_UDR(i));
@@ -376,10 +376,10 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 		devid = udr >> 16;
 		stream_id = ldr & 0x7fff;
 
-		arr[i * 4] = devid;
-		arr[i * 4 + 1] = phandle;
-		arr[i * 4 + 2] = stream_id;
-		arr[i * 4 + 3] = 1;
+		msi_map[i * 4] = devid;
+		msi_map[i * 4 + 1] = phandle;
+		msi_map[i * 4 + 2] = stream_id;
+		msi_map[i * 4 + 3] = 1;
 	}
 
 	/*
@@ -391,7 +391,7 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 	 *                 [devid] [phandle-to-msi-ctrl] [stream-id] [count]>;
 	 */
 
-	ret = of_property_write_u32_array(np, "msi-map", arr, nluts * 4);
+	ret = of_property_write_u32_array(np, "msi-map", msi_map, nluts * 4);
 	if (ret)
 		goto out;
 
@@ -400,7 +400,7 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 	ret = 0;
 
 out:
-	free(arr);
+	free(msi_map);
 	return ret;
 }
 
-- 
2.25.0.rc1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] PCI: layerscape: Fixup iommu-map properties

[Sascha Hauer]

The iommu-map properties are needed for proper PCI support under Linux.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/pci/pci-layerscape.c | 39 +++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pci-layerscape.c b/drivers/pci/pci-layerscape.c
index 0e41321a9a..e20dd55b1f 100644
--- a/drivers/pci/pci-layerscape.c
+++ b/drivers/pci/pci-layerscape.c
@@ -336,13 +336,32 @@ static int __init ls_add_pcie_port(struct ls_pcie *pcie)
 	return 0;
 }
 
+static phandle ls_pcie_get_iommu_handle(struct device_node *np, phandle *handle)
+{
+	u32 arr[4];
+	int ret;
+
+	/*
+	 * We expect an existing "iommu-map" property with bogus values. All we
+	 * use from it is the phandle to the iommu.
+	 */
+	ret = of_property_read_u32_array(np, "iommu-map", arr, 4);
+	if (ret)
+		return -ENOENT;
+
+	*handle = arr[1];
+
+	return 0;
+}
+
 static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 {
 	struct ls_pcie *pcie = ctx;
 	struct device_d *dev = pcie->pci.dev;
 	struct device_node *np;
+	phandle iommu_handle = 0;
 	char *name;
-	u32 *msi_map, phandle;
+	u32 *msi_map, *iommu_map, phandle;
 	int nluts;
 	int ret, i;
 	u32 devid, stream_id;
@@ -364,7 +383,14 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 		return ret;
 	}
 
+	ret = ls_pcie_get_iommu_handle(np, &iommu_handle);
+	if (ret) {
+		dev_err(pcie->pci.dev, "Unable to get iommu phandle\n");
+		return ret;
+	}
+
 	msi_map = xmalloc(nluts * sizeof(u32) * 4);
+	iommu_map = xmalloc(nluts * sizeof(u32) * 4);
 
 	for (i = 0; i < nluts; i++) {
 		u32 udr = lut_readl(pcie, PCIE_LUT_UDR(i));
@@ -380,6 +406,11 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 		msi_map[i * 4 + 1] = phandle;
 		msi_map[i * 4 + 2] = stream_id;
 		msi_map[i * 4 + 3] = 1;
+
+		iommu_map[i * 4] = devid;
+		iommu_map[i * 4 + 1] = iommu_handle;
+		iommu_map[i * 4 + 2] = stream_id;
+		iommu_map[i * 4 + 3] = 1;
 	}
 
 	/*
@@ -395,12 +426,18 @@ static int ls_pcie_of_fixup(struct device_node *root, void *ctx)
 	if (ret)
 		goto out;
 
+	ret = of_property_write_u32_array(np, "iommu-map", iommu_map, nluts * 4);
+	if (ret)
+		goto out;
+
 	of_device_enable(np);
 
 	ret = 0;
 
 out:
 	free(msi_map);
+	free(iommu_map);
+
 	return ret;
 }
 
-- 
2.25.0.rc1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox