All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH RESEND 0/3] usb: gadget: udc: atmel: assorted fixes
@ 2020-07-08 18:04 ` Michał Mirosław
  0 siblings, 0 replies; 20+ messages in thread
From: Michał Mirosław @ 2020-07-08 18:04 UTC (permalink / raw)
  To: Alexandre Belloni, Cristian Birsan, Felipe Balbi,
	Greg Kroah-Hartman, Ludovic Desroches, Nicolas Ferre, Songjun Wu
  Cc: linux-arm-kernel, linux-kernel, linux-usb

Two trivial fixes and .pullup implementation for Atmel UDC driver to
make composite gadget happy when handling reconfiguration.

Michał Mirosław (3):
  usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable()
  usb: gadget: udc: atmel: fix uninitialized read in debug printk
  usb: gadget: udc: atmel: implement .pullup callback

 drivers/usb/gadget/udc/atmel_usba_udc.c | 30 ++++++++++++++++++-------
 1 file changed, 22 insertions(+), 8 deletions(-)

-- 
2.20.1


^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH RESEND 0/3] usb: gadget: udc: atmel: assorted fixes
@ 2020-07-08 18:04 ` Michał Mirosław
  0 siblings, 0 replies; 20+ messages in thread
From: Michał Mirosław @ 2020-07-08 18:04 UTC (permalink / raw)
  To: Alexandre Belloni, Cristian Birsan, Felipe Balbi,
	Greg Kroah-Hartman, Ludovic Desroches, Nicolas Ferre, Songjun Wu
  Cc: linux-usb, linux-kernel, linux-arm-kernel

Two trivial fixes and .pullup implementation for Atmel UDC driver to
make composite gadget happy when handling reconfiguration.

Michał Mirosław (3):
  usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable()
  usb: gadget: udc: atmel: fix uninitialized read in debug printk
  usb: gadget: udc: atmel: implement .pullup callback

 drivers/usb/gadget/udc/atmel_usba_udc.c | 30 ++++++++++++++++++-------
 1 file changed, 22 insertions(+), 8 deletions(-)

-- 
2.20.1


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

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH RESEND 2/3] usb: gadget: udc: atmel: fix uninitialized read in debug printk
  2020-07-08 18:04 ` Michał Mirosław
@ 2020-07-08 18:04   ` Michał Mirosław
  -1 siblings, 0 replies; 20+ messages in thread
From: Michał Mirosław @ 2020-07-08 18:04 UTC (permalink / raw)
  To: Alexandre Belloni, Cristian Birsan, Felipe Balbi,
	Greg Kroah-Hartman, Ludovic Desroches, Nicolas Ferre, Songjun Wu
  Cc: linux-arm-kernel, linux-kernel, linux-usb

Fixed commit moved the assignment of 'req', but did not update a
reference in the DBG() call. Use the argument as it was renamed.

Fixes: 5fb694f96e7c ("usb: gadget: udc: atmel: fix possible oops when unloading module")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 9153e220848d..9342a3d24963 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -865,7 +865,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 	u32 status;
 
 	DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %p\n",
-			ep->ep.name, req);
+			ep->ep.name, _req);
 
 	spin_lock_irqsave(&udc->lock, flags);
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH RESEND 1/3] usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable()
  2020-07-08 18:04 ` Michał Mirosław
@ 2020-07-08 18:04   ` Michał Mirosław
  -1 siblings, 0 replies; 20+ messages in thread
From: Michał Mirosław @ 2020-07-08 18:04 UTC (permalink / raw)
  To: Alexandre Belloni, Cristian Birsan, Felipe Balbi,
	Greg Kroah-Hartman, Ludovic Desroches, Nicolas Ferre, Songjun Wu
  Cc: linux-arm-kernel, linux-kernel, linux-usb

Fixed commit removed the offending behaviour from the driver, but missed
the comment and associated test. Remove them now.

Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index d69f61ff0181..9153e220848d 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
 
 	if (!ep->ep.desc) {
 		spin_unlock_irqrestore(&udc->lock, flags);
-		/* REVISIT because this driver disables endpoints in
-		 * reset_all_endpoints() before calling disconnect(),
-		 * most gadget drivers would trigger this non-error ...
-		 */
-		if (udc->gadget.speed != USB_SPEED_UNKNOWN)
-			DBG(DBG_ERR, "ep_disable: %s not enabled\n",
-					ep->ep.name);
+		DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name);
 		return -EINVAL;
 	}
 	ep->ep.desc = NULL;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH RESEND 2/3] usb: gadget: udc: atmel: fix uninitialized read in debug printk
@ 2020-07-08 18:04   ` Michał Mirosław
  0 siblings, 0 replies; 20+ messages in thread
From: Michał Mirosław @ 2020-07-08 18:04 UTC (permalink / raw)
  To: Alexandre Belloni, Cristian Birsan, Felipe Balbi,
	Greg Kroah-Hartman, Ludovic Desroches, Nicolas Ferre, Songjun Wu
  Cc: linux-usb, linux-kernel, linux-arm-kernel

Fixed commit moved the assignment of 'req', but did not update a
reference in the DBG() call. Use the argument as it was renamed.

Fixes: 5fb694f96e7c ("usb: gadget: udc: atmel: fix possible oops when unloading module")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 9153e220848d..9342a3d24963 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -865,7 +865,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 	u32 status;
 
 	DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %p\n",
-			ep->ep.name, req);
+			ep->ep.name, _req);
 
 	spin_lock_irqsave(&udc->lock, flags);
 
-- 
2.20.1


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

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH RESEND 1/3] usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable()
@ 2020-07-08 18:04   ` Michał Mirosław
  0 siblings, 0 replies; 20+ messages in thread
From: Michał Mirosław @ 2020-07-08 18:04 UTC (permalink / raw)
  To: Alexandre Belloni, Cristian Birsan, Felipe Balbi,
	Greg Kroah-Hartman, Ludovic Desroches, Nicolas Ferre, Songjun Wu
  Cc: linux-usb, linux-kernel, linux-arm-kernel

Fixed commit removed the offending behaviour from the driver, but missed
the comment and associated test. Remove them now.

Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index d69f61ff0181..9153e220848d 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
 
 	if (!ep->ep.desc) {
 		spin_unlock_irqrestore(&udc->lock, flags);
-		/* REVISIT because this driver disables endpoints in
-		 * reset_all_endpoints() before calling disconnect(),
-		 * most gadget drivers would trigger this non-error ...
-		 */
-		if (udc->gadget.speed != USB_SPEED_UNKNOWN)
-			DBG(DBG_ERR, "ep_disable: %s not enabled\n",
-					ep->ep.name);
+		DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name);
 		return -EINVAL;
 	}
 	ep->ep.desc = NULL;
-- 
2.20.1


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

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback
  2020-07-08 18:04 ` Michał Mirosław
@ 2020-07-08 18:04   ` Michał Mirosław
  -1 siblings, 0 replies; 20+ messages in thread
From: Michał Mirosław @ 2020-07-08 18:04 UTC (permalink / raw)
  To: Alexandre Belloni, Cristian Birsan, Felipe Balbi,
	Greg Kroah-Hartman, Ludovic Desroches, Nicolas Ferre, Songjun Wu
  Cc: linux-arm-kernel, linux-kernel, linux-usb

Implement udc->pullup callback, so that udc_connect/disconnect work.
This is needed for composite gadget, as it assumes udc_disconnect()
actually works and calls its ->disconnect callback.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 9342a3d24963..c5128c229c52 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -1028,6 +1028,7 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
 	return 0;
 }
 
+static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on);
 static int atmel_usba_start(struct usb_gadget *gadget,
 		struct usb_gadget_driver *driver);
 static int atmel_usba_stop(struct usb_gadget *gadget);
@@ -1101,6 +1102,7 @@ static const struct usb_gadget_ops usba_udc_ops = {
 	.get_frame		= usba_udc_get_frame,
 	.wakeup			= usba_udc_wakeup,
 	.set_selfpowered	= usba_udc_set_selfpowered,
+	.pullup			= atmel_usba_pullup,
 	.udc_start		= atmel_usba_start,
 	.udc_stop		= atmel_usba_stop,
 	.match_ep		= atmel_usba_match_ep,
@@ -1957,6 +1959,24 @@ static irqreturn_t usba_vbus_irq_thread(int irq, void *devid)
 	return IRQ_HANDLED;
 }
 
+static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on)
+{
+	struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
+	unsigned long flags;
+	u32 ctrl;
+
+	spin_lock_irqsave(&udc->lock, flags);
+	ctrl = usba_readl(udc, CTRL);
+	if (is_on)
+		ctrl &= ~USBA_DETACH;
+	else
+		ctrl |= USBA_DETACH;
+	usba_writel(udc, CTRL, ctrl);
+	spin_unlock_irqrestore(&udc->lock, flags);
+
+	return 0;
+}
+
 static int atmel_usba_start(struct usb_gadget *gadget,
 		struct usb_gadget_driver *driver)
 {
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback
@ 2020-07-08 18:04   ` Michał Mirosław
  0 siblings, 0 replies; 20+ messages in thread
From: Michał Mirosław @ 2020-07-08 18:04 UTC (permalink / raw)
  To: Alexandre Belloni, Cristian Birsan, Felipe Balbi,
	Greg Kroah-Hartman, Ludovic Desroches, Nicolas Ferre, Songjun Wu
  Cc: linux-usb, linux-kernel, linux-arm-kernel

Implement udc->pullup callback, so that udc_connect/disconnect work.
This is needed for composite gadget, as it assumes udc_disconnect()
actually works and calls its ->disconnect callback.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 9342a3d24963..c5128c229c52 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -1028,6 +1028,7 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
 	return 0;
 }
 
+static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on);
 static int atmel_usba_start(struct usb_gadget *gadget,
 		struct usb_gadget_driver *driver);
 static int atmel_usba_stop(struct usb_gadget *gadget);
@@ -1101,6 +1102,7 @@ static const struct usb_gadget_ops usba_udc_ops = {
 	.get_frame		= usba_udc_get_frame,
 	.wakeup			= usba_udc_wakeup,
 	.set_selfpowered	= usba_udc_set_selfpowered,
+	.pullup			= atmel_usba_pullup,
 	.udc_start		= atmel_usba_start,
 	.udc_stop		= atmel_usba_stop,
 	.match_ep		= atmel_usba_match_ep,
@@ -1957,6 +1959,24 @@ static irqreturn_t usba_vbus_irq_thread(int irq, void *devid)
 	return IRQ_HANDLED;
 }
 
+static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on)
+{
+	struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
+	unsigned long flags;
+	u32 ctrl;
+
+	spin_lock_irqsave(&udc->lock, flags);
+	ctrl = usba_readl(udc, CTRL);
+	if (is_on)
+		ctrl &= ~USBA_DETACH;
+	else
+		ctrl |= USBA_DETACH;
+	usba_writel(udc, CTRL, ctrl);
+	spin_unlock_irqrestore(&udc->lock, flags);
+
+	return 0;
+}
+
 static int atmel_usba_start(struct usb_gadget *gadget,
 		struct usb_gadget_driver *driver)
 {
-- 
2.20.1


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

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 1/3] usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable()
  2020-07-08 18:04   ` Michał Mirosław
@ 2020-07-15 21:44     ` Alexandre Belloni
  -1 siblings, 0 replies; 20+ messages in thread
From: Alexandre Belloni @ 2020-07-15 21:44 UTC (permalink / raw)
  To: Michał Mirosław
  Cc: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman,
	Ludovic Desroches, Nicolas Ferre, Songjun Wu, linux-arm-kernel,
	linux-kernel, linux-usb

On 08/07/2020 20:04:09+0200, Michał Mirosław wrote:
> Fixed commit removed the offending behaviour from the driver, but missed
> the comment and associated test. Remove them now.
> 
> Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own")
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
>  drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
> index d69f61ff0181..9153e220848d 100644
> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
> @@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
>  
>  	if (!ep->ep.desc) {
>  		spin_unlock_irqrestore(&udc->lock, flags);
> -		/* REVISIT because this driver disables endpoints in
> -		 * reset_all_endpoints() before calling disconnect(),
> -		 * most gadget drivers would trigger this non-error ...
> -		 */
> -		if (udc->gadget.speed != USB_SPEED_UNKNOWN)
> -			DBG(DBG_ERR, "ep_disable: %s not enabled\n",
> -					ep->ep.name);
> +		DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name);
>  		return -EINVAL;
>  	}
>  	ep->ep.desc = NULL;
> -- 
> 2.20.1
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 1/3] usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable()
@ 2020-07-15 21:44     ` Alexandre Belloni
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Belloni @ 2020-07-15 21:44 UTC (permalink / raw)
  To: Michał Mirosław
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel,
	Ludovic Desroches, linux-arm-kernel, Songjun Wu, Cristian Birsan

On 08/07/2020 20:04:09+0200, Michał Mirosław wrote:
> Fixed commit removed the offending behaviour from the driver, but missed
> the comment and associated test. Remove them now.
> 
> Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own")
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
>  drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
> index d69f61ff0181..9153e220848d 100644
> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
> @@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
>  
>  	if (!ep->ep.desc) {
>  		spin_unlock_irqrestore(&udc->lock, flags);
> -		/* REVISIT because this driver disables endpoints in
> -		 * reset_all_endpoints() before calling disconnect(),
> -		 * most gadget drivers would trigger this non-error ...
> -		 */
> -		if (udc->gadget.speed != USB_SPEED_UNKNOWN)
> -			DBG(DBG_ERR, "ep_disable: %s not enabled\n",
> -					ep->ep.name);
> +		DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name);
>  		return -EINVAL;
>  	}
>  	ep->ep.desc = NULL;
> -- 
> 2.20.1
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 2/3] usb: gadget: udc: atmel: fix uninitialized read in debug printk
  2020-07-08 18:04   ` Michał Mirosław
@ 2020-07-15 21:45     ` Alexandre Belloni
  -1 siblings, 0 replies; 20+ messages in thread
From: Alexandre Belloni @ 2020-07-15 21:45 UTC (permalink / raw)
  To: Michał Mirosław
  Cc: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman,
	Ludovic Desroches, Nicolas Ferre, Songjun Wu, linux-arm-kernel,
	linux-kernel, linux-usb

On 08/07/2020 20:04:09+0200, Michał Mirosław wrote:
> Fixed commit moved the assignment of 'req', but did not update a
> reference in the DBG() call. Use the argument as it was renamed.
> 
> Fixes: 5fb694f96e7c ("usb: gadget: udc: atmel: fix possible oops when unloading module")
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
>  drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
> index 9153e220848d..9342a3d24963 100644
> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
> @@ -865,7 +865,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
>  	u32 status;
>  
>  	DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %p\n",
> -			ep->ep.name, req);
> +			ep->ep.name, _req);
>  
>  	spin_lock_irqsave(&udc->lock, flags);
>  
> -- 
> 2.20.1
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 2/3] usb: gadget: udc: atmel: fix uninitialized read in debug printk
@ 2020-07-15 21:45     ` Alexandre Belloni
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Belloni @ 2020-07-15 21:45 UTC (permalink / raw)
  To: Michał Mirosław
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel,
	Ludovic Desroches, linux-arm-kernel, Songjun Wu, Cristian Birsan

On 08/07/2020 20:04:09+0200, Michał Mirosław wrote:
> Fixed commit moved the assignment of 'req', but did not update a
> reference in the DBG() call. Use the argument as it was renamed.
> 
> Fixes: 5fb694f96e7c ("usb: gadget: udc: atmel: fix possible oops when unloading module")
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
>  drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
> index 9153e220848d..9342a3d24963 100644
> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
> @@ -865,7 +865,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
>  	u32 status;
>  
>  	DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %p\n",
> -			ep->ep.name, req);
> +			ep->ep.name, _req);
>  
>  	spin_lock_irqsave(&udc->lock, flags);
>  
> -- 
> 2.20.1
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback
  2020-07-08 18:04   ` Michał Mirosław
@ 2020-07-15 21:58     ` Alexandre Belloni
  -1 siblings, 0 replies; 20+ messages in thread
From: Alexandre Belloni @ 2020-07-15 21:58 UTC (permalink / raw)
  To: Michał Mirosław
  Cc: Cristian Birsan, Felipe Balbi, Greg Kroah-Hartman,
	Ludovic Desroches, Nicolas Ferre, Songjun Wu, linux-arm-kernel,
	linux-kernel, linux-usb

On 08/07/2020 20:04:10+0200, Michał Mirosław wrote:
> Implement udc->pullup callback, so that udc_connect/disconnect work.
> This is needed for composite gadget, as it assumes udc_disconnect()
> actually works and calls its ->disconnect callback.
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
>  drivers/usb/gadget/udc/atmel_usba_udc.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
> index 9342a3d24963..c5128c229c52 100644
> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
> @@ -1028,6 +1028,7 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
>  	return 0;
>  }
>  
> +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on);
>  static int atmel_usba_start(struct usb_gadget *gadget,
>  		struct usb_gadget_driver *driver);
>  static int atmel_usba_stop(struct usb_gadget *gadget);
> @@ -1101,6 +1102,7 @@ static const struct usb_gadget_ops usba_udc_ops = {
>  	.get_frame		= usba_udc_get_frame,
>  	.wakeup			= usba_udc_wakeup,
>  	.set_selfpowered	= usba_udc_set_selfpowered,
> +	.pullup			= atmel_usba_pullup,
>  	.udc_start		= atmel_usba_start,
>  	.udc_stop		= atmel_usba_stop,
>  	.match_ep		= atmel_usba_match_ep,
> @@ -1957,6 +1959,24 @@ static irqreturn_t usba_vbus_irq_thread(int irq, void *devid)
>  	return IRQ_HANDLED;
>  }
>  
> +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on)
> +{
> +	struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
> +	unsigned long flags;
> +	u32 ctrl;
> +
> +	spin_lock_irqsave(&udc->lock, flags);
> +	ctrl = usba_readl(udc, CTRL);
> +	if (is_on)
> +		ctrl &= ~USBA_DETACH;
> +	else
> +		ctrl |= USBA_DETACH;
> +	usba_writel(udc, CTRL, ctrl);
> +	spin_unlock_irqrestore(&udc->lock, flags);
> +
> +	return 0;
> +}
> +
>  static int atmel_usba_start(struct usb_gadget *gadget,
>  		struct usb_gadget_driver *driver)
>  {
> -- 
> 2.20.1
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback
@ 2020-07-15 21:58     ` Alexandre Belloni
  0 siblings, 0 replies; 20+ messages in thread
From: Alexandre Belloni @ 2020-07-15 21:58 UTC (permalink / raw)
  To: Michał Mirosław
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel,
	Ludovic Desroches, linux-arm-kernel, Songjun Wu, Cristian Birsan

On 08/07/2020 20:04:10+0200, Michał Mirosław wrote:
> Implement udc->pullup callback, so that udc_connect/disconnect work.
> This is needed for composite gadget, as it assumes udc_disconnect()
> actually works and calls its ->disconnect callback.
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> ---
>  drivers/usb/gadget/udc/atmel_usba_udc.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
> index 9342a3d24963..c5128c229c52 100644
> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
> @@ -1028,6 +1028,7 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
>  	return 0;
>  }
>  
> +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on);
>  static int atmel_usba_start(struct usb_gadget *gadget,
>  		struct usb_gadget_driver *driver);
>  static int atmel_usba_stop(struct usb_gadget *gadget);
> @@ -1101,6 +1102,7 @@ static const struct usb_gadget_ops usba_udc_ops = {
>  	.get_frame		= usba_udc_get_frame,
>  	.wakeup			= usba_udc_wakeup,
>  	.set_selfpowered	= usba_udc_set_selfpowered,
> +	.pullup			= atmel_usba_pullup,
>  	.udc_start		= atmel_usba_start,
>  	.udc_stop		= atmel_usba_stop,
>  	.match_ep		= atmel_usba_match_ep,
> @@ -1957,6 +1959,24 @@ static irqreturn_t usba_vbus_irq_thread(int irq, void *devid)
>  	return IRQ_HANDLED;
>  }
>  
> +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on)
> +{
> +	struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
> +	unsigned long flags;
> +	u32 ctrl;
> +
> +	spin_lock_irqsave(&udc->lock, flags);
> +	ctrl = usba_readl(udc, CTRL);
> +	if (is_on)
> +		ctrl &= ~USBA_DETACH;
> +	else
> +		ctrl |= USBA_DETACH;
> +	usba_writel(udc, CTRL, ctrl);
> +	spin_unlock_irqrestore(&udc->lock, flags);
> +
> +	return 0;
> +}
> +
>  static int atmel_usba_start(struct usb_gadget *gadget,
>  		struct usb_gadget_driver *driver)
>  {
> -- 
> 2.20.1
> 

-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

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

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 1/3] usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable()
  2020-07-15 21:44     ` Alexandre Belloni
@ 2020-07-16 17:55       ` Cristian.Birsan
  -1 siblings, 0 replies; 20+ messages in thread
From: Cristian.Birsan @ 2020-07-16 17:55 UTC (permalink / raw)
  To: alexandre.belloni, mirq-linux
  Cc: balbi, gregkh, Ludovic.Desroches, Nicolas.Ferre, songjun.wu,
	linux-arm-kernel, linux-kernel, linux-usb



On 7/16/20 12:44 AM, Alexandre Belloni wrote:
> 
> On 08/07/2020 20:04:09+0200, Michał Mirosław wrote:
>> Fixed commit removed the offending behaviour from the driver, but missed
>> the comment and associated test. Remove them now.
>>
>> Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own")
>> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

Acked-by: Cristian Birsan <cristian.birsan@microchip.com>

> 
>> ---
>>  drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +-------
>>  1 file changed, 1 insertion(+), 7 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> index d69f61ff0181..9153e220848d 100644
>> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
>> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> @@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
>>
>>       if (!ep->ep.desc) {
>>               spin_unlock_irqrestore(&udc->lock, flags);
>> -             /* REVISIT because this driver disables endpoints in
>> -              * reset_all_endpoints() before calling disconnect(),
>> -              * most gadget drivers would trigger this non-error ...
>> -              */
>> -             if (udc->gadget.speed != USB_SPEED_UNKNOWN)
>> -                     DBG(DBG_ERR, "ep_disable: %s not enabled\n",
>> -                                     ep->ep.name);
>> +             DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name);
>>               return -EINVAL;
>>       }
>>       ep->ep.desc = NULL;
>> --
>> 2.20.1
>>
> 
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 1/3] usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable()
@ 2020-07-16 17:55       ` Cristian.Birsan
  0 siblings, 0 replies; 20+ messages in thread
From: Cristian.Birsan @ 2020-07-16 17:55 UTC (permalink / raw)
  To: alexandre.belloni, mirq-linux
  Cc: balbi, gregkh, linux-usb, linux-kernel, Ludovic.Desroches,
	songjun.wu, linux-arm-kernel



On 7/16/20 12:44 AM, Alexandre Belloni wrote:
> 
> On 08/07/2020 20:04:09+0200, Michał Mirosław wrote:
>> Fixed commit removed the offending behaviour from the driver, but missed
>> the comment and associated test. Remove them now.
>>
>> Fixes: 38e58986e6fc ("usb: gadget: udc: atmel: don't disable enpdoints we don't own")
>> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

Acked-by: Cristian Birsan <cristian.birsan@microchip.com>

> 
>> ---
>>  drivers/usb/gadget/udc/atmel_usba_udc.c | 8 +-------
>>  1 file changed, 1 insertion(+), 7 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> index d69f61ff0181..9153e220848d 100644
>> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
>> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> @@ -676,13 +676,7 @@ static int usba_ep_disable(struct usb_ep *_ep)
>>
>>       if (!ep->ep.desc) {
>>               spin_unlock_irqrestore(&udc->lock, flags);
>> -             /* REVISIT because this driver disables endpoints in
>> -              * reset_all_endpoints() before calling disconnect(),
>> -              * most gadget drivers would trigger this non-error ...
>> -              */
>> -             if (udc->gadget.speed != USB_SPEED_UNKNOWN)
>> -                     DBG(DBG_ERR, "ep_disable: %s not enabled\n",
>> -                                     ep->ep.name);
>> +             DBG(DBG_ERR, "ep_disable: %s not enabled\n", ep->ep.name);
>>               return -EINVAL;
>>       }
>>       ep->ep.desc = NULL;
>> --
>> 2.20.1
>>
> 
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 2/3] usb: gadget: udc: atmel: fix uninitialized read in debug printk
  2020-07-15 21:45     ` Alexandre Belloni
@ 2020-07-16 17:56       ` Cristian.Birsan
  -1 siblings, 0 replies; 20+ messages in thread
From: Cristian.Birsan @ 2020-07-16 17:56 UTC (permalink / raw)
  To: alexandre.belloni, mirq-linux
  Cc: balbi, gregkh, Ludovic.Desroches, Nicolas.Ferre, songjun.wu,
	linux-arm-kernel, linux-kernel, linux-usb



On 7/16/20 12:45 AM, Alexandre Belloni wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> On 08/07/2020 20:04:09+0200, Michał Mirosław wrote:
>> Fixed commit moved the assignment of 'req', but did not update a
>> reference in the DBG() call. Use the argument as it was renamed.
>>
>> Fixes: 5fb694f96e7c ("usb: gadget: udc: atmel: fix possible oops when unloading module")
>> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

Acked-by: Cristian Birsan <cristian.birsan@microchip.com>

> 
>> ---
>>  drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> index 9153e220848d..9342a3d24963 100644
>> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
>> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> @@ -865,7 +865,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
>>       u32 status;
>>
>>       DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %p\n",
>> -                     ep->ep.name, req);
>> +                     ep->ep.name, _req);
>>
>>       spin_lock_irqsave(&udc->lock, flags);
>>
>> --
>> 2.20.1
>>
> 
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 2/3] usb: gadget: udc: atmel: fix uninitialized read in debug printk
@ 2020-07-16 17:56       ` Cristian.Birsan
  0 siblings, 0 replies; 20+ messages in thread
From: Cristian.Birsan @ 2020-07-16 17:56 UTC (permalink / raw)
  To: alexandre.belloni, mirq-linux
  Cc: balbi, gregkh, linux-usb, linux-kernel, Ludovic.Desroches,
	songjun.wu, linux-arm-kernel



On 7/16/20 12:45 AM, Alexandre Belloni wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> On 08/07/2020 20:04:09+0200, Michał Mirosław wrote:
>> Fixed commit moved the assignment of 'req', but did not update a
>> reference in the DBG() call. Use the argument as it was renamed.
>>
>> Fixes: 5fb694f96e7c ("usb: gadget: udc: atmel: fix possible oops when unloading module")
>> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

Acked-by: Cristian Birsan <cristian.birsan@microchip.com>

> 
>> ---
>>  drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> index 9153e220848d..9342a3d24963 100644
>> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
>> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> @@ -865,7 +865,7 @@ static int usba_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
>>       u32 status;
>>
>>       DBG(DBG_GADGET | DBG_QUEUE, "ep_dequeue: %s, req %p\n",
>> -                     ep->ep.name, req);
>> +                     ep->ep.name, _req);
>>
>>       spin_lock_irqsave(&udc->lock, flags);
>>
>> --
>> 2.20.1
>>
> 
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback
  2020-07-15 21:58     ` Alexandre Belloni
@ 2020-07-16 18:01       ` Cristian.Birsan
  -1 siblings, 0 replies; 20+ messages in thread
From: Cristian.Birsan @ 2020-07-16 18:01 UTC (permalink / raw)
  To: alexandre.belloni, mirq-linux
  Cc: balbi, gregkh, Ludovic.Desroches, Nicolas.Ferre, songjun.wu,
	linux-arm-kernel, linux-kernel, linux-usb



On 7/16/20 12:58 AM, Alexandre Belloni wrote:
> 
> On 08/07/2020 20:04:10+0200, Michał Mirosław wrote:
>> Implement udc->pullup callback, so that udc_connect/disconnect work.
>> This is needed for composite gadget, as it assumes udc_disconnect()
>> actually works and calls its ->disconnect callback.
>>
>> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

Acked-by: Cristian Birsan <cristian.birsan@microchip.com>

I checked the patch on sama5d2_xplained board and monitored the traffic with a sniffer. Everything looks good.

