[PATCH v2] bus: mhi: core: Add missing checks for MMIO register entries

[PATCH v2] bus: mhi: core: Add missing checks for MMIO register entries

[Bhaumik Bhatt]

As per documentation, fields marked as (required) in an MHI
controller structure need to be populated by the controller driver
before calling mhi_register_controller(). Ensure all required
pointers and non-zero fields are present in the controller before
proceeding with registration.

Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
---
 drivers/bus/mhi/core/init.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index 272f350..fed8a25 100644
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -879,10 +879,9 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
 	u32 soc_info;
 	int ret, i;
 
-	if (!mhi_cntrl)
-		return -EINVAL;
-
-	if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put ||
+	if (!mhi_cntrl || !mhi_cntrl->cntrl_dev || !mhi_cntrl->regs ||
+	    !mhi_cntrl->fw_image || !mhi_cntrl->irq ||
+	    !mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put ||
 	    !mhi_cntrl->status_cb || !mhi_cntrl->read_reg ||
 	    !mhi_cntrl->write_reg || !mhi_cntrl->nr_irqs)
 		return -EINVAL;
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH v2] bus: mhi: core: Add missing checks for MMIO register entries

[Bhaumik Bhatt]

On 2021-03-05 09:11 AM, Loic Poulain wrote:
> On Thu, 4 Mar 2021 at 23:14, Bhaumik Bhatt <bbhatt@codeaurora.org> 
> wrote:
>> 
>> As per documentation, fields marked as (required) in an MHI
>> controller structure need to be populated by the controller driver
>> before calling mhi_register_controller(). Ensure all required
>> pointers and non-zero fields are present in the controller before
>> proceeding with registration.
>> 
>> Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
>> ---
>>  drivers/bus/mhi/core/init.c | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>> 
>> diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
>> index 272f350..fed8a25 100644
>> --- a/drivers/bus/mhi/core/init.c
>> +++ b/drivers/bus/mhi/core/init.c
>> @@ -879,10 +879,9 @@ int mhi_register_controller(struct mhi_controller 
>> *mhi_cntrl,
>>         u32 soc_info;
>>         int ret, i;
>> 
>> -       if (!mhi_cntrl)
>> -               return -EINVAL;
>> -
>> -       if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put ||
>> +       if (!mhi_cntrl || !mhi_cntrl->cntrl_dev || !mhi_cntrl->regs ||
>> +           !mhi_cntrl->fw_image || !mhi_cntrl->irq ||
> 
> Can we make fw_image optional, not all MHI devices are flashless, some
> directly boot into AMSS without firmware loading.
> 
Haha. Just as I posted this, I thought of the same thing. I agree. v3 
incoming.

Also, that patch will be a separate one so I can just remove FW image 
from here
and post the patch to make FW image optional.
>> +           !mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put ||
>>             !mhi_cntrl->status_cb || !mhi_cntrl->read_reg ||
>>             !mhi_cntrl->write_reg || !mhi_cntrl->nr_irqs)
>>                 return -EINVAL;
>> --
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora 
>> Forum,
>> a Linux Foundation Collaborative Project
>> 

Thanks,
Bhaumik
---
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora 
Forum,
a Linux Foundation Collaborative Project

Re: [PATCH v2] bus: mhi: core: Add missing checks for MMIO register entries

[Loic Poulain]

On Thu, 4 Mar 2021 at 23:14, Bhaumik Bhatt <bbhatt@codeaurora.org> wrote:
>
> As per documentation, fields marked as (required) in an MHI
> controller structure need to be populated by the controller driver
> before calling mhi_register_controller(). Ensure all required
> pointers and non-zero fields are present in the controller before
> proceeding with registration.
>
> Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
> ---
>  drivers/bus/mhi/core/init.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
> index 272f350..fed8a25 100644
> --- a/drivers/bus/mhi/core/init.c
> +++ b/drivers/bus/mhi/core/init.c
> @@ -879,10 +879,9 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
>         u32 soc_info;
>         int ret, i;
>
> -       if (!mhi_cntrl)
> -               return -EINVAL;
> -
> -       if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put ||
> +       if (!mhi_cntrl || !mhi_cntrl->cntrl_dev || !mhi_cntrl->regs ||
> +           !mhi_cntrl->fw_image || !mhi_cntrl->irq ||

Can we make fw_image optional, not all MHI devices are flashless, some
directly boot into AMSS without firmware loading.

> +           !mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put ||
>             !mhi_cntrl->status_cb || !mhi_cntrl->read_reg ||
>             !mhi_cntrl->write_reg || !mhi_cntrl->nr_irqs)
>                 return -EINVAL;
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>