diff mbox

[v3] PCI: Store PCIe bus address in struct of_pci_range

Message ID 1437574598-135008-1-git-send-email-gabriele.paoloni@huawei.com (mailing list archive)
State New, archived
Delegated to: Bjorn Helgaas
Headers show

Commit Message

Gabriele Paoloni July 22, 2015, 2:16 p.m. UTC 
From: gabriele paoloni <gabriele.paoloni@huawei.com>

    This patch is needed port PCIe designware to new DT parsing API
    As discussed in
    http://lists.infradead.org/pipermail/linux-arm-kernel/2015-January/317743.html
    in designware we have a problem as the PCI addresses in the PCIe controller
    address space are required in order to perform correct HW operation.

    In order to solve this problem commit
    f4c55c5a3 "PCI: designware: Program ATU with untranslated address"
    added code to read the PCIe controller start address directly from the
    DT ranges.

    In the new DT parsing API of_pci_get_host_bridge_resources() hides the
    DT parser from the host controller drivers, so it is not possible
    for drivers to parse values directly from the DT.

    In http://www.spinics.net/lists/linux-pci/msg42540.html we already tried
    to use the new DT parsing API but there is a bug (obviously) in setting
    the <*>_mod_base addresses
    Applying this patch we can easily set "<*>_mod_base = win->__res.start"

    This patch adds a new field in "struct of_pci_range" to store the
    pci bus start address; it fills the field in of_pci_range_parser_one();
    in of_pci_get_host_bridge_resources() it retrieves the resource entry
    after it is created and added to the resource list and uses
    entry->__res.start to store the pci controller address

    the patch is based on 4.2-rc1

    Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com>
    Acked-by: Liviu Dudai <Liviu.Dudau@arm.com>
---
 drivers/of/address.c       | 2 ++
 drivers/of/of_pci.c        | 4 ++++
 include/linux/of_address.h | 1 +
 3 files changed, 7 insertions(+)

Comments

Gabriele Paoloni July 22, 2015, 2:14 p.m. UTC | #1 
PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBHYWJyaWVsZSBQYW9sb25pDQo+
IFNlbnQ6IFdlZG5lc2RheSwgSnVseSAyMiwgMjAxNSAzOjE3IFBNDQo+IFRvOiBHYWJyaWVsZSBQ
YW9sb25pOyBhcm5kQGFybmRiLmRlOyBsb3JlbnpvLnBpZXJhbGlzaUBhcm0uY29tOw0KPiBXYW5n
emhvdSAoQik7IGJoZWxnYWFzQGdvb2dsZS5jb207IHJvYmgrZHRAa2VybmVsLm9yZzsNCj4gamFt
ZXMubW9yc2VAYXJtLmNvbTsgTGl2aXUuRHVkYXVAYXJtLmNvbQ0KPiBDYzogbGludXgtcGNpQHZn
ZXIua2VybmVsLm9yZzsgbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnOw0KPiBk
ZXZpY2V0cmVlQHZnZXIua2VybmVsLm9yZzsgWXVhbnpoaWNoYW5nOyBaaHVkYWNhaTsgemhhbmdq
dWt1bzsNCj4gcWl1emhlbmZhOyBMaWd1b3podSAoS2VubmV0aCkNCj4gU3ViamVjdDogW1BBVENI
IHYzXSBQQ0k6IFN0b3JlIFBDSWUgYnVzIGFkZHJlc3MgaW4gc3RydWN0IG9mX3BjaV9yYW5nZQ0K
PiANCj4gRnJvbTogZ2FicmllbGUgcGFvbG9uaSA8Z2FicmllbGUucGFvbG9uaUBodWF3ZWkuY29t
Pg0KPiANCj4gICAgIFRoaXMgcGF0Y2ggaXMgbmVlZGVkIHBvcnQgUENJZSBkZXNpZ253YXJlIHRv
IG5ldyBEVCBwYXJzaW5nIEFQSQ0KPiAgICAgQXMgZGlzY3Vzc2VkIGluDQo+ICAgICBodHRwOi8v
bGlzdHMuaW5mcmFkZWFkLm9yZy9waXBlcm1haWwvbGludXgtYXJtLWtlcm5lbC8yMDE1LQ0KPiBK
YW51YXJ5LzMxNzc0My5odG1sDQo+ICAgICBpbiBkZXNpZ253YXJlIHdlIGhhdmUgYSBwcm9ibGVt
IGFzIHRoZSBQQ0kgYWRkcmVzc2VzIGluIHRoZSBQQ0llDQo+IGNvbnRyb2xsZXINCj4gICAgIGFk
ZHJlc3Mgc3BhY2UgYXJlIHJlcXVpcmVkIGluIG9yZGVyIHRvIHBlcmZvcm0gY29ycmVjdCBIVyBv
cGVyYXRpb24uDQo+IA0KPiAgICAgSW4gb3JkZXIgdG8gc29sdmUgdGhpcyBwcm9ibGVtIGNvbW1p
dA0KPiAgICAgZjRjNTVjNWEzICJQQ0k6IGRlc2lnbndhcmU6IFByb2dyYW0gQVRVIHdpdGggdW50
cmFuc2xhdGVkIGFkZHJlc3MiDQo+ICAgICBhZGRlZCBjb2RlIHRvIHJlYWQgdGhlIFBDSWUgY29u
dHJvbGxlciBzdGFydCBhZGRyZXNzIGRpcmVjdGx5IGZyb20NCj4gdGhlDQo+ICAgICBEVCByYW5n
ZXMuDQo+IA0KPiAgICAgSW4gdGhlIG5ldyBEVCBwYXJzaW5nIEFQSSBvZl9wY2lfZ2V0X2hvc3Rf
YnJpZGdlX3Jlc291cmNlcygpIGhpZGVzDQo+IHRoZQ0KPiAgICAgRFQgcGFyc2VyIGZyb20gdGhl
IGhvc3QgY29udHJvbGxlciBkcml2ZXJzLCBzbyBpdCBpcyBub3QgcG9zc2libGUNCj4gICAgIGZv
ciBkcml2ZXJzIHRvIHBhcnNlIHZhbHVlcyBkaXJlY3RseSBmcm9tIHRoZSBEVC4NCj4gDQo+ICAg
ICBJbiBodHRwOi8vd3d3LnNwaW5pY3MubmV0L2xpc3RzL2xpbnV4LXBjaS9tc2c0MjU0MC5odG1s
IHdlIGFscmVhZHkNCj4gdHJpZWQNCj4gICAgIHRvIHVzZSB0aGUgbmV3IERUIHBhcnNpbmcgQVBJ
IGJ1dCB0aGVyZSBpcyBhIGJ1ZyAob2J2aW91c2x5KSBpbg0KPiBzZXR0aW5nDQo+ICAgICB0aGUg
PCo+X21vZF9iYXNlIGFkZHJlc3Nlcw0KPiAgICAgQXBwbHlpbmcgdGhpcyBwYXRjaCB3ZSBjYW4g
ZWFzaWx5IHNldCAiPCo+X21vZF9iYXNlID0gd2luLQ0KPiA+X19yZXMuc3RhcnQiDQo+IA0KPiAg
ICAgVGhpcyBwYXRjaCBhZGRzIGEgbmV3IGZpZWxkIGluICJzdHJ1Y3Qgb2ZfcGNpX3JhbmdlIiB0
byBzdG9yZSB0aGUNCj4gICAgIHBjaSBidXMgc3RhcnQgYWRkcmVzczsgaXQgZmlsbHMgdGhlIGZp
ZWxkIGluDQo+IG9mX3BjaV9yYW5nZV9wYXJzZXJfb25lKCk7DQo+ICAgICBpbiBvZl9wY2lfZ2V0
X2hvc3RfYnJpZGdlX3Jlc291cmNlcygpIGl0IHJldHJpZXZlcyB0aGUgcmVzb3VyY2UNCj4gZW50
cnkNCj4gICAgIGFmdGVyIGl0IGlzIGNyZWF0ZWQgYW5kIGFkZGVkIHRvIHRoZSByZXNvdXJjZSBs
aXN0IGFuZCB1c2VzDQo+ICAgICBlbnRyeS0+X19yZXMuc3RhcnQgdG8gc3RvcmUgdGhlIHBjaSBj
b250cm9sbGVyIGFkZHJlc3MNCj4gDQo+ICAgICB0aGUgcGF0Y2ggaXMgYmFzZWQgb24gNC4yLXJj
MQ0KPiANCj4gICAgIFNpZ25lZC1vZmYtYnk6IEdhYnJpZWxlIFBhb2xvbmkgPGdhYnJpZWxlLnBh
b2xvbmlAaHVhd2VpLmNvbT4NCj4gICAgIEFja2VkLWJ5OiBMaXZpdSBEdWRhaSA8TGl2aXUuRHVk
YXVAYXJtLmNvbT4NClNvcnJ5LCBJIGp1c3QgcmVhbGl6ZWQgSSd2ZSBwdXQgYSB0eXBvIGluIExp
dml1J3Mgc3VybmFtZSwgSSBhbSBnb2luZyB0byBzZW5kIHY0DQo+IC0tLQ0KPiAgZHJpdmVycy9v
Zi9hZGRyZXNzLmMgICAgICAgfCAyICsrDQo+ICBkcml2ZXJzL29mL29mX3BjaS5jICAgICAgICB8
IDQgKysrKw0KPiAgaW5jbHVkZS9saW51eC9vZl9hZGRyZXNzLmggfCAxICsNCj4gIDMgZmlsZXMg
Y2hhbmdlZCwgNyBpbnNlcnRpb25zKCspDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9vZi9h
ZGRyZXNzLmMgYi9kcml2ZXJzL29mL2FkZHJlc3MuYw0KPiBpbmRleCA4YmZkYTZhLi4yM2E1Nzkz
IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL29mL2FkZHJlc3MuYw0KPiArKysgYi9kcml2ZXJzL29m
L2FkZHJlc3MuYw0KPiBAQCAtMjUzLDYgKzI1Myw3IEBAIHN0cnVjdCBvZl9wY2lfcmFuZ2UgKm9m
X3BjaV9yYW5nZV9wYXJzZXJfb25lKHN0cnVjdA0KPiBvZl9wY2lfcmFuZ2VfcGFyc2VyICpwYXJz
ZXIsDQo+ICAJCQkJCQlzdHJ1Y3Qgb2ZfcGNpX3JhbmdlICpyYW5nZSkNCj4gIHsNCj4gIAljb25z
dCBpbnQgbmEgPSAzLCBucyA9IDI7DQo+ICsJY29uc3QgaW50IHBfbnMgPSBvZl9uX3NpemVfY2Vs
bHMocGFyc2VyLT5ub2RlKTsNCj4gDQo+ICAJaWYgKCFyYW5nZSkNCj4gIAkJcmV0dXJuIE5VTEw7
DQo+IEBAIC0yNjUsNiArMjY2LDcgQEAgc3RydWN0IG9mX3BjaV9yYW5nZSAqb2ZfcGNpX3Jhbmdl
X3BhcnNlcl9vbmUoc3RydWN0DQo+IG9mX3BjaV9yYW5nZV9wYXJzZXIgKnBhcnNlciwNCj4gIAly
YW5nZS0+cGNpX2FkZHIgPSBvZl9yZWFkX251bWJlcihwYXJzZXItPnJhbmdlICsgMSwgbnMpOw0K
PiAgCXJhbmdlLT5jcHVfYWRkciA9IG9mX3RyYW5zbGF0ZV9hZGRyZXNzKHBhcnNlci0+bm9kZSwN
Cj4gIAkJCQlwYXJzZXItPnJhbmdlICsgbmEpOw0KPiArCXJhbmdlLT5idXNfYWRkciA9IG9mX3Jl
YWRfbnVtYmVyKHBhcnNlci0+cmFuZ2UgKyBuYSwgcF9ucyk7DQo+ICAJcmFuZ2UtPnNpemUgPSBv
Zl9yZWFkX251bWJlcihwYXJzZXItPnJhbmdlICsgcGFyc2VyLT5wbmEgKyBuYSwNCj4gbnMpOw0K
PiANCj4gIAlwYXJzZXItPnJhbmdlICs9IHBhcnNlci0+bnA7DQo+IGRpZmYgLS1naXQgYS9kcml2
ZXJzL29mL29mX3BjaS5jIGIvZHJpdmVycy9vZi9vZl9wY2kuYw0KPiBpbmRleCA1NzUxZGM1Li5m
ZTU3MDMwIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL29mL29mX3BjaS5jDQo+ICsrKyBiL2RyaXZl
cnMvb2Yvb2ZfcGNpLmMNCj4gQEAgLTE5OCw2ICsxOTgsNyBAQCBpbnQgb2ZfcGNpX2dldF9ob3N0
X2JyaWRnZV9yZXNvdXJjZXMoc3RydWN0DQo+IGRldmljZV9ub2RlICpkZXYsDQo+IA0KPiAgCXBy
X2RlYnVnKCJQYXJzaW5nIHJhbmdlcyBwcm9wZXJ0eS4uLlxuIik7DQo+ICAJZm9yX2VhY2hfb2Zf
cGNpX3JhbmdlKCZwYXJzZXIsICZyYW5nZSkgew0KPiArCQlzdHJ1Y3QgcmVzb3VyY2VfZW50cnkg
KmVudHJ5Ow0KPiAgCQkvKiBSZWFkIG5leHQgcmFuZ2VzIGVsZW1lbnQgKi8NCj4gIAkJaWYgKChy
YW5nZS5mbGFncyAmIElPUkVTT1VSQ0VfVFlQRV9CSVRTKSA9PSBJT1JFU09VUkNFX0lPKQ0KPiAg
CQkJc25wcmludGYocmFuZ2VfdHlwZSwgNCwgIiBJTyIpOw0KPiBAQCAtMjQwLDYgKzI0MSw5IEBA
IGludCBvZl9wY2lfZ2V0X2hvc3RfYnJpZGdlX3Jlc291cmNlcyhzdHJ1Y3QNCj4gZGV2aWNlX25v
ZGUgKmRldiwNCj4gIAkJfQ0KPiANCj4gIAkJcGNpX2FkZF9yZXNvdXJjZV9vZmZzZXQocmVzb3Vy
Y2VzLCByZXMsCXJlcy0+c3RhcnQgLQ0KPiByYW5nZS5wY2lfYWRkcik7DQo+ICsJCWVudHJ5ID0g
bGlzdF9sYXN0X2VudHJ5KHJlc291cmNlcywgc3RydWN0IHJlc291cmNlX2VudHJ5LA0KPiBub2Rl
KTsNCj4gKwkJLyogd2UgYXJlIHVzaW5nIF9fcmVzIGZvciBzdG9yaW5nIHRoZSBQQ0kgY29udHJv
bGxlcg0KPiBhZGRyZXNzICovDQo+ICsJCWVudHJ5LT5fX3Jlcy5zdGFydCA9IHJhbmdlLmJ1c19h
ZGRyOw0KPiAgCX0NCj4gDQo+ICAJcmV0dXJuIDA7DQo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2xp
bnV4L29mX2FkZHJlc3MuaCBiL2luY2x1ZGUvbGludXgvb2ZfYWRkcmVzcy5oDQo+IGluZGV4IGQ4
OGU4MWIuLjg2NWY5NmUgMTAwNjQ0DQo+IC0tLSBhL2luY2x1ZGUvbGludXgvb2ZfYWRkcmVzcy5o
DQo+ICsrKyBiL2luY2x1ZGUvbGludXgvb2ZfYWRkcmVzcy5oDQo+IEBAIC0xNiw2ICsxNiw3IEBA
IHN0cnVjdCBvZl9wY2lfcmFuZ2Ugew0KPiAgCXUzMiBwY2lfc3BhY2U7DQo+ICAJdTY0IHBjaV9h
ZGRyOw0KPiAgCXU2NCBjcHVfYWRkcjsNCj4gKwl1NjQgYnVzX2FkZHI7DQo+ICAJdTY0IHNpemU7
DQo+ICAJdTMyIGZsYWdzOw0KPiAgfTsNCj4gLS0NCj4gMS45LjENCg0K
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 8bfda6a..23a5793 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -253,6 +253,7 @@  struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
 						struct of_pci_range *range)
 {
 	const int na = 3, ns = 2;
+	const int p_ns = of_n_size_cells(parser->node);
 
 	if (!range)
 		return NULL;
@@ -265,6 +266,7 @@  struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
 	range->pci_addr = of_read_number(parser->range + 1, ns);
 	range->cpu_addr = of_translate_address(parser->node,
 				parser->range + na);
+	range->bus_addr = of_read_number(parser->range + na, p_ns);
 	range->size = of_read_number(parser->range + parser->pna + na, ns);
 
 	parser->range += parser->np;
diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c
index 5751dc5..fe57030 100644
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@ -198,6 +198,7 @@  int of_pci_get_host_bridge_resources(struct device_node *dev,
 
 	pr_debug("Parsing ranges property...\n");
 	for_each_of_pci_range(&parser, &range) {
+		struct resource_entry *entry;
 		/* Read next ranges element */
 		if ((range.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO)
 			snprintf(range_type, 4, " IO");
@@ -240,6 +241,9 @@  int of_pci_get_host_bridge_resources(struct device_node *dev,
 		}
 
 		pci_add_resource_offset(resources, res,	res->start - range.pci_addr);
+		entry = list_last_entry(resources, struct resource_entry, node);
+		/* we are using __res for storing the PCI controller address */
+		entry->__res.start = range.bus_addr;
 	}
 
 	return 0;
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index d88e81b..865f96e 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -16,6 +16,7 @@  struct of_pci_range {
 	u32 pci_space;
 	u64 pci_addr;
 	u64 cpu_addr;
+	u64 bus_addr;
 	u64 size;
 	u32 flags;
 };