[PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Sricharan R]

While returning EPROBE_DEFER for iommu masters
take in to account of iommu nodes that could be
marked in DT as 'status=disabled', in which case
simply return NULL and let the master's probe
continue rather than deferring.

Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Tested-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
Acked-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
---
 drivers/iommu/of_iommu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 9f44ee8..e6e9bec 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -118,6 +118,7 @@ static bool of_iommu_driver_present(struct device_node *np)
 
 	ops = iommu_ops_from_fwnode(fwnode);
 	if ((ops && !ops->of_xlate) ||
+	    !of_device_is_available(iommu_spec->np) ||
 	    (!ops && !of_iommu_driver_present(iommu_spec->np)))
 		return NULL;
 
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

[PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Sricharan R]

While returning EPROBE_DEFER for iommu masters
take in to account of iommu nodes that could be
marked in DT as 'status=disabled', in which case
simply return NULL and let the master's probe
continue rather than deferring.

Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Tested-by: Will Deacon <will.deacon@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
---
 drivers/iommu/of_iommu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 9f44ee8..e6e9bec 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -118,6 +118,7 @@ static bool of_iommu_driver_present(struct device_node *np)
 
 	ops = iommu_ops_from_fwnode(fwnode);
 	if ((ops && !ops->of_xlate) ||
+	    !of_device_is_available(iommu_spec->np) ||
 	    (!ops && !of_iommu_driver_present(iommu_spec->np)))
 		return NULL;
 
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

[PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Sricharan R]

While returning EPROBE_DEFER for iommu masters
take in to account of iommu nodes that could be
marked in DT as 'status=disabled', in which case
simply return NULL and let the master's probe
continue rather than deferring.

Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Tested-by: Will Deacon <will.deacon@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
---
 drivers/iommu/of_iommu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 9f44ee8..e6e9bec 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -118,6 +118,7 @@ static bool of_iommu_driver_present(struct device_node *np)
 
 	ops = iommu_ops_from_fwnode(fwnode);
 	if ((ops && !ops->of_xlate) ||
+	    !of_device_is_available(iommu_spec->np) ||
 	    (!ops && !of_iommu_driver_present(iommu_spec->np)))
 		return NULL;
 
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Sricharan R]

While returning EPROBE_DEFER for iommu masters
take in to account of iommu nodes that could be
marked in DT as 'status=disabled', in which case
simply return NULL and let the master's probe
continue rather than deferring.

Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Tested-by: Will Deacon <will.deacon@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
---
 drivers/iommu/of_iommu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 9f44ee8..e6e9bec 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -118,6 +118,7 @@ static bool of_iommu_driver_present(struct device_node *np)
 
 	ops = iommu_ops_from_fwnode(fwnode);
 	if ((ops && !ops->of_xlate) ||
+	    !of_device_is_available(iommu_spec->np) ||
 	    (!ops && !of_iommu_driver_present(iommu_spec->np)))
 		return NULL;
 
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

Re: [PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Jonathan Neuschäfer]

Hi, I have a few suggestions on how to make this commit message more
readable:

On Tue, May 16, 2017 at 10:54:13AM +0530, Sricharan R wrote:
> While returning EPROBE_DEFER for iommu masters

Add a comma at the end of this line

> take in to account of iommu nodes that could be

s/in to/into/
s/of iommu/of_iommu/

> marked in DT as 'status=disabled', in which case
> simply return NULL and let the master's probe
> continue rather than deferring.
> 
> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
> Tested-by: Will Deacon <will.deacon@arm.com>
> Acked-by: Will Deacon <will.deacon@arm.com>


Thanks,
Jonathan Neuschäfer

Re: [PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Jonathan Neuschäfer]

