[PATCH] usb: dwc3: dwc3-qcom: Fix registration when tx-fifo-resize exists

[PATCH] usb: dwc3: dwc3-qcom: Fix registration when tx-fifo-resize exists

[Baruch Siach]

Commit cefdd52fa04 ("usb: dwc3: dwc3-qcom: Enable tx-fifo-resize
property by default") added the tx-fifo-resize property. But when this
property exists already, of_add_property() fails with -EEXIST, thus
breaking core registration. This regresses the IPQ6018 platform that has
tx-fifo-resize in its device-tree.

Don't fail when tx-fifo-resize exists.

Fixes: cefdd52fa045 ("usb: dwc3: dwc3-qcom: Enable tx-fifo-resize property by default")
Cc: Wesley Cheng <wcheng@codeaurora.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 drivers/usb/dwc3/dwc3-qcom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 9abbd01028c5..bbd8e401a82c 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -667,7 +667,7 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)
 
 	prop->name = "tx-fifo-resize";
 	ret = of_add_property(dwc3_np, prop);
-	if (ret) {
+	if (ret && ret != -EEXIST) {
 		dev_err(dev, "unable to add property\n");
 		goto node_put;
 	}
-- 
2.33.0

Re: [PATCH] usb: dwc3: dwc3-qcom: Fix registration when tx-fifo-resize exists

[Greg Kroah-Hartman]

On Sun, Dec 05, 2021 at 12:45:45PM +0200, Baruch Siach wrote:
> Commit cefdd52fa04 ("usb: dwc3: dwc3-qcom: Enable tx-fifo-resize
> property by default") added the tx-fifo-resize property. But when this
> property exists already, of_add_property() fails with -EEXIST, thus
> breaking core registration. This regresses the IPQ6018 platform that has
> tx-fifo-resize in its device-tree.
> 
> Don't fail when tx-fifo-resize exists.
> 
> Fixes: cefdd52fa045 ("usb: dwc3: dwc3-qcom: Enable tx-fifo-resize property by default")
> Cc: Wesley Cheng <wcheng@codeaurora.org>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  drivers/usb/dwc3/dwc3-qcom.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> index 9abbd01028c5..bbd8e401a82c 100644
> --- a/drivers/usb/dwc3/dwc3-qcom.c
> +++ b/drivers/usb/dwc3/dwc3-qcom.c
> @@ -667,7 +667,7 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)
>  
>  	prop->name = "tx-fifo-resize";
>  	ret = of_add_property(dwc3_np, prop);
> -	if (ret) {
> +	if (ret && ret != -EEXIST) {
>  		dev_err(dev, "unable to add property\n");
>  		goto node_put;
>  	}
> -- 
> 2.33.0
> 

This commit does not apply to my tree at all.  What tree/branch did you
make it against?

thanks,

greg k-h

Re: [PATCH] usb: dwc3: dwc3-qcom: Fix registration when tx-fifo-resize exists

[Baruch Siach]

Hi Greg,

On Fri, Dec 17 2021, Greg Kroah-Hartman wrote:
> On Sun, Dec 05, 2021 at 12:45:45PM +0200, Baruch Siach wrote:
>> Commit cefdd52fa04 ("usb: dwc3: dwc3-qcom: Enable tx-fifo-resize
>> property by default") added the tx-fifo-resize property. But when this
>> property exists already, of_add_property() fails with -EEXIST, thus
>> breaking core registration. This regresses the IPQ6018 platform that has
>> tx-fifo-resize in its device-tree.
>> 
>> Don't fail when tx-fifo-resize exists.
>> 
>> Fixes: cefdd52fa045 ("usb: dwc3: dwc3-qcom: Enable tx-fifo-resize property by default")
>> Cc: Wesley Cheng <wcheng@codeaurora.org>
>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>> ---
>>  drivers/usb/dwc3/dwc3-qcom.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
>> index 9abbd01028c5..bbd8e401a82c 100644
>> --- a/drivers/usb/dwc3/dwc3-qcom.c
>> +++ b/drivers/usb/dwc3/dwc3-qcom.c
>> @@ -667,7 +667,7 @@ static int dwc3_qcom_of_register_core(struct platform_device *pdev)
>>  
>>  	prop->name = "tx-fifo-resize";
>>  	ret = of_add_property(dwc3_np, prop);
>> -	if (ret) {
>> +	if (ret && ret != -EEXIST) {
>>  		dev_err(dev, "unable to add property\n");
>>  		goto node_put;
>>  	}
>
> This commit does not apply to my tree at all.  What tree/branch did you
> make it against?

This is against v5.16-rc3. As of -rc5 commit 6a97cee39d reverted the
offending commit. So all is good now.

Thanks,
baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -