[PATCH 12/17] sdp: Use plain udevice for UDC controller interaction

[Mattijs Korpershoek]

On sam., août 19, 2023 at 16:24, Marek Vasut <marex at denx.de> wrote:

> Convert to plain udevice interaction with UDC controller
> device, avoid the use of UDC uclass dev_array .
>
> Signed-off-by: Marek Vasut <marex at denx.de>
> ---
> Cc: Angus Ainslie <angus at akkea.ca>
> Cc: Dmitrii Merkurev <dimorinny at google.com>
> Cc: Eddie Cai <eddie.cai.linux at gmail.com>
> Cc: Kever Yang <kever.yang at rock-chips.com>
> Cc: Lukasz Majewski <lukma at denx.de>
> Cc: Miquel Raynal <miquel.raynal at bootlin.com>
> Cc: Mattijs Korpershoek <mkorpershoek at baylibre.com>
> Cc: Nishanth Menon <nm at ti.com>
> Cc: Patrice Chotard <patrice.chotard at foss.st.com>
> Cc: Patrick Delaunay <patrick.delaunay at foss.st.com>
> Cc: Philipp Tomsich <philipp.tomsich at vrull.eu>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Stefan Roese <sr at denx.de>
> Cc: kernel at puri.sm
> ---
>  cmd/usb_gadget_sdp.c       | 11 +++++++----
>  common/spl/spl_sdp.c       | 13 ++++++++-----
>  drivers/usb/gadget/f_sdp.c | 10 +++++-----
>  include/sdp.h              |  6 +++---
>  4 files changed, 23 insertions(+), 17 deletions(-)

Reviewed-by: Mattijs Korpershoek <mkorpershoek at baylibre.com>

>
> diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
> index 784d1b49768..748aa0a7488 100644
> --- a/cmd/usb_gadget_sdp.c
> +++ b/cmd/usb_gadget_sdp.c
> @@ -15,13 +15,16 @@
>  static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
>  {
>  	int controller_index;
> +	struct udevice *udc;
>  	int ret;
>  
>  	if (argc < 2)
>  		return CMD_RET_USAGE;
>  
>  	controller_index = simple_strtoul(argv[1], NULL, 0);
> -	usb_gadget_initialize(controller_index);
> +	ret = udc_device_get_by_index(controller_index, &udc);
> +	if (ret)
> +		return ret;
>  
>  	g_dnl_clear_detach();
>  	ret = g_dnl_register("usb_dnl_sdp");
> @@ -30,20 +33,20 @@ static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
>  		goto exit_register;
>  	}
>  
> -	ret = sdp_init(controller_index);
> +	ret = sdp_init(udc);
>  	if (ret) {
>  		pr_err("SDP init failed: %d\n", ret);
>  		goto exit;
>  	}
>  
>  	/* This command typically does not return but jumps to an image */
> -	sdp_handle(controller_index);
> +	sdp_handle(udc);
>  	pr_err("SDP ended\n");
>  
>  exit:
>  	g_dnl_unregister();
>  exit_register:
> -	usb_gadget_release(controller_index);
> +	udc_device_put(udc);
>  
>  	return CMD_RET_FAILURE;
>  }
> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
> index f6b99c1af5a..83585cf82d3 100644
> --- a/common/spl/spl_sdp.c
> +++ b/common/spl/spl_sdp.c
> @@ -14,10 +14,13 @@
>  static int spl_sdp_load_image(struct spl_image_info *spl_image,
>  			      struct spl_boot_device *bootdev)
>  {
> -	int ret;
>  	const int controller_index = CONFIG_SPL_SDP_USB_DEV;
> +	struct udevice *udc;
> +	int ret;
>  
> -	usb_gadget_initialize(controller_index);
> +	ret = udc_device_get_by_index(controller_index, &udc);
> +	if (ret)
> +		return ret;
>  
>  	board_usb_init(controller_index, USB_INIT_DEVICE);
>  
> @@ -28,7 +31,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
>  		goto err_detach;
>  	}
>  
> -	ret = sdp_init(controller_index);
> +	ret = sdp_init(udc);
>  	if (ret) {
>  		pr_err("SDP init failed: %d\n", ret);
>  		goto err_detach;
> @@ -39,11 +42,11 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
>  	 * or it loads a FIT image and returns it to be handled by the SPL
>  	 * code.
>  	 */
> -	ret = spl_sdp_handle(controller_index, spl_image, bootdev);
> +	ret = spl_sdp_handle(udc, spl_image, bootdev);
>  	debug("SDP ended\n");
>  
>  err_detach:
> -	usb_gadget_release(controller_index);
> +	udc_device_put(udc);
>  	return ret;
>  }
>  SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_BOARD, spl_sdp_load_image);
> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
> index 4da5a160a09..37f6281abfb 100644
> --- a/drivers/usb/gadget/f_sdp.c
> +++ b/drivers/usb/gadget/f_sdp.c
> @@ -702,7 +702,7 @@ static int sdp_bind_config(struct usb_configuration *c)
>  	return status;
>  }
>  
> -int sdp_init(int controller_index)
> +int sdp_init(struct udevice *udc)
>  {
>  	printf("SDP: initialize...\n");
>  	while (!sdp_func->configuration_done) {
> @@ -712,7 +712,7 @@ int sdp_init(int controller_index)
>  		}
>  
>  		schedule();
> -		usb_gadget_handle_interrupts(controller_index);
> +		dm_usb_gadget_handle_interrupts(udc);
>  	}
>  
>  	return 0;
> @@ -911,9 +911,9 @@ static void sdp_handle_out_ep(void)
>  }
>  
>  #ifndef CONFIG_SPL_BUILD
> -int sdp_handle(int controller_index)
> +int sdp_handle(struct udevice *udc)
>  #else
> -int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image,
> +int spl_sdp_handle(struct udevice *udc, struct spl_image_info *spl_image,
>  		   struct spl_boot_device *bootdev)
>  #endif
>  {
> @@ -929,7 +929,7 @@ int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image,
>  			return 0;
>  
>  		schedule();
> -		usb_gadget_handle_interrupts(controller_index);
> +		dm_usb_gadget_handle_interrupts(udc);
>  
>  #ifdef CONFIG_SPL_BUILD
>  		flag = sdp_handle_in_ep(spl_image, bootdev);
> diff --git a/include/sdp.h b/include/sdp.h
> index 6d89baa04ec..5492f9c47d2 100644
> --- a/include/sdp.h
> +++ b/include/sdp.h
> @@ -9,15 +9,15 @@
>  #ifndef __SDP_H_
>  #define __SDP_H_
>  
> -int sdp_init(int controller_index);
> +int sdp_init(struct udevice *udc);
>  
>  #ifdef CONFIG_SPL_BUILD
>  #include <spl.h>
>  
> -int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image,
> +int spl_sdp_handle(struct udevice *udc, struct spl_image_info *spl_image,
>  		   struct spl_boot_device *bootdev);
>  #else
> -int sdp_handle(int controller_index);
> +int sdp_handle(struct udevice *udc);
>  #endif
>  
>  #endif /* __SDP_H_ */
> -- 
> 2.40.1