> 
>> ---
>>  drivers/usb/gadget/udc/atmel_usba_udc.c | 20 ++++++++++++++++++++
>>  1 file changed, 20 insertions(+)
>>
>> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> index 9342a3d24963..c5128c229c52 100644
>> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
>> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> @@ -1028,6 +1028,7 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
>>       return 0;
>>  }
>>
>> +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on);
>>  static int atmel_usba_start(struct usb_gadget *gadget,
>>               struct usb_gadget_driver *driver);
>>  static int atmel_usba_stop(struct usb_gadget *gadget);
>> @@ -1101,6 +1102,7 @@ static const struct usb_gadget_ops usba_udc_ops = {
>>       .get_frame              = usba_udc_get_frame,
>>       .wakeup                 = usba_udc_wakeup,
>>       .set_selfpowered        = usba_udc_set_selfpowered,
>> +     .pullup                 = atmel_usba_pullup,
>>       .udc_start              = atmel_usba_start,
>>       .udc_stop               = atmel_usba_stop,
>>       .match_ep               = atmel_usba_match_ep,
>> @@ -1957,6 +1959,24 @@ static irqreturn_t usba_vbus_irq_thread(int irq, void *devid)
>>       return IRQ_HANDLED;
>>  }
>>
>> +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on)
>> +{
>> +     struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
>> +     unsigned long flags;
>> +     u32 ctrl;
>> +
>> +     spin_lock_irqsave(&udc->lock, flags);
>> +     ctrl = usba_readl(udc, CTRL);
>> +     if (is_on)
>> +             ctrl &= ~USBA_DETACH;
>> +     else
>> +             ctrl |= USBA_DETACH;
>> +     usba_writel(udc, CTRL, ctrl);
>> +     spin_unlock_irqrestore(&udc->lock, flags);
>> +
>> +     return 0;
>> +}
>> +
>>  static int atmel_usba_start(struct usb_gadget *gadget,
>>               struct usb_gadget_driver *driver)
>>  {
>> --
>> 2.20.1
>>
> 
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback
@ 2020-07-16 18:01       ` Cristian.Birsan
  0 siblings, 0 replies; 20+ messages in thread
From: Cristian.Birsan @ 2020-07-16 18:01 UTC (permalink / raw)
  To: alexandre.belloni, mirq-linux
  Cc: balbi, gregkh, linux-usb, linux-kernel, Ludovic.Desroches,
	songjun.wu, linux-arm-kernel



On 7/16/20 12:58 AM, Alexandre Belloni wrote:
> 
> On 08/07/2020 20:04:10+0200, Michał Mirosław wrote:
>> Implement udc->pullup callback, so that udc_connect/disconnect work.
>> This is needed for composite gadget, as it assumes udc_disconnect()
>> actually works and calls its ->disconnect callback.
>>
>> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

Acked-by: Cristian Birsan <cristian.birsan@microchip.com>

I checked the patch on sama5d2_xplained board and monitored the traffic with a sniffer. Everything looks good.

> 
>> ---
>>  drivers/usb/gadget/udc/atmel_usba_udc.c | 20 ++++++++++++++++++++
>>  1 file changed, 20 insertions(+)
>>
>> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> index 9342a3d24963..c5128c229c52 100644
>> --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
>> +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
>> @@ -1028,6 +1028,7 @@ usba_udc_set_selfpowered(struct usb_gadget *gadget, int is_selfpowered)
>>       return 0;
>>  }
>>
>> +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on);
>>  static int atmel_usba_start(struct usb_gadget *gadget,
>>               struct usb_gadget_driver *driver);
>>  static int atmel_usba_stop(struct usb_gadget *gadget);
>> @@ -1101,6 +1102,7 @@ static const struct usb_gadget_ops usba_udc_ops = {
>>       .get_frame              = usba_udc_get_frame,
>>       .wakeup                 = usba_udc_wakeup,
>>       .set_selfpowered        = usba_udc_set_selfpowered,
>> +     .pullup                 = atmel_usba_pullup,
>>       .udc_start              = atmel_usba_start,
>>       .udc_stop               = atmel_usba_stop,
>>       .match_ep               = atmel_usba_match_ep,
>> @@ -1957,6 +1959,24 @@ static irqreturn_t usba_vbus_irq_thread(int irq, void *devid)
>>       return IRQ_HANDLED;
>>  }
>>
>> +static int atmel_usba_pullup(struct usb_gadget *gadget, int is_on)
>> +{
>> +     struct usba_udc *udc = container_of(gadget, struct usba_udc, gadget);
>> +     unsigned long flags;
>> +     u32 ctrl;
>> +
>> +     spin_lock_irqsave(&udc->lock, flags);
>> +     ctrl = usba_readl(udc, CTRL);
>> +     if (is_on)
>> +             ctrl &= ~USBA_DETACH;
>> +     else
>> +             ctrl |= USBA_DETACH;
>> +     usba_writel(udc, CTRL, ctrl);
>> +     spin_unlock_irqrestore(&udc->lock, flags);
>> +
>> +     return 0;
>> +}
>> +
>>  static int atmel_usba_start(struct usb_gadget *gadget,
>>               struct usb_gadget_driver *driver)
>>  {
>> --
>> 2.20.1
>>
> 
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> 
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 20+ messages in thread
end of thread, other threads:[~2020-07-16 18:04 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-08 18:04 [PATCH RESEND 0/3] usb: gadget: udc: atmel: assorted fixes Michał Mirosław
2020-07-08 18:04 ` Michał Mirosław
2020-07-08 18:04 ` [PATCH RESEND 1/3] usb: gadget: udc: atmel: remove outdated comment in usba_ep_disable() Michał Mirosław
2020-07-08 18:04   ` Michał Mirosław
2020-07-15 21:44   ` Alexandre Belloni
2020-07-15 21:44     ` Alexandre Belloni
2020-07-16 17:55     ` Cristian.Birsan
2020-07-16 17:55       ` Cristian.Birsan
2020-07-08 18:04 ` [PATCH RESEND 2/3] usb: gadget: udc: atmel: fix uninitialized read in debug printk Michał Mirosław
2020-07-08 18:04   ` Michał Mirosław
2020-07-15 21:45   ` Alexandre Belloni
2020-07-15 21:45     ` Alexandre Belloni
2020-07-16 17:56     ` Cristian.Birsan
2020-07-16 17:56       ` Cristian.Birsan
2020-07-08 18:04 ` [PATCH RESEND 3/3] usb: gadget: udc: atmel: implement .pullup callback Michał Mirosław
2020-07-08 18:04   ` Michał Mirosław
2020-07-15 21:58   ` Alexandre Belloni
2020-07-15 21:58     ` Alexandre Belloni
2020-07-16 18:01     ` Cristian.Birsan
2020-07-16 18:01       ` Cristian.Birsan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.