[U-Boot] [PATCH v3 1/1] usb: gadget: g_dnl: Sync internal SN variable with env

[Łukasz Majewski]

Hi Heiko,

Would you find some time and run this patch through your test setup?

Thanks in advance.

Best regards,
Łukasz


> Since commit 842778a09104 ("usb: gadget: g_dnl: only set iSerialNumber
> if we have a serial#") "fastboot devices" stopped to show correct device
> serial number for TI boards, showing this line instead:
>
>     ????????????	fastboot
>
> This is because serial# env variable could be set after g_dnl gadget was
> initialized (e.g. by using env_set() in the board file).
>
> To fix this, let's update internal serial number variable (g_dnl_serial)
> when "serial#" env var is changed.
>
> Signed-off-by: Sam Protsenko <semen.protsenko at linaro.org>
> Cc: Felipe Balbi <felipe.balbi at linux.intel.com>
> ---
>  drivers/usb/gadget/g_dnl.c | 15 +++++++++++++++
>  include/env_callback.h     |  1 +
>  2 files changed, 16 insertions(+)
>
> diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
> index 0491a0eea9..039331a5af 100644
> --- a/drivers/usb/gadget/g_dnl.c
> +++ b/drivers/usb/gadget/g_dnl.c
> @@ -19,6 +19,8 @@
>  #include <dfu.h>
>  #include <thor.h>
>
> +#include <env_callback.h>
> +
>  #include "gadget_chips.h"
>  #include "composite.c"
>
> @@ -202,6 +204,19 @@ static int g_dnl_get_bcd_device_number(struct usb_composite_dev *cdev)
>  	return g_dnl_get_board_bcd_device_number(gcnum);
>  }
>
> +/**
> + * Update internal serial number variable when the "serial#" env var changes.
> + *
> + * Handle all cases, even when flags == H_PROGRAMMATIC or op == env_op_delete.
> + */
> +static int on_serialno(const char *name, const char *value, enum env_op op,
> +		int flags)
> +{
> +	g_dnl_set_serialnumber((char *)value);
> +	return 0;
> +}
> +U_BOOT_ENV_CALLBACK(serialno, on_serialno);
> +
>  static int g_dnl_bind(struct usb_composite_dev *cdev)
>  {
>  	struct usb_gadget *gadget = cdev->gadget;
> diff --git a/include/env_callback.h b/include/env_callback.h
> index 90b95b5e66..5c4a30c2de 100644
> --- a/include/env_callback.h
> +++ b/include/env_callback.h
> @@ -72,6 +72,7 @@
>  	SILENT_CALLBACK \
>  	SPLASHIMAGE_CALLBACK \
>  	"stdin:console,stdout:console,stderr:console," \
> +	"serial#:serialno," \
>  	CONFIG_ENV_CALLBACK_LIST_STATIC
>
>  struct env_clbk_tbl {
>


-- 
Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de