Merge branch 'update/pm_trace_io_num_for_esp32h2' into 'master'

bugfix: update pm trace io num for esp32h2

Closes IDF-7657

See merge request espressif/esp-idf!24559

components/esp_pm/.build-test-rules.yml

@@ -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

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

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 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

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)

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()