SGksIEkgaGF2ZSBhIGZldyBzdWdnZXN0aW9ucyBvbiBob3cgdG8gbWFrZSB0aGlzIGNvbW1pdCBt
ZXNzYWdlIG1vcmUKcmVhZGFibGU6CgpPbiBUdWUsIE1heSAxNiwgMjAxNyBhdCAxMDo1NDoxM0FN
ICswNTMwLCBTcmljaGFyYW4gUiB3cm90ZToKPiBXaGlsZSByZXR1cm5pbmcgRVBST0JFX0RFRkVS
IGZvciBpb21tdSBtYXN0ZXJzCgpBZGQgYSBjb21tYSBhdCB0aGUgZW5kIG9mIHRoaXMgbGluZQoK
PiB0YWtlIGluIHRvIGFjY291bnQgb2YgaW9tbXUgbm9kZXMgdGhhdCBjb3VsZCBiZQoKcy9pbiB0
by9pbnRvLwpzL29mIGlvbW11L29mX2lvbW11LwoKPiBtYXJrZWQgaW4gRFQgYXMgJ3N0YXR1cz1k
aXNhYmxlZCcsIGluIHdoaWNoIGNhc2UKPiBzaW1wbHkgcmV0dXJuIE5VTEwgYW5kIGxldCB0aGUg
bWFzdGVyJ3MgcHJvYmUKPiBjb250aW51ZSByYXRoZXIgdGhhbiBkZWZlcnJpbmcuCj4gCj4gU2ln
bmVkLW9mZi1ieTogU3JpY2hhcmFuIFIgPHNyaWNoYXJhbkBjb2RlYXVyb3JhLm9yZz4KPiBUZXN0
ZWQtYnk6IFdpbGwgRGVhY29uIDx3aWxsLmRlYWNvbkBhcm0uY29tPgo+IEFja2VkLWJ5OiBXaWxs
IERlYWNvbiA8d2lsbC5kZWFjb25AYXJtLmNvbT4KCgpUaGFua3MsCkpvbmF0aGFuIE5ldXNjaMOk
ZmVyCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51
eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVh
ZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1h
cm0ta2VybmVsCg==

[PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Jonathan Neuschäfer]

Hi, I have a few suggestions on how to make this commit message more
readable:

On Tue, May 16, 2017 at 10:54:13AM +0530, Sricharan R wrote:
> While returning EPROBE_DEFER for iommu masters

Add a comma at the end of this line

> take in to account of iommu nodes that could be

s/in to/into/
s/of iommu/of_iommu/

> marked in DT as 'status=disabled', in which case
> simply return NULL and let the master's probe
> continue rather than deferring.
> 
> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
> Tested-by: Will Deacon <will.deacon@arm.com>
> Acked-by: Will Deacon <will.deacon@arm.com>


Thanks,
Jonathan Neusch?fer

Re: [PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Sricharan R]

Hi,

On 5/16/2017 7:39 PM, Jonathan Neuschäfer wrote:
> Hi, I have a few suggestions on how to make this commit message more
> readable:
> 
> On Tue, May 16, 2017 at 10:54:13AM +0530, Sricharan R wrote:
>> While returning EPROBE_DEFER for iommu masters
> 
> Add a comma at the end of this line
> 
>> take in to account of iommu nodes that could be
> 
> s/in to/into/
> s/of iommu/of_iommu/
> 

ok, will correct the above.

Regards,
 Sricharan

>> marked in DT as 'status=disabled', in which case
>> simply return NULL and let the master's probe
>> continue rather than deferring.
>>
>> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
>> Tested-by: Will Deacon <will.deacon@arm.com>
>> Acked-by: Will Deacon <will.deacon@arm.com>
> 
> 
> Thanks,
> Jonathan Neuschäfer
> 

-- 
"QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Re: [PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Sricharan R]

Hi,

On 5/16/2017 7:39 PM, Jonathan Neuschäfer wrote:
> Hi, I have a few suggestions on how to make this commit message more
> readable:
> 
> On Tue, May 16, 2017 at 10:54:13AM +0530, Sricharan R wrote:
>> While returning EPROBE_DEFER for iommu masters
> 
> Add a comma at the end of this line
> 
>> take in to account of iommu nodes that could be
> 
> s/in to/into/
> s/of iommu/of_iommu/
> 

ok, will correct the above.

Regards,
 Sricharan

>> marked in DT as 'status=disabled', in which case
>> simply return NULL and let the master's probe
>> continue rather than deferring.
>>
>> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
>> Tested-by: Will Deacon <will.deacon@arm.com>
>> Acked-by: Will Deacon <will.deacon@arm.com>
> 
> 
> Thanks,
> Jonathan Neuschäfer
> 

