usb: gadget: g_dnl: Sync internal SN variable with env

PATCH New Sam Protsenko 5 participants 7 messages Sep 1, 2017 – Sep 6, 2017 USB

Share & tools

Sam Protsenko

author

2017-09-01 12:42 UTC #0 lore raw

PATCH v3 1/1 usb: gadget: g_dnl: Sync internal SN variable with env

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 <[email protected]>

Cc Felipe Balbi <[email protected]>

---
 drivers/usb/gadget/g_dnl.c | 15 +++++++++++++++
 include/env_callback.h     |  1 +
 2 files changed, 16 insertions(+)

drivers/usb/gadget/g_dnl.c +15 -0

index 0491a0eea9..039331a5af 100644
@@ -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;

include/env_callback.h +1 -0

index 90b95b5e66..5c4a30c2de 100644
@@ -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 {

Signature · 1 line

2.14.1

Łukasz Majewski

2017-09-02 11:08 UTC #1 lore raw

PATCH v3 1/1 usb: gadget: g_dnl: Sync internal SN variable with env

Hi Heiko,

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

Thanks in advance.

Best regards,
Å�ukasz

Quoted 65 lines

    ????????????	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 <[email protected]>

Cc Felipe Balbi <[email protected]>

---
 drivers/usb/gadget/g_dnl.c | 15 +++++++++++++++
 include/env_callback.h     |  1 +
 2 files changed, 16 insertions(+)

drivers/usb/gadget/g_dnl.c +15 -0

index 0491a0eea9..039331a5af 100644
@@ -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;

include/env_callback.h +1 -0

index 90b95b5e66..5c4a30c2de 100644
@@ -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 {

Signature · 9 lines

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

Heiko Schocher

2017-09-04 05:36 UTC #2 lore raw

PATCH v3 1/1 usb: gadget: g_dnl: Sync internal SN variable with env

Hello Lukasz,

Am 02.09.2017 um 13:08 schrieb Å�ukasz Majewski:

Quoted 5 lines

Hi Heiko,
Would you find some time and run this patch through your test setup?
Thanks in advance.

Of course, as it is automated ;-)

Okay, I had to add an oneliner, to say tbot, which patchwork patch it has to download... for the records see [1].

Here the results for the smartweb board (in short, my dfu test are working with this patch):

http://xeidos.ddns.net/tests/test_db_auslesen.php#408

Logs:
http://xeidos.ddns.net/tbot/id_408/html_log.html

Especially the steps:

(download patchwork patch, check with checkpatch, apply to mainline):
http://xeidos.ddns.net/tbot/id_408/html_log.html#92
http://xeidos.ddns.net/tbot/id_408/html_log.html#95
http://xeidos.ddns.net/tbot/id_408/html_log.html#98

and the dfu test:

http://xeidos.ddns.net/tbot/id_408/html_log.html#398
http://xeidos.ddns.net/tbot/id_408/html_log.html#409
http://xeidos.ddns.net/tbot/id_408/html_log.html#413
http://xeidos.ddns.net/tbot/id_408/html_log.html#417

My browser (firefox) seems to have problems with jumping to the correct "id"s in the html file ...

Hope you can find the logs, if not, look into the raw logfile:

http://xeidos.ddns.net/tbot/id_408/tbot.txt

but this is not very comfortable ...

So, please add my:

Tested-by Heiko Schocher <[email protected]>

bye,
Heiko

[1] tbot patch for adding a patchworkpatch

root at raspberrypi:/home/pi/data/tbot# git diff

config/smartweb.py +0 -0

index 72a7972..98c8e0f 100644
@@ -37,6 +37,8 @@ tc_workfd_apply_patchwork_patches_list_hand = [

]
tc_workfd_apply_patchwork_patches_blacklist = ['204183', '561384']

+tc_workfd_apply_patchwork_patches_list = ['808671']
+
uboot_get_parameter_file_list = ['.config', 'include/configs/smartweb.h', 'arch/arm/mach-at91/include/mach/at91sam9260.h']

tc_workfd_set_toolchain_arch = 'arm'
root at raspberrypi:/home/pi/data/tbot#

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Sam Protsenko

author

2017-09-05 10:23 UTC #3 lore raw

PATCH v3 1/1 usb: gadget: g_dnl: Sync internal SN variable with env

Quoted 43 lines · Heiko Schocher

Hello Lukasz,
Am 02.09.2017 um 13:08 schrieb Å�ukasz Majewski:
Quoted 6 lines
Hi Heiko,
Would you find some time and run this patch through your test setup?
Thanks in advance.
Of course, as it is automated ;-)
Okay, I had to add an oneliner, to say tbot, which patchwork patch it has to download... for the records see [1].
Here the results for the smartweb board (in short, my dfu test are working with this patch):
http://xeidos.ddns.net/tests/test_db_auslesen.php#408
Logs:
http://xeidos.ddns.net/tbot/id_408/html_log.html
Especially the steps:
(download patchwork patch, check with checkpatch, apply to mainline):
http://xeidos.ddns.net/tbot/id_408/html_log.html#92
http://xeidos.ddns.net/tbot/id_408/html_log.html#95
http://xeidos.ddns.net/tbot/id_408/html_log.html#98
and the dfu test:
http://xeidos.ddns.net/tbot/id_408/html_log.html#398
http://xeidos.ddns.net/tbot/id_408/html_log.html#409
http://xeidos.ddns.net/tbot/id_408/html_log.html#413
http://xeidos.ddns.net/tbot/id_408/html_log.html#417
My browser (firefox) seems to have problems with jumping to the correct "id"s in the html file ...
Hope you can find the logs, if not, look into the raw logfile:

