thor: defer parsing of device string to IO backend

PATCH New Lukasz Majewski 3 participants 8 messages Jun 20, 2014 – Jun 25, 2014

lore

Share & tools

lore

Lukasz Majewski

author

2014-06-20 07:35 UTC #0 lore raw

PATCH 1/1 thor: defer parsing of device string to IO backend

This commit adjust thor downloading function to work correctly with deferred device string parsing.

Signed-off-by Lukasz Majewski <[email protected]>

---
 common/cmd_thordown.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

common/cmd_thordown.c +3 -3

index 2dd7509..8ed1dc6 100644
@@ -26,10 +26,9 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	puts("TIZEN \"THOR\" Downloader\n");
 
-	ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
-							      NULL, 10));
+	ret = dfu_init_env_entities(interface, devstring);
 	if (ret)
-		return ret;
+		goto done;
 
 	int controller_index = simple_strtoul(usb_controller, NULL, 0);
 	ret = board_usb_init(controller_index, USB_INIT_DEVICE);

@@ -57,6 +56,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 exit:
 	g_dnl_unregister();
+done:
 	dfu_free_entities();
 
 	return ret;

Signature · 1 line

2.0.0.rc2

Stephen Warren

2014-06-20 15:56 UTC #1 lore raw

PATCH 1/1 thor: defer parsing of device string to IO backend

Quoted 2 lines · Lukasz Majewski

This commit adjust thor downloading function to work correctly with deferred device string parsing.

Oops. I should have grep'd for more users of dfu_init_env_entities() and fixed them up in my commit.

==========
Since this patch also changes behaviour when that function fails, so the partially parsed entries are freed too, I'd re-write the whole commit description as:

Comit XXXXX "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.

Also, apply the same change as commit XXXXX "dfu: free entities when parsing fails" to cmd_thordown.c.

Fixes XXXXX ("dfu: defer parsing of device string to IO backend")

Signed-off-by Lukasz Majewski <[email protected]>

==========

But either way,

Reviewed-by Stephen Warren <[email protected]>

Lukasz Majewski

author

2014-06-23 07:39 UTC #2 lore raw

PATCH v2 1/1 thor: defer parsing of device string to IO backend

In reply to Lukasz Majewski

Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.

Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.

Fixes d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")

Signed-off-by Lukasz Majewski <[email protected]>

---
 common/cmd_thordown.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

common/cmd_thordown.c +3 -3

index 96f7d32..27927ba 100644
@@ -26,10 +26,9 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	puts("TIZEN \"THOR\" Downloader\n");
 
-	ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
-							      NULL, 10));
+	ret = dfu_init_env_entities(interface, devstring);
 	if (ret)
-		return ret;
+		goto done;
 
 	int controller_index = simple_strtoul(usb_controller, NULL, 0);
 	ret = board_usb_init(controller_index, USB_INIT_DEVICE);

@@ -57,6 +56,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 exit:
 	g_dnl_unregister();
+done:
 	dfu_free_entities();
 
 	return ret;

Signature · 1 line

2.0.0.rc2

Lukasz Majewski

author

2014-06-23 07:39 UTC #3 lore raw

PATCH v2 1/1 thor: defer parsing of device string to IO backend

Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.

Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.

Fixes d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")

Signed-off-by Lukasz Majewski <[email protected]>

---
 common/cmd_thordown.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

common/cmd_thordown.c +3 -3

index 96f7d32..27927ba 100644
@@ -26,10 +26,9 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	puts("TIZEN \"THOR\" Downloader\n");
 
-	ret = dfu_init_env_entities(interface, simple_strtoul(devstring,
-							      NULL, 10));
+	ret = dfu_init_env_entities(interface, devstring);
 	if (ret)
-		return ret;
+		goto done;
 
 	int controller_index = simple_strtoul(usb_controller, NULL, 0);
 	ret = board_usb_init(controller_index, USB_INIT_DEVICE);

@@ -57,6 +56,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 exit:
 	g_dnl_unregister();
+done:
 	dfu_free_entities();
 
 	return ret;

Signature · 1 line

2.0.0.rc2

Marek Vasut

2014-06-23 08:36 UTC #4 lore raw

PATCH v2 1/1 thor: defer parsing of device string to IO backend

Quoted 10 lines · Lukasz Majewski

Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by Lukasz Majewski <[email protected]>

Did this go out twice ? What's the V2 changelog please ?

Best regards,
Marek Vasut

Lukasz Majewski

author

2014-06-23 10:40 UTC #5 lore raw

PATCH v2 1/1 thor: defer parsing of device string to IO backend

Hi Marek,

Quoted 8 lines · Lukasz Majewski

Quoted 7 lines
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.

Quoted 6 lines

Quoted 4 lines
Fixes d4f5ef59cc7 ("dfu: defer parsing of device string to IO
backend")
Signed-off-by Lukasz Majewski <[email protected]>
Did this go out twice ?

I hope it didn't :-)

Quoted 1 line

What's the V2 changelog please ?

My bad - I wanted to send it ASAP :-)

The v2 was just a complete rewrite of the v1's commit message as it was suggested by Stephen.

No code change was done.

Quoted 3 lines

Best regards,
Marek Vasut

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group

Stephen Warren

2014-06-23 19:02 UTC #6 lore raw

PATCH v2 1/1 thor: defer parsing of device string to IO backend

In reply to Lukasz Majewski

Quoted 10 lines · Lukasz Majewski

Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes d4f5ef59cc7 ("dfu: defer parsing of device string to IO backend")
Signed-off-by Lukasz Majewski <[email protected]>

Both the fixes and s-o-b tag should be in the same final paragraph with no blank lines between. I assume that can be easily fixed up when applying.

Reviewed-by Stephen Warren <[email protected]>

Lukasz Majewski

author

2014-06-25 07:07 UTC #7 lore raw

PATCH v2 1/1 thor: defer parsing of device string to IO backend

Hi Stephen,

Quoted 11 lines · Lukasz Majewski

Quoted 10 lines
Commit d4f5ef59cc7 "dfu: defer parsing of device string to IO backend" changed the function signature of dfu_init_env_entities(). Adjust cmd_thordown.c to match that change.
Also, apply the same change as commit d6d37d737b58e "dfu: free entities when parsing fails" to cmd_thordown.c.
Fixes d4f5ef59cc7 ("dfu: defer parsing of device string to IO
backend")

Quoted 7 lines

Quoted 1 line
Signed-off-by Lukasz Majewski <[email protected]>
Both the fixes and s-o-b tag should be in the same final paragraph with no blank lines between. I assume that can be easily fixed up when applying.
Reviewed-by Stephen Warren <[email protected]>

Applied to u-boot-dfu,

Signature · 5 lines

Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group