-- 
"QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

Re: [PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Sricharan R]

SGksCgpPbiA1LzE2LzIwMTcgNzozOSBQTSwgSm9uYXRoYW4gTmV1c2Now6RmZXIgd3JvdGU6Cj4g
SGksIEkgaGF2ZSBhIGZldyBzdWdnZXN0aW9ucyBvbiBob3cgdG8gbWFrZSB0aGlzIGNvbW1pdCBt
ZXNzYWdlIG1vcmUKPiByZWFkYWJsZToKPiAKPiBPbiBUdWUsIE1heSAxNiwgMjAxNyBhdCAxMDo1
NDoxM0FNICswNTMwLCBTcmljaGFyYW4gUiB3cm90ZToKPj4gV2hpbGUgcmV0dXJuaW5nIEVQUk9C
RV9ERUZFUiBmb3IgaW9tbXUgbWFzdGVycwo+IAo+IEFkZCBhIGNvbW1hIGF0IHRoZSBlbmQgb2Yg
dGhpcyBsaW5lCj4gCj4+IHRha2UgaW4gdG8gYWNjb3VudCBvZiBpb21tdSBub2RlcyB0aGF0IGNv
dWxkIGJlCj4gCj4gcy9pbiB0by9pbnRvLwo+IHMvb2YgaW9tbXUvb2ZfaW9tbXUvCj4gCgpvaywg
d2lsbCBjb3JyZWN0IHRoZSBhYm92ZS4KClJlZ2FyZHMsCiBTcmljaGFyYW4KCj4+IG1hcmtlZCBp
biBEVCBhcyAnc3RhdHVzPWRpc2FibGVkJywgaW4gd2hpY2ggY2FzZQo+PiBzaW1wbHkgcmV0dXJu
IE5VTEwgYW5kIGxldCB0aGUgbWFzdGVyJ3MgcHJvYmUKPj4gY29udGludWUgcmF0aGVyIHRoYW4g
ZGVmZXJyaW5nLgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBTcmljaGFyYW4gUiA8c3JpY2hhcmFuQGNv
ZGVhdXJvcmEub3JnPgo+PiBUZXN0ZWQtYnk6IFdpbGwgRGVhY29uIDx3aWxsLmRlYWNvbkBhcm0u
Y29tPgo+PiBBY2tlZC1ieTogV2lsbCBEZWFjb24gPHdpbGwuZGVhY29uQGFybS5jb20+Cj4gCj4g
Cj4gVGhhbmtzLAo+IEpvbmF0aGFuIE5ldXNjaMOkZmVyCj4gCgotLSAKIlFVQUxDT01NIElORElB
LCBvbiBiZWhhbGYgb2YgUXVhbGNvbW0gSW5ub3ZhdGlvbiBDZW50ZXIsIEluYy4gaXMgYSBtZW1i
ZXIgb2YgQ29kZSBBdXJvcmEgRm9ydW0sIGhvc3RlZCBieSBUaGUgTGludXggRm91bmRhdGlvbgoK
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJt
LWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3Jn
Cmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtl
cm5lbAo=

[PATCH] iommu: of: Fix check for returning EPROBE_DEFER

[Sricharan R]

Hi,

On 5/16/2017 7:39 PM, Jonathan Neusch?fer wrote:
> Hi, I have a few suggestions on how to make this commit message more
> readable:
> 
> On Tue, May 16, 2017 at 10:54:13AM +0530, Sricharan R wrote:
>> While returning EPROBE_DEFER for iommu masters
> 
> Add a comma at the end of this line
> 
>> take in to account of iommu nodes that could be
> 
> s/in to/into/
> s/of iommu/of_iommu/
> 

ok, will correct the above.

Regards,
 Sricharan

>> marked in DT as 'status=disabled', in which case
>> simply return NULL and let the master's probe
>> continue rather than deferring.
>>
>> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
>> Tested-by: Will Deacon <will.deacon@arm.com>
>> Acked-by: Will Deacon <will.deacon@arm.com>
> 
> 
> Thanks,
> Jonathan Neusch?fer
> 

-- 
"QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation