pm: Fix to use abs time with policy event funcs

Update pm policy event usage after API was changed from
using relative time in cycles to absolute time in ticks.

Signed-off-by: Knut Eldhuset <[email protected]>

Author: knutel-nordic

subsys/mpsl/pm/mpsl_pm_utils.c

@@ -10,7 +10,6 @@
 #include <zephyr/pm/policy.h>
 #include <zephyr/logging/log.h>
 
-#include <mpsl/mpsl_work.h>
 #include <mpsl/mpsl_pm_utils.h>
 
 LOG_MODULE_REGISTER(mpsl_pm_utils, CONFIG_MPSL_LOG_LEVEL);
@@ -23,9 +22,6 @@ LOG_MODULE_REGISTER(mpsl_pm_utils, CONFIG_MPSL_LOG_LEVEL);
 #define TIME_TO_REGISTER_EVENT_IN_ZEPHYR_US 1000
 #define PM_MAX_LATENCY_HCI_COMMANDS_US 499999
 
-static void m_work_handler(struct k_work *work);
-static K_WORK_DELAYABLE_DEFINE(pm_work, m_work_handler);
-
 static uint8_t                          m_pm_prev_flag_value;
 static bool                             m_pm_event_is_registered;
 static uint32_t                         m_prev_lat_value_us;
@@ -66,38 +62,13 @@ void m_register_event(void)
 	}
 	case MPSL_PM_EVENT_STATE_BEFORE_EVENT:
 	{
-		/* Note: Considering an overflow could only happen if the system runs many years,
-		 * it needen't be considered here.
-		 */
-		int64_t current_time_us = k_uptime_get() * 1000;
-		uint64_t relative_time_us = params.event_time_abs_us - current_time_us;
-		uint64_t max_cycles_until_event = k_us_to_cyc_floor64(relative_time_us);
-
-		if (max_cycles_until_event > UINT32_MAX) {
-			/* The event is too far in the future and would
-			 * exceed the 32-bit cycle limit.
-			 */
-			uint64_t event_delay_us = params.event_time_abs_us - current_time_us -
-						  TIME_TO_REGISTER_EVENT_IN_ZEPHYR_US;
-#ifdef CONFIG_TIMEOUT_64BIT
-			mpsl_work_schedule(&pm_work, K_USEC(event_delay_us));
-#else
-			if (event_delay_us > UINT32_MAX) {
-				mpsl_work_schedule(&pm_work, K_USEC(UINT32_MAX));
-			} else {
-				mpsl_work_schedule(&pm_work, K_USEC((uint32_t)event_delay_us));
-			}
-#endif
-			return;
-		}
-
 		/* Event scheduled */
 		if (m_pm_event_is_registered) {
 			pm_policy_event_update(&m_evt,
-					       k_us_to_cyc_floor32(params.event_time_abs_us));
+					       k_us_to_ticks_floor64(params.event_time_abs_us));
 		} else {
 			pm_policy_event_register(&m_evt,
-						 k_us_to_cyc_floor32(params.event_time_abs_us));
+						 k_us_to_ticks_floor64(params.event_time_abs_us));
 			m_pm_event_is_registered = true;
 		}
 		break;
@@ -136,12 +107,6 @@ void mpsl_pm_utils_work_handler(void)
 	m_register_latency();
 }
 