Quoted 8 lines

http://xeidos.ddns.net/tbot/id_408/tbot.txt
but this is not very comfortable ...
So, please add my:
Tested-by Heiko Schocher <[email protected]>

Hi Lukasz,

Now that testing is done (thanks Heiko!), can you please Ack or Review this patch? I really want it to go in v2017.09 release, as it's critical bug fix for us.

Thanks!

Quoted 26 lines

bye,
Heiko
[1] tbot patch for adding a patchworkpatch
root at raspberrypi:/home/pi/data/tbot# git diff
config/smartweb.py +0 -0
index 72a7972..98c8e0f 100644
@@ -37,6 +37,8 @@ tc_workfd_apply_patchwork_patches_list_hand = [
]
tc_workfd_apply_patchwork_patches_blacklist = ['204183', '561384']
config/smartweb.py +2 -0
+tc_workfd_apply_patchwork_patches_list = ['808671']
+
uboot_get_parameter_file_list = ['.config', 'include/configs/smartweb.h', 'arch/arm/mach-at91/include/mach/at91sam9260.h']
tc_workfd_set_toolchain_arch = 'arm'
root at raspberrypi:/home/pi/data/tbot#
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Łukasz Majewski

2017-09-05 10:27 UTC #4 lore raw

PATCH v3 1/1 usb: gadget: g_dnl: Sync internal SN variable with env

Hi Sam,

Quoted 50 lines · Heiko Schocher

Quoted 49 lines
Hello Lukasz,
Am 02.09.2017 um 13:08 schrieb Łukasz Majewski:
Quoted 6 lines
Hi Heiko,
Would you find some time and run this patch through your test setup?
Thanks in advance.
Of course, as it is automated ;-)
Okay, I had to add an oneliner, to say tbot, which patchwork patch it has to download... for the records see [1].
Here the results for the smartweb board (in short, my dfu test are working with this patch):
http://xeidos.ddns.net/tests/test_db_auslesen.php#408
Logs:
http://xeidos.ddns.net/tbot/id_408/html_log.html
Especially the steps:
(download patchwork patch, check with checkpatch, apply to mainline):
http://xeidos.ddns.net/tbot/id_408/html_log.html#92
http://xeidos.ddns.net/tbot/id_408/html_log.html#95
http://xeidos.ddns.net/tbot/id_408/html_log.html#98
and the dfu test:
http://xeidos.ddns.net/tbot/id_408/html_log.html#398
http://xeidos.ddns.net/tbot/id_408/html_log.html#409
http://xeidos.ddns.net/tbot/id_408/html_log.html#413
http://xeidos.ddns.net/tbot/id_408/html_log.html#417
My browser (firefox) seems to have problems with jumping to the correct "id"s in the html file ...
Hope you can find the logs, if not, look into the raw logfile:
http://xeidos.ddns.net/tbot/id_408/tbot.txt
but this is not very comfortable ...
So, please add my:

Quoted 8 lines

Quoted 2 lines
Tested-by Heiko Schocher <[email protected]>
Hi Lukasz,
Now that testing is done (thanks Heiko!), can you please Ack or Review this patch? I really want it to go in v2017.09 release, as it's critical bug fix for us.

No problem from my side:

Acked-by Łukasz Majewski <[email protected]>

If Marek don't mind - I would like to ask Tom to apply it directly to -master branch (because of the patch importance).

Quoted 30 lines

Thanks!
Quoted 26 lines
bye,
Heiko
[1] tbot patch for adding a patchworkpatch
root at raspberrypi:/home/pi/data/tbot# git diff
config/smartweb.py +0 -0
index 72a7972..98c8e0f 100644
@@ -37,6 +37,8 @@ tc_workfd_apply_patchwork_patches_list_hand = [
]
tc_workfd_apply_patchwork_patches_blacklist = ['204183', '561384']
config/smartweb.py +2 -0
+tc_workfd_apply_patchwork_patches_list = ['808671']
+
uboot_get_parameter_file_list = ['.config', 'include/configs/smartweb.h', 'arch/arm/mach-at91/include/mach/at91sam9260.h']
tc_workfd_set_toolchain_arch = 'arm'
root at raspberrypi:/home/pi/data/tbot#
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Signature · 9 lines

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

Marek Vasut

2017-09-05 13:23 UTC #5 lore raw

PATCH v3 1/1 usb: gadget: g_dnl: Sync internal SN variable with env

In reply to Sam Protsenko

Quoted 6 lines · Sam Protsenko

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

Quoted 8 lines

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 <[email protected]>
Cc Felipe Balbi <[email protected]>

Reviewed-by Marek Vasut <[email protected]>

Signature · 2 lines

Best regards,
Marek Vasut

Tom Rini

2017-09-06 00:35 UTC #6 lore raw

PATCH v3 1/1 usb: gadget: g_dnl: Sync internal SN variable with env

In reply to Sam Protsenko

Quoted 9 lines · Sam Protsenko

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).

Quoted 8 lines

To fix this, let's update internal serial number variable (g_dnl_serial) when "serial#" env var is changed.
Signed-off-by Sam Protsenko <[email protected]>
Cc Felipe Balbi <[email protected]>
Tested-by Heiko Schocher <[email protected]>
Acked-by Å�ukasz Majewski <[email protected]>
Reviewed-by Marek Vasut <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170905/de3d7336/attachment.sig>