usb: usb_dfu: do not set bwPollTimeout dynamically

Partially revert commit ea177e7 ("usb: dfu: set bwPollTimeout dynamically") Introduced fix does not work proper because there is no way to be sure that a control stage had success before start erase process. Instead IMG_ERASE_PROGRESSIVELY configuration should be used if the erase of the flash takes longer time. resolves: zephyrproject-rtos#15497 Signed-off-by: Johann Fischer <[email protected]>
jfischer-no · May 2, 2019 · 5380618 · 5380618
1 parent 3db09aa
commit 5380618
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/subsys/usb/class/Kconfig b/subsys/usb/class/Kconfig
@@ -151,12 +151,3 @@ config USB_DFU_DEFAULT_POLLTIMEOUT
 	range 0 1000
 	help
 	  Default value for bwPollTimeout (in ms)
-
-config USB_DFU_DNLOAD_POLLTIMEOUT
-	prompt "Value of bwPollTimeout during DNLOAD stage"
-	int
-	depends on USB_DFU_CLASS
-	default 10000
-	range 0 65535
-	help
-	  Value of bwPollTimeout (in ms) during DNLOAD stage
diff --git a/subsys/usb/class/usb_dfu.c b/subsys/usb/class/usb_dfu.c
@@ -404,9 +404,6 @@ static int dfu_class_handle_req(struct usb_setup_packet *pSetup,
 		/* iString */
 		(*data)[5] = 0U;
 		*data_len = 6;
-		if (dfu_data.state == dfuDNBUSY) {
-			k_work_submit(&dfu_work);
-		}
 		break;
 
 	case DFU_GETSTATE:
@@ -449,8 +446,6 @@ static int dfu_class_handle_req(struct usb_setup_packet *pSetup,
 		switch (dfu_data.state) {
 		case dfuIDLE:
 			LOG_DBG("DFU_DNLOAD start");
-			dfu_data.bwPollTimeout =
-				CONFIG_USB_DFU_DNLOAD_POLLTIMEOUT;
 			dfu_reset_counters();
 			k_poll_signal_reset(&dfu_signal);
 
@@ -466,15 +461,13 @@ static int dfu_class_handle_req(struct usb_setup_packet *pSetup,
 			dfu_data_worker.worker_state = dfuIDLE;
 			dfu_data_worker.worker_len  = pSetup->wLength;
 			memcpy(dfu_data_worker.buf, *data, pSetup->wLength);
-			/* do not submit dfu_work now, wait for DFU_GETSTATUS */
+			k_work_submit(&dfu_work);
 			break;
 		case dfuDNLOAD_IDLE:
 			dfu_data.state = dfuDNBUSY;
 			dfu_data_worker.worker_state = dfuDNLOAD_IDLE;
 			dfu_data_worker.worker_len  = pSetup->wLength;
 			if (dfu_data_worker.worker_len == 0U) {
-				dfu_data.bwPollTimeout =
-					CONFIG_USB_DFU_DEFAULT_POLLTIMEOUT;
 				dfu_data.state = dfuMANIFEST_SYNC;
 				k_poll_signal_raise(&dfu_signal, 0);
 			}