-static void m_work_handler(struct k_work *work)
-{
-	ARG_UNUSED(work);
-	mpsl_pm_utils_work_handler();
-}
-
 void mpsl_pm_utils_init(void)
 {
 	mpsl_pm_params_t params = {0};

tests/subsys/mpsl/pm/CMakeLists.txt

@@ -13,11 +13,9 @@ project(pm_test)
 test_runner_generate(pm_test.c)
 
 # Create mocks for pm module.
-cmock_handle(${CMAKE_CURRENT_SOURCE_DIR}/kernel_minimal_mock.h)
 cmock_handle(${ZEPHYR_BASE}/include/zephyr/pm/policy.h)
 cmock_handle(${ZEPHYR_NRFXLIB_MODULE_DIR}/mpsl/include/mpsl_pm.h)
 cmock_handle(${ZEPHYR_NRFXLIB_MODULE_DIR}/mpsl/include/mpsl_pm_config.h)
-cmock_handle(${ZEPHYR_NRF_MODULE_DIR}/include/mpsl/mpsl_work.h)
 
 # Add Unit Under Test source files
 target_sources(app PRIVATE ${ZEPHYR_NRF_MODULE_DIR}/subsys/mpsl/pm/mpsl_pm_utils.c)
@@ -28,10 +26,6 @@ target_sources(app PRIVATE pm_test.c)
 # Include paths
 target_include_directories(app PRIVATE src)
 
-# Preinclude file to the UUT to redefine mpsl_work_schedule().
-set_property(SOURCE ${ZEPHYR_NRF_MODULE_DIR}/subsys/mpsl/pm/mpsl_pm_utils.c
-        PROPERTY COMPILE_FLAGS "-include mocks/kernel_minimal_mock.h -include mocks/mpsl_work.h")
-
 # Options that cannot be passed through Kconfig fragments.
 target_compile_options(app PRIVATE
 	-DCONFIG_PM=y

tests/subsys/mpsl/pm/kernel_minimal_mock.h

@@ -13,18 +13,11 @@
 #include "cmock_policy.h"
 #include "cmock_mpsl_pm.h"
 #include "cmock_mpsl_pm_config.h"
-#include "cmock_mpsl_work.h"
-#include "cmock_kernel_minimal_mock.h"
 
 #include <mpsl/mpsl_pm_utils.h>
 
 #define PM_MAX_LATENCY_HCI_COMMANDS_US 499999
 
-#define TIME_TO_REGISTER_EVENT_IN_ZEPHYR_US 1000
-
-/* Mock implementation for mpsl_work_q*/
-struct k_work_q mpsl_work_q;
-
 /* The unity_main is not declared in any header file. It is only defined in the generated test
  * runner because of ncs' unity configuration. It is therefore declared here to avoid a compiler
  * warning.
@@ -36,7 +29,6 @@ typedef enum {
 	EVENT_FUNC_REGISTER,
 	EVENT_FUNC_UPDATE,
 	EVENT_FUNC_UNREGISTER,
-	EVENT_FUNC_DELAY_SCHEDULING,
 } event_func_t;
 
 typedef enum {
@@ -87,26 +79,16 @@ void run_test(test_vector_event_t *p_test_vectors, int num_test_vctr)
 
 		switch (v.event_func) {
 		case EVENT_FUNC_REGISTER:
-			__cmock_k_uptime_get_ExpectAndReturn(v.curr_time_ms);
 			__cmock_pm_policy_event_register_Expect(0, v.event_time_us);
 			__cmock_pm_policy_event_register_IgnoreArg_evt();
 			break;
 		case EVENT_FUNC_UPDATE:
-			__cmock_k_uptime_get_ExpectAndReturn(v.curr_time_ms);
 			__cmock_pm_policy_event_update_Expect(0, v.event_time_us);
 			__cmock_pm_policy_event_update_IgnoreArg_evt();
 			break;
 		case EVENT_FUNC_UNREGISTER:
 			__cmock_pm_policy_event_unregister_ExpectAnyArgs();
 			break;
-		case EVENT_FUNC_DELAY_SCHEDULING:
-			__cmock_k_uptime_get_ExpectAndReturn(v.curr_time_ms);
-			__cmock_K_USEC_ExpectAndReturn(
-				v.event_time_us, (k_timeout_t){v.event_time_us + 100});
-			__cmock_mpsl_work_schedule_Expect(
-				0, (k_timeout_t){v.event_time_us + 100});
-			__cmock_mpsl_work_schedule_IgnoreArg_dwork();
-			break;
 		case EVENT_FUNC_NONE:
 			break;
 		}
@@ -226,28 +208,6 @@ void test_register_update_and_deregister_event(void)
 	run_test(&test_vectors[0], ARRAY_SIZE(test_vectors));
 }
 
-void test_event_delayed_work(void)
-{
-	uint64_t event_time_us = (uint64_t)UINT32_MAX + 50000;
-	/* Make sure time until event will be more than UINT32_MAX cycles away. */
-	TEST_ASSERT_GREATER_THAN_INT64(UINT32_MAX, k_us_to_cyc_floor64(event_time_us));
-
-	test_vector_event_t test_vectors[] = {
-		/* Event time after 32 bit cycles have wrapped, so schedule retry. */
-		{true, {event_time_us, MPSL_PM_EVENT_STATE_BEFORE_EVENT, 1},
-		 EVENT_FUNC_DELAY_SCHEDULING, event_time_us - 1000, 0},
-		/* Time has progressed until cycles will no longer wrap,
-		 * so register latency normally.
-		 */
-		{true, {event_time_us, MPSL_PM_EVENT_STATE_BEFORE_EVENT, 2},
-		 EVENT_FUNC_REGISTER, event_time_us, 100},
-		/* Deregister event. */
-		{true, {0, MPSL_PM_EVENT_STATE_NO_EVENTS_LEFT, 3},
-		 EVENT_FUNC_UNREGISTER, 0, 0},
-	};
-	run_test(&test_vectors[0], ARRAY_SIZE(test_vectors));
-}
-
 int main(void)
 {
 	(void)unity_main();

tests/subsys/mpsl/pm/pm_test.c

@@ -5,3 +5,4 @@
 #
 
 CONFIG_UNITY=y
+CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000000