From bedc26d0328b5fd6066148878e484626024cf61d Mon Sep 17 00:00:00 2001 From: Lou Tianhao Date: Mon, 3 Jul 2023 17:23:48 +0800 Subject: [PATCH 1/2] bugfix: update pm trace io num for esp32h2 --- components/esp_pm/.build-test-rules.yml | 7 ------- components/esp_pm/pm_trace.c | 9 ++++++++- components/esp_pm/test_apps/esp_pm/README.md | 4 ++-- components/esp_pm/test_apps/esp_pm/pytest_esp_pm.py | 13 ++++++------- 4 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 components/esp_pm/.build-test-rules.yml diff --git a/components/esp_pm/.build-test-rules.yml b/components/esp_pm/.build-test-rules.yml deleted file mode 100644 index 421533b5af..0000000000 --- a/components/esp_pm/.build-test-rules.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps - -components/esp_pm/test_apps/esp_pm: - disable: - - if: IDF_TARGET in ["esp32h2"] - temporary: true - reason: Not supported yet diff --git a/components/esp_pm/pm_trace.c b/components/esp_pm/pm_trace.c index c24a47b6f4..756ef40ae3 100644 --- a/components/esp_pm/pm_trace.c +++ b/components/esp_pm/pm_trace.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2016-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -29,6 +29,13 @@ static const int DRAM_ATTR s_trace_io[] = { BIT(15), BIT(15), // ESP_PM_TRACE_CCOMPARE_UPDATE BIT(16), BIT(17), // ESP_PM_TRACE_ISR_HOOK BIT(18), BIT(18), // ESP_PM_TRACE_SLEEP +#elif CONFIG_IDF_TARGET_ESP32H2 + BIT(2), BIT(3), // ESP_PM_TRACE_IDLE + BIT(4), BIT(5), // ESP_PM_TRACE_TICK + BIT(6), BIT(6), // ESP_PM_TRACE_FREQ_SWITCH + BIT(7), BIT(7), // ESP_PM_TRACE_CCOMPARE_UPDATE + BIT(8), BIT(9), // ESP_PM_TRACE_ISR_HOOK + BIT(10), BIT(10), // ESP_PM_TRACE_SLEEP #else BIT(2), BIT(3), // ESP_PM_TRACE_IDLE BIT(4), BIT(5), // ESP_PM_TRACE_TICK diff --git a/components/esp_pm/test_apps/esp_pm/README.md b/components/esp_pm/test_apps/esp_pm/README.md index 7e7523ec85..a8b7833fa3 100644 --- a/components/esp_pm/test_apps/esp_pm/README.md +++ b/components/esp_pm/test_apps/esp_pm/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/esp_pm/test_apps/esp_pm/pytest_esp_pm.py b/components/esp_pm/test_apps/esp_pm/pytest_esp_pm.py index cd13ea0edd..3e6d410793 100644 --- a/components/esp_pm/test_apps/esp_pm/pytest_esp_pm.py +++ b/components/esp_pm/test_apps/esp_pm/pytest_esp_pm.py @@ -4,14 +4,13 @@ import pytest from pytest_embedded import Dut -CONFIGS = [ - pytest.param('default', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32h2'], reason='TODO: IDF-7657')]), - pytest.param('limits', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32h2'], reason='TODO: IDF-7657')]), - pytest.param('options', marks=[pytest.mark.supported_targets, pytest.mark.temp_skip_ci(targets=['esp32h2'], reason='TODO: IDF-7657')]), -] - @pytest.mark.generic -@pytest.mark.parametrize('config', CONFIGS, indirect=True) +@pytest.mark.supported_targets +@pytest.mark.parametrize('config', [ + 'default', + 'limits', + 'options', +], indirect=True) def test_esp_pm(dut: Dut) -> None: dut.run_all_single_board_cases() From 3513d82df0b6a87583572ed0ade6229856f6c7d9 Mon Sep 17 00:00:00 2001 From: Lou Tianhao Date: Mon, 3 Jul 2023 20:29:27 +0800 Subject: [PATCH 2/2] remove: TODO IDF-7555 --- components/esp_pm/test_apps/esp_pm/main/test_pm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/esp_pm/test_apps/esp_pm/main/test_pm.c b/components/esp_pm/test_apps/esp_pm/main/test_pm.c index d3bc4ea1c7..5245c7527a 100644 --- a/components/esp_pm/test_apps/esp_pm/main/test_pm.c +++ b/components/esp_pm/test_apps/esp_pm/main/test_pm.c @@ -111,7 +111,6 @@ static void light_sleep_disable(void) ESP_ERROR_CHECK( esp_pm_configure(&pm_config) ); } -#if !CONFIG_IDF_TARGET_ESP32H2 // ESP32H2-TODO: IDF-7555 TEST_CASE("Automatic light occurs when tasks are suspended", "[pm]") { gptimer_handle_t gptimer = NULL; @@ -166,7 +165,6 @@ TEST_CASE("Automatic light occurs when tasks are suspended", "[pm]") TEST_ESP_OK(gptimer_disable(gptimer)); TEST_ESP_OK(gptimer_del_timer(gptimer)); } -#endif #if CONFIG_ULP_COPROC_TYPE_FSM #if !TEMPORARY_DISABLED_FOR_TARGETS(ESP32S2, ESP32S3)