Merge branch 'bugfix/fix_i2s_pcnt_target_test_on_h2' into 'master'

Test: Fixed target test of I2S and PCNT on H2 Closes IDF-6811, IDF-6814, IDFCI-1623, and IDFCI-1627 See merge request espressif/esp-idf!22478
2025-08-08 07:04:32 +02:00 · 2023-02-24 16:03:48 +08:00
parent cf146d4b31 646fd5e15a
commit 5dc7cd6c54
10 changed files with 25 additions and 22 deletions
--- a/components/driver/.build-test-rules.yml
+++ b/components/driver/.build-test-rules.yml
@@ -19,10 +19,7 @@ components/driver/test_apps/i2s_test_apps:
 components/driver/test_apps/i2s_test_apps/i2s:
  disable:
    - if: SOC_I2S_SUPPORTED != 1
-  disable_test:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: Cannot pass test, see IDF-6811
+
 components/driver/test_apps/i2s_test_apps/i2s_tdm:
  disable:
    - if: SOC_I2S_SUPPORTS_TDM != 1
@@ -34,10 +31,6 @@ components/driver/test_apps/i2s_test_apps/legacy_i2s_adc_dac:
 components/driver/test_apps/i2s_test_apps/legacy_i2s_driver:
  disable:
    - if: SOC_I2S_SUPPORTED != 1
-  disable_test:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: cannot pass test IDF-6811

 components/driver/test_apps/ledc:
  disable:
@@ -58,10 +51,6 @@ components/driver/test_apps/legacy_mcpwm_driver:
 components/driver/test_apps/legacy_pcnt_driver:
  disable:
    - if: SOC_PCNT_SUPPORTED != 1
-  disable_test:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: cannot pass test IDF-6814

 components/driver/test_apps/legacy_rmt_driver:
  disable:
