modules: Use dedicated workqueue for LED PWM handling

After modem FOTA the download client thread tries to put the modem into bootloader mode. However, this times out. Suspected reason is that the LED PWM handling is blocking the download client thread due to being scheduled in tight steps via the system workqueue (cooperative). Also, reinstate eDRX setting in prj.conf that was removed by mistake. AND, increase full modem test timeout to 30 minutes as it occasionally times out. (Slow download) Signed-off-by: Simen S. Røstad <[email protected]>
hello-nrfcloud · Sep 17, 2024 · a3ccac4 · a3ccac4
1 parent e5f413c
commit a3ccac4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/app/prj.conf b/app/prj.conf
@@ -50,6 +50,12 @@ CONFIG_LTE_PSM_REQ_RPTAU_SECONDS=7200
 # downlink data, there is no need for prolonged active paging after the RRC connection release.
 CONFIG_LTE_PSM_REQ_RAT_SECONDS=6
 
+# Enable eDRX (Extended Discontinuous Reception)
+CONFIG_LTE_EDRX_REQ=y
+# "0000" is 5.12 s
+CONFIG_LTE_EDRX_REQ_VALUE_LTE_M="0000"
+CONFIG_LTE_EDRX_REQ_VALUE_NBIOT="0000"
+
 # Modem library
 CONFIG_NRF_MODEM_LIB=y
 

diff --git a/app/src/modules/fota/fota.c b/app/src/modules/fota/fota.c
@@ -324,7 +324,6 @@ static void fota_status(enum nrf_cloud_fota_status status, const char *const sta
 	case NRF_CLOUD_FOTA_SUCCEEDED:
 		LOG_DBG("Firmware update succeeded");
 
-		/* Dont */
 		status_events_notify(FOTA_STATUS_STOP);
 		return;
 	default:

diff --git a/app/src/modules/led/Kconfig.led b/app/src/modules/led/Kconfig.led
@@ -11,6 +11,10 @@ menuconfig APP_LED
 
 if APP_LED
 
+config APP_LED_PWM_WORKQUEUE_STACK_SIZE
+	int "LED PWM WQ stack size"
+	default 768
+
 module = APP_LED
 module-str = LED
 source "subsys/logging/Kconfig.template.log_config"

diff --git a/app/src/modules/led/led_pwm.c b/app/src/modules/led/led_pwm.c
@@ -36,6 +36,10 @@ static const struct pwm_dt_spec led2 = PWM_DT_SPEC_GET(PWM_LED2_NODE);
 #error "Unsupported board: pwm-led 2 devicetree alias is not defined"
 #endif
 
+/* Define separate workqueue to offload led PWM handling */
+static K_THREAD_STACK_DEFINE(stack_area, CONFIG_APP_LED_PWM_WORKQUEUE_STACK_SIZE);
+static struct k_work_q led_pwm_queue;
+
 struct led {
 	size_t id;
 	struct led_color color;
@@ -143,7 +147,7 @@ static void work_handler(struct k_work *work)
 		int32_t next_delay =
 			leds.effect->steps[leds.effect_step].substep_time;
 
-		k_work_reschedule(&leds.work, K_MSEC(next_delay));
+		k_work_reschedule_for_queue(&led_pwm_queue, &leds.work, K_MSEC(next_delay));
 	}
 }
 
@@ -165,7 +169,7 @@ static void led_update(struct led *led)
 		int32_t next_delay =
 			led->effect->steps[led->effect_step].substep_time;
 
-		k_work_schedule(&led->work, K_MSEC(next_delay));
+		k_work_schedule_for_queue(&led_pwm_queue, &led->work, K_MSEC(next_delay));
 	} else {
 		LOG_DBG("LED effect with no effect");
 	}
@@ -268,6 +272,12 @@ int led_pwm_set_rgb(uint8_t red, uint8_t green, uint8_t blue)
 
 static int led_pwm_init(void)
 {
+	k_work_queue_init(&led_pwm_queue);
+	k_work_queue_start(&led_pwm_queue, stack_area,
+			   K_THREAD_STACK_SIZEOF(stack_area),
+			   K_LOWEST_APPLICATION_THREAD_PRIO,
+			   NULL);
+
 	k_work_init_delayable(&leds.work, work_handler);
 
 	return 0;

diff --git a/app/src/modules/transport/transport.c b/app/src/modules/transport/transport.c
@@ -227,7 +227,7 @@ static void state_running_entry(void *o)
 	k_work_queue_init(&transport_queue);
 	k_work_queue_start(&transport_queue, stack_area,
 			   K_THREAD_STACK_SIZEOF(stack_area),
-			   K_HIGHEST_APPLICATION_THREAD_PRIO,
+			   K_LOWEST_APPLICATION_THREAD_PRIO,
 			   NULL);
 
 	err = nrf_cloud_coap_init();

diff --git a/tests/on_target/tests/test_fota.py b/tests/on_target/tests/test_fota.py
@@ -24,7 +24,7 @@
 
 WAIT_FOR_FOTA_AVAILABLE = 60 * 4
 APP_FOTA_TIMEOUT = 60 * 10
-FULL_MFW_FOTA_TIMEOUT = 60 * 20
+FULL_MFW_FOTA_TIMEOUT = 60 * 30
 
 
 def wait_for_fota_available(t91x_board):