After the SMMU translation is disabled in the
arm-smmu shutdown callback during reboot, if
any subsystem are still alive then IOVAs they
are using will become PAs on bus, which may
lead to crash.
Below are the consumers of smmu from venus
arm-smmu: consumer: aa00000.video-codec supplier=15000000.iommu
arm-smmu: consumer: video-firmware.0 supplier=15000000.iommu
So implemented shutdown callback, which detach iommu maps.
Change-Id: I0f0f331056e0b84b92f1d86f66618d4b1caaa24a
Signed-off-by: Mansur Alisha Shaik <[email protected]>
---
drivers/media/platform/qcom/venus/core.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 30d4b9e..acf798c 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -371,6 +371,14 @@ static int venus_remove(struct platform_device *pdev)
return ret;
}
+static void venus_core_shutdown(struct platform_device *pdev)
+{
+ int ret;
+
+ ret = venus_remove(pdev);
+ WARN_ON(ret < 0);
+}
+
static __maybe_unused int venus_runtime_suspend(struct device *dev)
{
struct venus_core *core = dev_get_drvdata(dev);
@@ -628,6 +636,7 @@ static struct platform_driver qcom_venus_driver = {
.of_match_table = venus_dt_match,
.pm = &venus_pm_ops,
},
+ .shutdown = venus_core_shutdown,
};
module_platform_driver(qcom_venus_driver);
--
2.7.4
Hi Mansur,
Thanks for the patch!
How you test this? Is it enough to start playback and issue reboot (did
you test with reboot -f) ?
On 6/13/20 1:33 PM, Mansur Alisha Shaik wrote:
> After the SMMU translation is disabled in the
> arm-smmu shutdown callback during reboot, if
> any subsystem are still alive then IOVAs they
> are using will become PAs on bus, which may
> lead to crash.
>
> Below are the consumers of smmu from venus
> arm-smmu: consumer: aa00000.video-codec supplier=15000000.iommu
> arm-smmu: consumer: video-firmware.0 supplier=15000000.iommu
>
> So implemented shutdown callback, which detach iommu maps.
>
> Change-Id: I0f0f331056e0b84b92f1d86f66618d4b1caaa24a
> Signed-off-by: Mansur Alisha Shaik <[email protected]>
> ---
> drivers/media/platform/qcom/venus/core.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index 30d4b9e..acf798c 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -371,6 +371,14 @@ static int venus_remove(struct platform_device *pdev)
> return ret;
> }
>
> +static void venus_core_shutdown(struct platform_device *pdev)
> +{
> + int ret;
> +
> + ret = venus_remove(pdev);
> + WARN_ON(ret < 0);
> +}
> +
> static __maybe_unused int venus_runtime_suspend(struct device *dev)
> {
> struct venus_core *core = dev_get_drvdata(dev);
> @@ -628,6 +636,7 @@ static struct platform_driver qcom_venus_driver = {
> .of_match_table = venus_dt_match,
> .pm = &venus_pm_ops,
> },
> + .shutdown = venus_core_shutdown,
> };
> module_platform_driver(qcom_venus_driver);
>
>
--
regards,
Stan
Hi Stan,
> On 2020-06-13 17:43, Stanimir Varbanov wrote:
>> Hi Mansur,
>>
>> Thanks for the patch!
>>
>> How you test this? Is it enough to start playback and issue reboot
>> (did
>> you test with reboot -f) ?
Yes, I have tested it with "reboot -f" and started video playback
(YouTube browser and local video)
and issue reboot command.
>> On 6/13/20 1:33 PM, Mansur Alisha Shaik wrote:
>>> After the SMMU translation is disabled in the
>>> arm-smmu shutdown callback during reboot, if
>>> any subsystem are still alive then IOVAs they
>>> are using will become PAs on bus, which may
>>> lead to crash.
>>>
>>> Below are the consumers of smmu from venus
>>> arm-smmu: consumer: aa00000.video-codec supplier=15000000.iommu
>>> arm-smmu: consumer: video-firmware.0 supplier=15000000.iommu
>>>
>>> So implemented shutdown callback, which detach iommu maps.
>>>
>>> Change-Id: I0f0f331056e0b84b92f1d86f66618d4b1caaa24a
>>> Signed-off-by: Mansur Alisha Shaik <[email protected]>
>>> ---
>>> drivers/media/platform/qcom/venus/core.c | 9 +++++++++
>>> 1 file changed, 9 insertions(+)
>>>
>>> diff --git a/drivers/media/platform/qcom/venus/core.c
>>> b/drivers/media/platform/qcom/venus/core.c
>>> index 30d4b9e..acf798c 100644
>>> --- a/drivers/media/platform/qcom/venus/core.c
>>> +++ b/drivers/media/platform/qcom/venus/core.c
>>> @@ -371,6 +371,14 @@ static int venus_remove(struct platform_device
>>> *pdev)
>>> return ret;
>>> }
>>>
>>> +static void venus_core_shutdown(struct platform_device *pdev)
>>> +{
>>> + int ret;
>>> +
>>> + ret = venus_remove(pdev);
>>> + WARN_ON(ret < 0);
>>> +}
>>> +
>>> static __maybe_unused int venus_runtime_suspend(struct device *dev)
>>> {
>>> struct venus_core *core = dev_get_drvdata(dev);
>>> @@ -628,6 +636,7 @@ static struct platform_driver qcom_venus_driver =
>>> {
>>> .of_match_table = venus_dt_match,
>>> .pm = &venus_pm_ops,
>>> },
>>> + .shutdown = venus_core_shutdown,
>>> };
>>> module_platform_driver(qcom_venus_driver);
>>>
>>>
Thank,
Mansur
Hi Mansur,
On 2020-06-13 16:03, Mansur Alisha Shaik wrote:
> After the SMMU translation is disabled in the
> arm-smmu shutdown callback during reboot, if
> any subsystem are still alive then IOVAs they
> are using will become PAs on bus, which may
> lead to crash.
>
> Below are the consumers of smmu from venus
> arm-smmu: consumer: aa00000.video-codec supplier=15000000.iommu
> arm-smmu: consumer: video-firmware.0 supplier=15000000.iommu
>
> So implemented shutdown callback, which detach iommu maps.
>
> Change-Id: I0f0f331056e0b84b92f1d86f66618d4b1caaa24a
> Signed-off-by: Mansur Alisha Shaik <[email protected]>
> ---
> drivers/media/platform/qcom/venus/core.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/media/platform/qcom/venus/core.c
> b/drivers/media/platform/qcom/venus/core.c
> index 30d4b9e..acf798c 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -371,6 +371,14 @@ static int venus_remove(struct platform_device
> *pdev)
> return ret;
> }
>
> +static void venus_core_shutdown(struct platform_device *pdev)
> +{
> + int ret;
> +
> + ret = venus_remove(pdev);
> + WARN_ON(ret < 0);
I don't think you should warn here, its shutdown path and you can't
do anything with this WARN unlike remove callback where you have
to be sure to cleanup properly so that you are able to reload module.
But if you still want a hint about this failure, then just add a
dev_err()
to indicate the failure instead of a big stack trace spamming kernel
log.
Thanks,
Sai
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a
member
of Code Aurora Forum, hosted by The Linux Foundation
Hi Sai,
> On 2020-06-24 12:17, Sai Prakash Ranjan wrote:
>> Hi Mansur,
>>
>> On 2020-06-13 16:03, Mansur Alisha Shaik wrote:
>>> After the SMMU translation is disabled in the
>>> arm-smmu shutdown callback during reboot, if
>>> any subsystem are still alive then IOVAs they
>>> are using will become PAs on bus, which may
>>> lead to crash.
>>>
>>> Below are the consumers of smmu from venus
>>> arm-smmu: consumer: aa00000.video-codec supplier=15000000.iommu
>>> arm-smmu: consumer: video-firmware.0 supplier=15000000.iommu
>>>
>>> So implemented shutdown callback, which detach iommu maps.
>>>
>>> Change-Id: I0f0f331056e0b84b92f1d86f66618d4b1caaa24a
>>> Signed-off-by: Mansur Alisha Shaik <[email protected]>
>>> ---
>>> drivers/media/platform/qcom/venus/core.c | 9 +++++++++
>>> 1 file changed, 9 insertions(+)
>>>
>>> diff --git a/drivers/media/platform/qcom/venus/core.c
>>> b/drivers/media/platform/qcom/venus/core.c
>>> index 30d4b9e..acf798c 100644
>>> --- a/drivers/media/platform/qcom/venus/core.c
>>> +++ b/drivers/media/platform/qcom/venus/core.c
>>> @@ -371,6 +371,14 @@ static int venus_remove(struct platform_device
>>> *pdev)
>>> return ret;
>>> }
>>>
>>> +static void venus_core_shutdown(struct platform_device *pdev)
>>> +{
>>> + int ret;
>>> +
>>> + ret = venus_remove(pdev);
>>> + WARN_ON(ret < 0);
>>
>> I don't think you should warn here, its shutdown path and you can't
>> do anything with this WARN unlike remove callback where you have
>> to be sure to cleanup properly so that you are able to reload module.
>> But if you still want a hint about this failure, then just add a
>> dev_err()
>> to indicate the failure instead of a big stack trace spamming kernel
>> log.
>>
posted V2 version by adding dev_warn during shutdown failure instead of
WARN_ON.
V2 version : https://lore.kernel.org/patchwork/patch/1284693/
>> Thanks,
>> Sai
---
Thanks,
Mansur