[PATCH] usb: musb: sunxi: Don't print error on MUSB_ULPI_BUSCONTROL access

[PATCH] usb: musb: sunxi: Don't print error on MUSB_ULPI_BUSCONTROL access

[Roman Stratiienko]

Error message appears during suspend, where musb driver is storing
the register state in musb_save_context():
```
musb-sunxi 1c19000.usb: Error unknown readb offset 112
```

Print warning instead to avoid confusion.

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
---
 drivers/usb/musb/sunxi.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index f3f76f2ac63f9b..961c858fb349e1 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -440,6 +440,10 @@ static u8 sunxi_musb_readb(void __iomem *addr, u32 offset)
 				return 0xde;
 
 			return readb(addr + SUNXI_MUSB_CONFIGDATA);
+		case MUSB_ULPI_BUSCONTROL:
+			dev_warn(sunxi_musb->controller->parent,
+				"sunxi-musb does not have ULPI bus control register\n");
+			return 0;
 		/* Offset for these is fixed by sunxi_musb_busctl_offset() */
 		case SUNXI_MUSB_TXFUNCADDR:
 		case SUNXI_MUSB_TXHUBADDR:
@@ -494,6 +498,10 @@ static void sunxi_musb_writeb(void __iomem *addr, unsigned offset, u8 data)
 			return writeb(data, addr + SUNXI_MUSB_TXFIFOSZ);
 		case MUSB_RXFIFOSZ:
 			return writeb(data, addr + SUNXI_MUSB_RXFIFOSZ);
+		case MUSB_ULPI_BUSCONTROL:
+			dev_warn(sunxi_musb->controller->parent,
+				"sunxi-musb does not have ULPI bus control register\n");
+			return;
 		/* Offset for these is fixed by sunxi_musb_busctl_offset() */
 		case SUNXI_MUSB_TXFUNCADDR:
 		case SUNXI_MUSB_TXHUBADDR:
-- 
2.30.2

Re: [PATCH] usb: musb: sunxi: Don't print error on MUSB_ULPI_BUSCONTROL access

[Jernej Škrabec]

Hi Roman,

sorry for late reply.

Dne torek, 19. oktober 2021 ob 15:12:44 CET je Roman Stratiienko napisal(a):
> Error message appears during suspend, where musb driver is storing
> the register state in musb_save_context():
> ```
> musb-sunxi 1c19000.usb: Error unknown readb offset 112
> ```
> 
> Print warning instead to avoid confusion.
> 
> Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
> ---
>  drivers/usb/musb/sunxi.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
> index f3f76f2ac63f9b..961c858fb349e1 100644
> --- a/drivers/usb/musb/sunxi.c
> +++ b/drivers/usb/musb/sunxi.c
> @@ -440,6 +440,10 @@ static u8 sunxi_musb_readb(void __iomem *addr, u32 
offset)
>  				return 0xde;
>  
>  			return readb(addr + SUNXI_MUSB_CONFIGDATA);
> +		case MUSB_ULPI_BUSCONTROL:
> +			dev_warn(sunxi_musb->controller->parent,
> +				"sunxi-musb does not have ULPI bus 
control register\n");

Since this register doesn't exist, wouldn't be better to print only debug 
message? Warning would imply something that's out of the ordinary, but in this 
case it's benign.

> +			return 0;
>  		/* Offset for these is fixed by sunxi_musb_busctl_offset() 
*/
>  		case SUNXI_MUSB_TXFUNCADDR:
>  		case SUNXI_MUSB_TXHUBADDR:
> @@ -494,6 +498,10 @@ static void sunxi_musb_writeb(void __iomem *addr, 
unsigned offset, u8 data)
>  			return writeb(data, addr + 
SUNXI_MUSB_TXFIFOSZ);
>  		case MUSB_RXFIFOSZ:
>  			return writeb(data, addr + 
SUNXI_MUSB_RXFIFOSZ);
> +		case MUSB_ULPI_BUSCONTROL:
> +			dev_warn(sunxi_musb->controller->parent,
> +				"sunxi-musb does not have ULPI bus 
control register\n");
> +			return;
>  		/* Offset for these is fixed by sunxi_musb_busctl_offset() 
*/

Same here.

Best regards,
Jernej

>  		case SUNXI_MUSB_TXFUNCADDR:
>  		case SUNXI_MUSB_TXHUBADDR:
> -- 
> 2.30.2
> 
>