--- a/components/driver/i2s/i2s_common.c
+++ b/components/driver/i2s/i2s_common.c
@@ -1086,8 +1086,11 @@ esp_err_t i2s_channel_preload_data(i2s_chan_handle_t tx_handle, const void *src,
        if (bytes_can_load == 0) {
            break;
        }
+        /* Add spinlock in case memcpy be interrupted */
+        portENTER_CRITICAL_SAFE(&g_i2s.spinlock);
        /* Load the data from the last loaded position */
        memcpy((uint8_t *)(desc_ptr->buf + tx_handle->dma.rw_pos), data_ptr, bytes_can_load);
+        portEXIT_CRITICAL_SAFE(&g_i2s.spinlock);
        data_ptr += bytes_can_load;             // Move forward the data pointer
        total_loaded_bytes += bytes_can_load;   // Add to the total loaded bytes
        remain_bytes -= bytes_can_load;         // Update the remaining bytes to be loaded
@@ -1143,7 +1146,10 @@ esp_err_t i2s_channel_write(i2s_chan_handle_t handle, const void *src, size_t si
        if (bytes_can_write > size) {
            bytes_can_write = size;
        }
+        /* Add spinlock in case memcpy be interrupted */
+        portENTER_CRITICAL_SAFE(&g_i2s.spinlock);
        memcpy(data_ptr, src_byte, bytes_can_write);
+        portEXIT_CRITICAL_SAFE(&g_i2s.spinlock);
        size -= bytes_can_write;
        src_byte += bytes_can_write;
        handle->dma.rw_pos += bytes_can_write;
@@ -1185,7 +1191,10 @@ esp_err_t i2s_channel_read(i2s_chan_handle_t handle, void *dest, size_t size, si
        if (bytes_can_read > (int)size) {
            bytes_can_read = size;
        }
+        /* Add spinlock in case memcpy be interrupted */
+        portENTER_CRITICAL_SAFE(&g_i2s.spinlock);
        memcpy(dest_byte, data_ptr, bytes_can_read);
+        portEXIT_CRITICAL_SAFE(&g_i2s.spinlock);
        size -= bytes_can_read;
        dest_byte += bytes_can_read;
        handle->dma.rw_pos += bytes_can_read;
--- a/components/driver/test_apps/i2s_test_apps/i2s/main/test_i2s.c
+++ b/components/driver/test_apps/i2s_test_apps/i2s/main/test_i2s.c
@@ -749,11 +749,15 @@ static void i2s_test_common_sample_rate(i2s_chan_handle_t rx_chan, i2s_std_clk_c
    /* Test common sample rate
     * Workaround: set 12000 as 12001 to bypass the unknown failure, TODO: IDF-6705 */
    const uint32_t test_freq[] = {
-        8000,  10000, 11025, 12001, 16000, 22050,
+        8000,  10001, 11025, 12001, 16000, 22050,
        24000, 32000, 44100, 48000, 64000, 88200,
        96000, 128000,144000,196000};
    int real_pulse = 0;
    int case_cnt = sizeof(test_freq) / sizeof(uint32_t);
+#if SOC_I2S_SUPPORTS_PLL_F96M
+    // 196000 Hz sample rate doesn't support on PLL_96M target
+    case_cnt = 15;
+#endif
 #if SOC_I2S_SUPPORTS_XTAL
    // Can't support a very high sample rate while using XTAL as clock source
    if (clk_cfg->clk_src == I2S_CLK_SRC_XTAL) {
--- a/components/driver/test_apps/i2s_test_apps/i2s/pytest_i2s.py
+++ b/components/driver/test_apps/i2s_test_apps/i2s/pytest_i2s.py
@@ -10,7 +10,7 @@ from pytest_embedded import Dut
@pytest.mark.esp32c3
@pytest.mark.esp32c6
@pytest.mark.esp32s3
-# @pytest.mark.esp32h2  IDF-6811
+@pytest.mark.esp32h2
@pytest.mark.generic
@pytest.mark.parametrize(
    'config',
--- a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/main/test_legacy_i2s.c
+++ b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/main/test_legacy_i2s.c
@@ -888,6 +888,11 @@ static void i2s_test_common_sample_rate(i2s_port_t id)
    int case_cnt = sizeof(test_freq) / sizeof(uint32_t);
 #endif

+#if SOC_I2S_SUPPORTS_PLL_F96M
+    // 196000 Hz sample rate doesn't support on PLL_96M target
+    case_cnt = 15;
+#endif
+
    // Acquire the PM lock incase Dynamic Frequency Scaling(DFS) lower the frequency
 #ifdef CONFIG_PM_ENABLE
    esp_pm_lock_handle_t pm_lock;
--- a/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/pytest_legacy_i2s.py
+++ b/components/driver/test_apps/i2s_test_apps/legacy_i2s_driver/pytest_legacy_i2s.py
@@ -10,7 +10,7 @@ from pytest_embedded import Dut
@pytest.mark.esp32c3
@pytest.mark.esp32s3
@pytest.mark.esp32c6
-# @pytest.mark.esp32h2  IDF-6811
+@pytest.mark.esp32h2
@pytest.mark.generic
@pytest.mark.parametrize(
    'config',
--- a/components/driver/test_apps/legacy_pcnt_driver/main/test_legacy_pcnt.c
+++ b/components/driver/test_apps/legacy_pcnt_driver/main/test_legacy_pcnt.c
@@ -21,7 +21,7 @@
 #include "unity.h"
 #include "esp_rom_gpio.h"

-#define PULSE_IO 21
+#define PULSE_IO 12
 #define PCNT_INPUT_IO 4
 #define PCNT_CTRL_VCC_IO 5
 #define PCNT_CTRL_GND_IO 2
--- a/components/driver/test_apps/legacy_pcnt_driver/pytest_legacy_pcnt.py
+++ b/components/driver/test_apps/legacy_pcnt_driver/pytest_legacy_pcnt.py
@@ -9,7 +9,7 @@ from pytest_embedded import Dut
@pytest.mark.esp32s2
@pytest.mark.esp32s3
@pytest.mark.esp32c6
-# @pytest.mark.esp32h2  IDF-6814
+@pytest.mark.esp32h2
@pytest.mark.generic
@pytest.mark.parametrize(
    'config',
--- a/examples/peripherals/.build-test-rules.yml
+++ b/examples/peripherals/.build-test-rules.yml
@@ -57,10 +57,6 @@ examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm:
  disable:
    - if: SOC_I2S_SUPPORTS_TDM != 1 or (SOC_I2C_SUPPORTED != 1 or SOC_GPSPI_SUPPORTED != 1)
      reason: rely on I2S TDM mode to receive audio, I2C to config es7210 and SPI to save audio to SD card
-  disable_test:
-    - if: IDF_TARGET in ["esp32h2"]
-      temporary: true
-      reason: cannot pass target test IDF-6811

 examples/peripherals/i2s/i2s_codec/i2s_es8311:
  disable:
--- a/examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm/pytest_i2s_es7210_tdm.py
+++ b/examples/peripherals/i2s/i2s_codec/i2s_es7210_tdm/pytest_i2s_es7210_tdm.py
@@ -7,7 +7,7 @@ from pytest_embedded import Dut
@pytest.mark.esp32s3
@pytest.mark.esp32c3
@pytest.mark.esp32c6
-# @pytest.mark.esp32h2   IDF-6264
+@pytest.mark.esp32h2
@pytest.mark.generic
 def test_i2s_es7210_tdm_example(dut: Dut) -> None:
    dut.expect_exact('example: Create I2S receive channel')