From 072bf3a8ee2bbb81a0e5c4932c9d9ab7aac51fe2 Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Mon, 25 Nov 2024 18:50:01 +0800
Subject: [PATCH 1/3] test(sd): no uhs1 runner

---
 .../components/sdmmc_test_boards/sdmmc_test_board_defs.c        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/esp_driver_sdmmc/test_apps/sd_test_utils/components/sdmmc_test_boards/sdmmc_test_board_defs.c b/components/esp_driver_sdmmc/test_apps/sd_test_utils/components/sdmmc_test_boards/sdmmc_test_board_defs.c
index 533cbde8e2..15f8635c39 100644
--- a/components/esp_driver_sdmmc/test_apps/sd_test_utils/components/sdmmc_test_boards/sdmmc_test_board_defs.c
+++ b/components/esp_driver_sdmmc/test_apps/sd_test_utils/components/sdmmc_test_boards/sdmmc_test_board_defs.c
@@ -326,7 +326,7 @@ static const sdmmc_test_board_info_t s_board_info = {
         {
             .slot_exists = true,
             .bus_width = 4,
-            .uhs1_supported = true,
+            // .uhs1_supported = true,  //no runner for uhs1
             .clk = 43,
             .cmd_mosi = 44,
             .d0_miso = 39,

From 5c93ad2b7c67faaa228875610b6b3ee6f81789ad Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Mon, 25 Nov 2024 18:50:18 +0800
Subject: [PATCH 2/3] ci(sd): use uart0 as usj always serial noise on ci on p4

---
 .../esp_driver_sdmmc/test_apps/sdmmc/sdkconfig.defaults.esp32p4  | 1 -
 .../esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32c5  | 1 -
 .../esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32p4  | 1 -
 examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32c5        | 1 -
 examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32p4        | 1 -
 5 files changed, 5 deletions(-)
 delete mode 100644 examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32c5
 delete mode 100644 examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32p4

diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/sdkconfig.defaults.esp32p4 b/components/esp_driver_sdmmc/test_apps/sdmmc/sdkconfig.defaults.esp32p4
index bae8235e8d..7b8ca4566c 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/sdkconfig.defaults.esp32p4
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/sdkconfig.defaults.esp32p4
@@ -3,4 +3,3 @@ CONFIG_SDMMC_BOARD_ESP32P4_EV_BOARD=y
 CONFIG_SPIRAM=y
 CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 CONFIG_SPIRAM_SPEED_200M=y
-CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
diff --git a/components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32c5 b/components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32c5
index ad99756571..6b415e1dff 100644
--- a/components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32c5
+++ b/components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32c5
@@ -1,2 +1 @@
 CONFIG_SDMMC_BOARD_ESP32C5_BREAKOUT=y
-CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
diff --git a/components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32p4 b/components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32p4
index 74592300eb..4363f63715 100644
--- a/components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32p4
+++ b/components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32p4
@@ -1,2 +1 @@
 CONFIG_SDMMC_BOARD_ESP32P4_EV_BOARD_WITH_SDSPI=y
-CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
diff --git a/examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32c5 b/examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32c5
deleted file mode 100644
index 5e9f8e25bd..0000000000
--- a/examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32c5
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
diff --git a/examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32p4 b/examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32p4
deleted file mode 100644
index 5e9f8e25bd..0000000000
--- a/examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32p4
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y

From 7e7c8932b58a83914476ddf2b36cac0812660536 Mon Sep 17 00:00:00 2001
From: Armando <douyiwen@espressif.com>
Date: Mon, 25 Nov 2024 18:52:05 +0800
Subject: [PATCH 3/3] test(emmc): disabled emmc tests on p4

---
 .../components/sdmmc_tests/sdmmc_test_begin_end_sd.c     | 9 ++++++++-
 .../components/sdmmc_tests/sdmmc_test_begin_end_sd.h     | 5 ++++-
 .../sdmmc/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c   | 3 +++
 .../sdmmc/components/sdmmc_tests/sdmmc_test_discard_sd.c | 2 +-
 .../sdmmc/components/sdmmc_tests/sdmmc_test_erase_sd.c   | 2 +-
 .../sdmmc/components/sdmmc_tests/sdmmc_test_probe_sd.c   | 2 +-
 .../sdmmc/components/sdmmc_tests/sdmmc_test_rw_sd.c      | 6 +++---
 .../components/sdmmc_tests/sdmmc_test_sanitize_sd.c      | 2 +-
 .../sdmmc/components/sdmmc_tests/sdmmc_test_trim_sd.c    | 2 +-
 .../components/sdmmc_tests/sdmmc_test_various_cmds.c     | 2 +-
 10 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_begin_end_sd.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_begin_end_sd.c
index cd37a75364..3d232b9fad 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_begin_end_sd.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_begin_end_sd.c
@@ -18,7 +18,7 @@
 #include "sd_pwr_ctrl.h"
 #include "sd_pwr_ctrl_by_on_chip_ldo.h"
 
-void sdmmc_test_sd_skip_if_board_incompatible(int slot, int width, int freq_khz, int ddr)
+void sdmmc_test_sd_skip_if_board_incompatible(int slot, int width, int freq_khz, int ddr, int is_emmc)
 {
     sdmmc_host_t config = SDMMC_HOST_DEFAULT();
     sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
@@ -26,6 +26,13 @@ void sdmmc_test_sd_skip_if_board_incompatible(int slot, int width, int freq_khz,
     if (!sdmmc_test_board_has_slot(slot)) {
         TEST_IGNORE_MESSAGE("Board doesn't have the required slot");
     }
+
+    if (is_emmc) {
+        if (!sdmmc_test_board_slot_is_emmc(slot)) {
+            TEST_IGNORE_MESSAGE("Board doesn't have the emmc card inserted");
+        }
+    }
+
     sdmmc_test_board_get_config_sdmmc(slot, &config, &slot_config);
 
     int board_max_freq_khz = sdmmc_test_board_get_slot_info(slot)->max_freq_khz;
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_begin_end_sd.h b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_begin_end_sd.h
index 1120781185..365293c522 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_begin_end_sd.h
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_begin_end_sd.h
@@ -16,6 +16,8 @@ extern "C" {
 #define SLOT_1  1
 #define NO_DDR 0
 #define WITH_DDR 1
+#define NO_EMMC 0
+#define IS_EMMC 1
 
 /* Helper functions to initialize/deinintalize the host (SDMMC/SDSPI) inside the test */
 
@@ -28,8 +30,9 @@ extern "C" {
  * @param width  Slot width (1, 4 or 8)
  * @param freq_khz  Bus frequency in kHz
  * @param ddr  Whether to use DDR mode (NO_DDR or WITH_DDR)
+ * @param is_emmc Is emmc or not
  */
-void sdmmc_test_sd_skip_if_board_incompatible(int slot, int width, int freq_khz, int ddr);
+void sdmmc_test_sd_skip_if_board_incompatible(int slot, int width, int freq_khz, int ddr, int is_emmc);
 
 /**
  * @brief Helper function to initialize the SDMMC host and slot for the test using the given settings
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c
index 80e9e01730..fcd1dcb788 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_cd_wp_sd.c
@@ -8,6 +8,7 @@
 #include "sdmmc_cmd.h"
 #include "driver/sdmmc_host.h"
 #include "sdmmc_test_cd_wp_common.h"
+#include "sdmmc_test_begin_end_sd.h"
 #include "sdmmc_test_board.h"
 #include "sd_pwr_ctrl.h"
 #include "sd_pwr_ctrl_by_on_chip_ldo.h"
@@ -16,6 +17,7 @@ TEST_CASE("CD input works in SD mode", "[sdmmc]")
 {
     sdmmc_host_t config = SDMMC_HOST_DEFAULT();
     sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
+    sdmmc_test_sd_skip_if_board_incompatible(SDMMC_HOST_SLOT_1, 0, SDMMC_FREQ_PROBING, NO_DDR, NO_EMMC);
     sdmmc_test_board_get_config_sdmmc(SDMMC_HOST_SLOT_1, &config, &slot_config);
     const int test_gpio = sdmmc_test_board_get_slot_info(SDMMC_HOST_SLOT_1)->unused_pin;
     slot_config.gpio_cd = test_gpio;
@@ -48,6 +50,7 @@ TEST_CASE("WP input works in SD mode", "[sdmmc]")
     sdmmc_test_board_card_power_set(true);
     sdmmc_host_t config = SDMMC_HOST_DEFAULT();
     sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
+    sdmmc_test_sd_skip_if_board_incompatible(SDMMC_HOST_SLOT_1, 0, SDMMC_FREQ_PROBING, NO_DDR, NO_EMMC);
     sdmmc_test_board_get_config_sdmmc(SDMMC_HOST_SLOT_1, &config, &slot_config);
     const int test_gpio = sdmmc_test_board_get_slot_info(SDMMC_HOST_SLOT_1)->unused_pin;
     slot_config.gpio_wp = test_gpio;
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_discard_sd.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_discard_sd.c
index b0211b73d9..392c8cec04 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_discard_sd.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_discard_sd.c
@@ -43,7 +43,7 @@ static void test_discard_blocks(sdmmc_card_t* card, int slot)
 static void do_one_mmc_discard_test(int slot, int width, int freq_khz, int ddr)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, IS_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     test_discard_blocks(&card, slot);
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_erase_sd.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_erase_sd.c
index 9212c61a8c..9a40351d82 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_erase_sd.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_erase_sd.c
@@ -15,7 +15,7 @@
 static void do_one_sdmmc_erase_test(int slot, int width, int freq_khz, int ddr)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, NO_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     sdmmc_test_sd_erase_blocks(&card);
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_probe_sd.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_probe_sd.c
index ce4ab53fc4..f10d8d68a4 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_probe_sd.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_probe_sd.c
@@ -13,7 +13,7 @@
 static void do_one_sdmmc_probe_test(int slot, int width, int freq_khz, int ddr)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, NO_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     uint8_t* buffer = heap_caps_calloc(512, 1, MALLOC_CAP_DMA);
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_rw_sd.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_rw_sd.c
index 942bae84b7..3a07056213 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_rw_sd.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_rw_sd.c
@@ -15,7 +15,7 @@
 static void do_one_sdmmc_perf_test(int slot, int width, int freq_khz, int ddr, FILE* perf_log)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, NO_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     sdmmc_test_rw_performance(&card, perf_log);
@@ -68,7 +68,7 @@ TEST_CASE("sdmmc read/write performance, slot 1, 4-bit DDR", "[sdmmc]")
 static void do_one_sdmmc_rw_test_with_offset(int slot, int width, int freq_khz, int ddr)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, NO_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     sdmmc_test_rw_with_offset(&card);
@@ -90,7 +90,7 @@ TEST_CASE("sdmmc read/write performance with offset, slot 1, 4-bit", "[sdmmc]")
 static void do_one_sdmmc_rw_test_unaligned_buffer(int slot, int width, int freq_khz, int ddr)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, NO_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     sdmmc_test_rw_unaligned_buffer(&card);
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_sanitize_sd.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_sanitize_sd.c
index 4fc434fbb5..45492e76b7 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_sanitize_sd.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_sanitize_sd.c
@@ -35,7 +35,7 @@ static void test_mmc_sanitize_blocks(sdmmc_card_t* card)
 static void do_one_mmc_sanitize_test(int slot, int width, int freq_khz, int ddr)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, IS_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     test_mmc_sanitize_blocks(&card);
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_trim_sd.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_trim_sd.c
index 8f277b8066..6a02d8bc63 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_trim_sd.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_trim_sd.c
@@ -33,7 +33,7 @@ static void test_mmc_trim_blocks(sdmmc_card_t* card)
 static void do_one_mmc_trim_test(int slot, int width, int freq_khz, int ddr)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, IS_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     test_mmc_trim_blocks(&card);
diff --git a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_various_cmds.c b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_various_cmds.c
index 2f05d0ceca..85b1a99912 100644
--- a/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_various_cmds.c
+++ b/components/esp_driver_sdmmc/test_apps/sdmmc/components/sdmmc_tests/sdmmc_test_various_cmds.c
@@ -55,7 +55,7 @@ static void sdmmc_write_sectors_cmd25_error_test_acmd22(sdmmc_card_t* card, uint
 static void do_one_mmc_acmd22_test(int slot, int width, int freq_khz, int ddr)
 {
     sdmmc_card_t card;
-    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr);
+    sdmmc_test_sd_skip_if_board_incompatible(slot, width, freq_khz, ddr, IS_EMMC);
     sdmmc_test_sd_begin(slot, width, freq_khz, ddr, &card);
     sdmmc_card_print_info(stdout, &card);
     sdmmc_write_sectors_cmd25_error_test_acmd22(&card, 4096 * 4);