[PATCH] iommu/fsl_pamu: use physical cpu index to find the matched cpu nodes

[PATCH] iommu/fsl_pamu: use physical cpu index to find the matched cpu nodes

[Haiying Wang]

In the case we miss to bring up some cpus, we need to make sure we can
find the correct cpu nodes in the device tree based on the given logical
cpu index from the caller.

Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
---
 drivers/iommu/fsl_pamu.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index cba0498..a9ab57b 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -539,6 +539,7 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)
 	u32 cache_level;
 	int len, found = 0;
 	int i;
+	u32 cpuid = get_hard_smp_processor_id(vcpu);
 
 	/* Fastpath, exit early if L3/CPC cache is target for stashing */
 	if (stash_dest_hint == PAMU_ATTR_CACHE_L3) {
@@ -559,7 +560,7 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)
 	for_each_node_by_type(node, "cpu") {
 		prop = of_get_property(node, "reg", &len);
 		for (i = 0; i < len / sizeof(u32); i++) {
-			if (be32_to_cpup(&prop[i]) == vcpu) {
+			if (be32_to_cpup(&prop[i]) == cpuid) {
 				found = 1;
 				goto found_cpu_node;
 			}
-- 
1.7.3.1.50.g1e633

Re: [PATCH] iommu/fsl_pamu: use physical cpu index to find the matched cpu nodes

[Scott Wood]

On Thu, 2013-11-14 at 14:30 -0500, Haiying Wang wrote:
> In the case we miss to bring up some cpus, we need to make sure we can
> find the correct cpu nodes in the device tree based on the given logical
> cpu index from the caller.
> 
> Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
> ---
>  drivers/iommu/fsl_pamu.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
> index cba0498..a9ab57b 100644
> --- a/drivers/iommu/fsl_pamu.c
> +++ b/drivers/iommu/fsl_pamu.c
> @@ -539,6 +539,7 @@ u32 get_stash_id(u32 stash_dest_hint, u32 vcpu)

Should probably also s/vcpu/cpu/g as vcpu makes no sense outside of
virtualization code.

>  	u32 cache_level;
>  	int len, found = 0;
>  	int i;
> +	u32 cpuid = get_hard_smp_processor_id(vcpu);

s/cpuid/phys_cpu/ or similar

-Scott

RE: [PATCH] iommu/fsl_pamu: use physical cpu index to find the matched cpu nodes

[Varun Sethi]

SGFpeWluZy9TY290dCwNCkZvcmdvdCB0byBtZW50aW9uIHRoaXMsIHRoZSBQQU1VIGRyaXZlciBo
YXMgdG8gaGFuZGxlIHN0YXNoIGRlc3RpbmF0aW9uIHNldHRpbmdzIGJvdGggZm9yIHBvd2VyIGFu
ZCBkc3AgY29yZXMgKG9uIEI0IHBsYXRmb3JtKS4gRm9yIHRoZSBkc3AgY29yZXMgd2Ugd291bGQg
ZXhwZWN0IHRoZSBwaHlzaWNhbCBjb3JlIGlkIChub3QgY29udHJvbGxlZCBieSBMaW51eCkuIFRv
IG1ha2UgdGhlIGludGVyZmFjZSBjb25zaXN0ZW50LCBJIHdvdWxkIGV4cGVjdCB0aGUgY2FsbGVy
IChmb3IgaW9tbXVfc2V0X2F0dHIpIHRvIHBhc3MgdGhlIHBoeXNpY2FsIGNvcmUgaWQuDQoNClJl
Z2FyZHMNClZhcnVuDQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogV29v
ZCBTY290dC1CMDc0MjENCj4gU2VudDogRnJpZGF5LCBOb3ZlbWJlciAxNSwgMjAxMyAzOjQwIEFN
DQo+IFRvOiBXYW5nIEhhaXlpbmctUjU0OTY0DQo+IENjOiBqb3JvQDhieXRlcy5vcmc7IGlvbW11
QGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnOyBsaW51eHBwYy0NCj4gZGV2QGxpc3RzLm96bGFi
cy5vcmc7IFNldGhpIFZhcnVuLUIxNjM5NQ0KPiBTdWJqZWN0OiBSZTogW1BBVENIXSBpb21tdS9m
c2xfcGFtdTogdXNlIHBoeXNpY2FsIGNwdSBpbmRleCB0byBmaW5kIHRoZQ0KPiBtYXRjaGVkIGNw
dSBub2Rlcw0KPiANCj4gT24gVGh1LCAyMDEzLTExLTE0IGF0IDE0OjMwIC0wNTAwLCBIYWl5aW5n
IFdhbmcgd3JvdGU6DQo+ID4gSW4gdGhlIGNhc2Ugd2UgbWlzcyB0byBicmluZyB1cCBzb21lIGNw
dXMsIHdlIG5lZWQgdG8gbWFrZSBzdXJlIHdlIGNhbg0KPiA+IGZpbmQgdGhlIGNvcnJlY3QgY3B1
IG5vZGVzIGluIHRoZSBkZXZpY2UgdHJlZSBiYXNlZCBvbiB0aGUgZ2l2ZW4NCj4gPiBsb2dpY2Fs
IGNwdSBpbmRleCBmcm9tIHRoZSBjYWxsZXIuDQo+ID4NCj4gPiBTaWduZWQtb2ZmLWJ5OiBIYWl5
aW5nIFdhbmcgPEhhaXlpbmcuV2FuZ0BmcmVlc2NhbGUuY29tPg0KPiA+IC0tLQ0KPiA+ICBkcml2
ZXJzL2lvbW11L2ZzbF9wYW11LmMgfCAgICAzICsrLQ0KPiA+ICAxIGZpbGVzIGNoYW5nZWQsIDIg
aW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkNCj4gPg0KPiA+IGRpZmYgLS1naXQgYS9kcml2
ZXJzL2lvbW11L2ZzbF9wYW11LmMgYi9kcml2ZXJzL2lvbW11L2ZzbF9wYW11LmMgaW5kZXgNCj4g
PiBjYmEwNDk4Li5hOWFiNTdiIDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvaW9tbXUvZnNsX3Bh
bXUuYw0KPiA+ICsrKyBiL2RyaXZlcnMvaW9tbXUvZnNsX3BhbXUuYw0KPiA+IEBAIC01MzksNiAr
NTM5LDcgQEAgdTMyIGdldF9zdGFzaF9pZCh1MzIgc3Rhc2hfZGVzdF9oaW50LCB1MzIgdmNwdSkN
Cj4gDQo+IFNob3VsZCBwcm9iYWJseSBhbHNvIHMvdmNwdS9jcHUvZyBhcyB2Y3B1IG1ha2VzIG5v
IHNlbnNlIG91dHNpZGUgb2YNCj4gdmlydHVhbGl6YXRpb24gY29kZS4NCj4gDQo+ID4gIAl1MzIg
Y2FjaGVfbGV2ZWw7DQo+ID4gIAlpbnQgbGVuLCBmb3VuZCA9IDA7DQo+ID4gIAlpbnQgaTsNCj4g
PiArCXUzMiBjcHVpZCA9IGdldF9oYXJkX3NtcF9wcm9jZXNzb3JfaWQodmNwdSk7DQo+IA0KPiBz
L2NwdWlkL3BoeXNfY3B1LyBvciBzaW1pbGFyDQo+IA0KPiAtU2NvdHQNCj4gDQoNCg==

Re: [PATCH] iommu/fsl_pamu: use physical cpu index to find the matched cpu nodes

[Scott Wood]

On Thu, 2013-11-14 at 21:16 -0600, Sethi Varun-B16395 wrote:
> Haiying/Scott,
> Forgot to mention this, the PAMU driver has to handle stash destination
> settings both for power and dsp cores (on B4 platform). For the dsp
> cores we would expect the physical core id (not controlled by Linux).
> To make the interface consistent, I would expect the caller (for
> iommu_set_attr) to pass the physical core id.

That sounds like you need two different interfaces.

-Scott

RE: [PATCH] iommu/fsl_pamu: use physical cpu index to find the matched cpu nodes

[Varun Sethi]

Rm9yIHRoZSBEU1AgY2FzZSBhZ2FpbiB3ZSBoYXZlIHRvIHNldCB1cCB0aGUgc3Rhc2ggYXR0cmli
dXRlLiBBcmUgeW91IHNheWluZyB0aGF0IHRoaXMgc2hvdWxkIGJlIGEgc2VwYXJhdGUgYXR0cmli
dXRlPyANCg0KLVZhcnVuDQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTog
V29vZCBTY290dC1CMDc0MjENCj4gU2VudDogVHVlc2RheSwgTm92ZW1iZXIgMTksIDIwMTMgMTow
NyBBTQ0KPiBUbzogU2V0aGkgVmFydW4tQjE2Mzk1DQo+IENjOiBXYW5nIEhhaXlpbmctUjU0OTY0
OyBqb3JvQDhieXRlcy5vcmc7IGlvbW11QGxpc3RzLmxpbnV4LQ0KPiBmb3VuZGF0aW9uLm9yZzsg
bGludXhwcGMtZGV2QGxpc3RzLm96bGFicy5vcmcNCj4gU3ViamVjdDogUmU6IFtQQVRDSF0gaW9t
bXUvZnNsX3BhbXU6IHVzZSBwaHlzaWNhbCBjcHUgaW5kZXggdG8gZmluZCB0aGUNCj4gbWF0Y2hl
ZCBjcHUgbm9kZXMNCj4gDQo+IE9uIFRodSwgMjAxMy0xMS0xNCBhdCAyMToxNiAtMDYwMCwgU2V0
aGkgVmFydW4tQjE2Mzk1IHdyb3RlOg0KPiA+IEhhaXlpbmcvU2NvdHQsDQo+ID4gRm9yZ290IHRv
IG1lbnRpb24gdGhpcywgdGhlIFBBTVUgZHJpdmVyIGhhcyB0byBoYW5kbGUgc3Rhc2gNCj4gPiBk
ZXN0aW5hdGlvbiBzZXR0aW5ncyBib3RoIGZvciBwb3dlciBhbmQgZHNwIGNvcmVzIChvbiBCNCBw
bGF0Zm9ybSkuDQo+ID4gRm9yIHRoZSBkc3AgY29yZXMgd2Ugd291bGQgZXhwZWN0IHRoZSBwaHlz
aWNhbCBjb3JlIGlkIChub3QgY29udHJvbGxlZA0KPiBieSBMaW51eCkuDQo+ID4gVG8gbWFrZSB0
aGUgaW50ZXJmYWNlIGNvbnNpc3RlbnQsIEkgd291bGQgZXhwZWN0IHRoZSBjYWxsZXIgKGZvcg0K
PiA+IGlvbW11X3NldF9hdHRyKSB0byBwYXNzIHRoZSBwaHlzaWNhbCBjb3JlIGlkLg0KPiANCj4g
VGhhdCBzb3VuZHMgbGlrZSB5b3UgbmVlZCB0d28gZGlmZmVyZW50IGludGVyZmFjZXMuDQo+IA0K
PiAtU2NvdHQNCj4gDQoNCg==

Re: [PATCH] iommu/fsl_pamu: use physical cpu index to find the matched cpu nodes

[Scott Wood]

On Mon, 2013-11-18 at 20:42 -0600, Varun Sethi wrote:
> For the DSP case again we have to set up the stash attribute. Are you saying that this should be a separate attribute?

Not necessarily a separate attribute, but there should be some way to
distinguish whether you're providing a Linux cpu number or some external
stash destination.

-Scott

RE: [PATCH] iommu/fsl_pamu: use physical cpu index to find the matched cpu nodes

[Varun Sethi]

DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogV29vZCBTY290dC1CMDc0
MjENCj4gU2VudDogVHVlc2RheSwgTm92ZW1iZXIgMTksIDIwMTMgODozNCBBTQ0KPiBUbzogU2V0
aGkgVmFydW4tQjE2Mzk1DQo+IENjOiBXYW5nIEhhaXlpbmctUjU0OTY0OyBqb3JvQDhieXRlcy5v
cmc7IGlvbW11QGxpc3RzLmxpbnV4LQ0KPiBmb3VuZGF0aW9uLm9yZzsgbGludXhwcGMtZGV2QGxp
c3RzLm96bGFicy5vcmcNCj4gU3ViamVjdDogUmU6IFtQQVRDSF0gaW9tbXUvZnNsX3BhbXU6IHVz
ZSBwaHlzaWNhbCBjcHUgaW5kZXggdG8gZmluZCB0aGUNCj4gbWF0Y2hlZCBjcHUgbm9kZXMNCj4g
DQo+IE9uIE1vbiwgMjAxMy0xMS0xOCBhdCAyMDo0MiAtMDYwMCwgVmFydW4gU2V0aGkgd3JvdGU6
DQo+ID4gRm9yIHRoZSBEU1AgY2FzZSBhZ2FpbiB3ZSBoYXZlIHRvIHNldCB1cCB0aGUgc3Rhc2gg
YXR0cmlidXRlLiBBcmUgeW91DQo+IHNheWluZyB0aGF0IHRoaXMgc2hvdWxkIGJlIGEgc2VwYXJh
dGUgYXR0cmlidXRlPw0KPiANCj4gTm90IG5lY2Vzc2FyaWx5IGEgc2VwYXJhdGUgYXR0cmlidXRl
LCBidXQgdGhlcmUgc2hvdWxkIGJlIHNvbWUgd2F5IHRvDQo+IGRpc3Rpbmd1aXNoIHdoZXRoZXIg
eW91J3JlIHByb3ZpZGluZyBhIExpbnV4IGNwdSBudW1iZXIgb3Igc29tZSBleHRlcm5hbA0KPiBz
dGFzaCBkZXN0aW5hdGlvbi4NClllcywgdGhlIGN1cnJlbnQgaWRlYSBpcyB0byB1c2UgYSBzZXBh
cmF0ZSBMMiBjYWNoZSB0eXBlIGZvciB0aGUgRFNQIGNvcmVzIChQQU1VX0RTUF9MMl9DQUNIRSku
IERTUCBjb3JlcyBjYW4gc3Rhc2ggb25seSB0byB0aGUgTDIgY2FjaGUuDQoNCi1WYXJ1bg0KDQoN
Cg==