Re: [PATCH 5/6] usb: gadget: Add full ep_matches() check past .match_ep() callback

2024-06-11 Thread Mattijs Korpershoek
Hi Marek,

Thank you for the patch.

On dim., juin 09, 2024 at 23:32, Marek Vasut  
wrote:

> If .match_ep() callback returns non-NULL endpoint, immediately check
> its usability and if the returned endpoint is usable, stop search and
> return the endpoint. Otherwise, continue with best effort search for
> usable endpoint.
>
> Currently the code would attempt the best effort search in any case,
> which may find another unexpected endpoint. It is likely that the
> intention of the original code was to stop the search early.
>
> Fixes: 77dcbdf3c1ce ("usb: gadget: Add match_ep() op to usb_gadget_ops")
> Signed-off-by: Marek Vasut 

I've added Vignesh to the CC list since he is the author of
77dcbdf3c1ce. He might be able to comment if this was indeed a mistake.

It looks like a good fix to me as well. With this change we match more closely
the linux implementation (usb_ep_autoconfig_ss()).

Reviewed-by: Mattijs Korpershoek 
Tested-by: Mattijs Korpershoek  # on vim3

> ---
> Cc: Alexander Sverdlin 
> Cc: Felipe Balbi 
> Cc: Lukasz Majewski 
> Cc: Mattijs Korpershoek 
> Cc: Nishanth Menon 
> Cc: Simon Glass 
> Cc: Thinh Nguyen 
> Cc: Tom Rini 
> Cc: u-boot@lists.denx.de
> ---
>  drivers/usb/gadget/epautoconf.c | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
> index 09950ceeaed..66599ce8efa 100644
> --- a/drivers/usb/gadget/epautoconf.c
> +++ b/drivers/usb/gadget/epautoconf.c
> @@ -247,8 +247,11 @@ struct usb_ep *usb_ep_autoconfig(
>   return ep;
>   }
>  
> - if (gadget->ops->match_ep)
> + if (gadget->ops->match_ep) {
>   ep = gadget->ops->match_ep(gadget, desc, NULL);
> + if (ep && ep_matches(gadget, ep, desc))
> + return ep;
> + }
>  
>   /* Second, look at endpoints until an unclaimed one looks usable */
>   list_for_each_entry(ep, >ep_list, ep_list) {
> -- 
> 2.43.0


[PATCH 5/6] usb: gadget: Add full ep_matches() check past .match_ep() callback

2024-06-09 Thread Marek Vasut
If .match_ep() callback returns non-NULL endpoint, immediately check
its usability and if the returned endpoint is usable, stop search and
return the endpoint. Otherwise, continue with best effort search for
usable endpoint.

Currently the code would attempt the best effort search in any case,
which may find another unexpected endpoint. It is likely that the
intention of the original code was to stop the search early.

Fixes: 77dcbdf3c1ce ("usb: gadget: Add match_ep() op to usb_gadget_ops")
Signed-off-by: Marek Vasut 
---
Cc: Alexander Sverdlin 
Cc: Felipe Balbi 
Cc: Lukasz Majewski 
Cc: Mattijs Korpershoek 
Cc: Nishanth Menon 
Cc: Simon Glass 
Cc: Thinh Nguyen 
Cc: Tom Rini 
Cc: u-boot@lists.denx.de
---
 drivers/usb/gadget/epautoconf.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 09950ceeaed..66599ce8efa 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -247,8 +247,11 @@ struct usb_ep *usb_ep_autoconfig(
return ep;
}
 
-   if (gadget->ops->match_ep)
+   if (gadget->ops->match_ep) {
ep = gadget->ops->match_ep(gadget, desc, NULL);
+   if (ep && ep_matches(gadget, ep, desc))
+   return ep;
+   }
 
/* Second, look at endpoints until an unclaimed one looks usable */
list_for_each_entry(ep, >ep_list, ep_list) {
-- 
2.43.0