feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(sdspi): fixed sdspi on p4, s3

Browse Source
This commit is contained in:
Armando
2024-08-29 17:35:29 +08:00
parent fdbdeaaae2
commit 4922c67780
13 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_driver_sdmmc/test_apps/sd_test_utils/components/sdmmc_test_boards/Kconfig.projbuild
View File

@@ -33,6 +33,10 @@ menu "SDMMC Test Board Configuration"
bool "ESP32-P4 Function EV Board" bool "ESP32-P4 Function EV Board"
depends on IDF_TARGET_ESP32P4 depends on IDF_TARGET_ESP32P4
config SDMMC_BOARD_ESP32P4_EV_BOARD_WITH_SDSPI
bool "ESP32-P4 Function EV Board with SDSPI breakout"
depends on IDF_TARGET_ESP32P4
config SDMMC_BOARD_CUSTOM_SD config SDMMC_BOARD_CUSTOM_SD
depends on SOC_SDMMC_HOST_SUPPORTED depends on SOC_SDMMC_HOST_SUPPORTED
bool "Custom SD (choose pins)" bool "Custom SD (choose pins)"
@@ -133,6 +137,8 @@ menu "SDMMC Test Board Configuration"
config SDMMC_BOARD_CUSTOM_UNUSED config SDMMC_BOARD_CUSTOM_UNUSED
int "GPIO not routed on the board" int "GPIO not routed on the board"
default 34 if IDF_TARGET_ESP32P4
default 8 if IDF_TARGET_ESP32C5
default -1 default -1
endmenu endmenu

28
components/esp_driver_sdmmc/test_apps/sd_test_utils/components/sdmmc_test_boards/sdmmc_test_board_defs.c
View File

@@ -346,6 +346,34 @@ static const sdmmc_test_board_info_t s_board_info = {
}, },
}; };
#elif CONFIG_SDMMC_BOARD_ESP32P4_EV_BOARD_WITH_SDSPI
static const sdmmc_test_board_info_t s_board_info = {
.name = "ESP32-P4 Function EV Board with SDSPI breakout",
.slot = {
{
.slot_exists = false
},
{
.slot_exists = true,
.bus_width = 1,
.clk = 53,
.cmd_mosi = 36,
.d0_miso = 47,
.d1 = GPIO_NUM_NC,
.d2 = GPIO_NUM_NC,
.d3_cs = 33,
.d4 = GPIO_NUM_NC,
.d5 = GPIO_NUM_NC,
.d6 = GPIO_NUM_NC,
.d7 = GPIO_NUM_NC,
.cd = CONFIG_SDMMC_BOARD_CUSTOM_CD,
.wp = CONFIG_SDMMC_BOARD_CUSTOM_WP,
.unused_pin = CONFIG_SDMMC_BOARD_CUSTOM_UNUSED,
}
},
};
#elif CONFIG_SDMMC_BOARD_CUSTOM_SD #elif CONFIG_SDMMC_BOARD_CUSTOM_SD
static const sdmmc_test_board_info_t s_board_info = { static const sdmmc_test_board_info_t s_board_info = {

5
components/esp_driver_sdspi/test_apps/.build-test-rules.yml
View File

@@ -2,9 +2,8 @@ components/esp_driver_sdspi/test_apps/sdspi:
disable: disable:
- if: SOC_GPSPI_SUPPORTED != 1 - if: SOC_GPSPI_SUPPORTED != 1
disable_test: disable_test:
- if: SOC_GPSPI_SUPPORTED == 1 - if: IDF_TARGET not in ["esp32", "esp32s3", "esp32c3", "esp32p4"]
temporary: true reason: needs special runner, select few typical targets for testing
reason: will add runners later # TODO: IDF-8747
depends_components: depends_components:
- sdmmc - sdmmc
- esp_driver_sdspi - esp_driver_sdspi

32
components/esp_driver_sdspi/test_apps/sdspi/components/sdspi_tests/sdmmc_test_cd_wp_spi.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -11,6 +11,8 @@
#include "sdmmc_test_board.h" #include "sdmmc_test_board.h"
#include "sdmmc_test_begin_end_spi.h" #include "sdmmc_test_begin_end_spi.h"
#include "sdmmc_test_cd_wp_common.h" #include "sdmmc_test_cd_wp_common.h"
#include "sd_pwr_ctrl.h"
#include "sd_pwr_ctrl_by_on_chip_ldo.h"
TEST_CASE("CD input works in SPI mode", "[sdspi]") TEST_CASE("CD input works in SPI mode", "[sdspi]")
{ {
@@ -22,6 +24,18 @@ TEST_CASE("CD input works in SPI mode", "[sdspi]")
sdmmc_test_board_get_config_sdspi(slot, &config, &bus_config, &dev_config); sdmmc_test_board_get_config_sdspi(slot, &config, &bus_config, &dev_config);
const int test_gpio = sdmmc_test_board_get_slot_info(slot)->unused_pin; const int test_gpio = sdmmc_test_board_get_slot_info(slot)->unused_pin;
dev_config.gpio_cd = test_gpio; dev_config.gpio_cd = test_gpio;
#if SOC_SDMMC_IO_POWER_EXTERNAL
#define SDMMC_PWR_LDO_CHANNEL 4
sd_pwr_ctrl_ldo_config_t ldo_config = {
.ldo_chan_id = SDMMC_PWR_LDO_CHANNEL,
};
sd_pwr_ctrl_handle_t pwr_ctrl_handle = NULL;
TEST_ESP_OK(sd_pwr_ctrl_new_on_chip_ldo(&ldo_config, &pwr_ctrl_handle));
config.pwr_ctrl_handle = pwr_ctrl_handle;
#endif
sdmmc_test_board_card_power_set(true); sdmmc_test_board_card_power_set(true);
TEST_ESP_OK(spi_bus_initialize(dev_config.host_id, &bus_config, SPI_DMA_CH_AUTO)); TEST_ESP_OK(spi_bus_initialize(dev_config.host_id, &bus_config, SPI_DMA_CH_AUTO));
TEST_ESP_OK(sdspi_host_init()); TEST_ESP_OK(sdspi_host_init());
@@ -34,6 +48,9 @@ TEST_CASE("CD input works in SPI mode", "[sdspi]")
TEST_ESP_OK(sdspi_host_deinit()); TEST_ESP_OK(sdspi_host_deinit());
TEST_ESP_OK(spi_bus_free(SDSPI_DEFAULT_HOST)); TEST_ESP_OK(spi_bus_free(SDSPI_DEFAULT_HOST));
sdmmc_test_board_card_power_set(false); sdmmc_test_board_card_power_set(false);
#if SOC_SDMMC_IO_POWER_EXTERNAL
TEST_ESP_OK(sd_pwr_ctrl_del_on_chip_ldo(pwr_ctrl_handle));
#endif
} }
TEST_CASE("WP input works in SPI mode", "[sdspi]") TEST_CASE("WP input works in SPI mode", "[sdspi]")
@@ -48,6 +65,16 @@ TEST_CASE("WP input works in SPI mode", "[sdspi]")
dev_config.gpio_wp = test_gpio; dev_config.gpio_wp = test_gpio;
sdmmc_test_board_card_power_set(true); sdmmc_test_board_card_power_set(true);
TEST_ESP_OK(spi_bus_initialize(dev_config.host_id, &bus_config, SPI_DMA_CH_AUTO)); TEST_ESP_OK(spi_bus_initialize(dev_config.host_id, &bus_config, SPI_DMA_CH_AUTO));
#if SOC_SDMMC_IO_POWER_EXTERNAL
#define SDMMC_PWR_LDO_CHANNEL 4
sd_pwr_ctrl_ldo_config_t ldo_config = {
.ldo_chan_id = SDMMC_PWR_LDO_CHANNEL,
};
sd_pwr_ctrl_handle_t pwr_ctrl_handle = NULL;
TEST_ESP_OK(sd_pwr_ctrl_new_on_chip_ldo(&ldo_config, &pwr_ctrl_handle));
config.pwr_ctrl_handle = pwr_ctrl_handle;
#endif
TEST_ESP_OK(sdspi_host_init()); TEST_ESP_OK(sdspi_host_init());
TEST_ESP_OK(sdspi_host_init_device(&dev_config, &handle)); TEST_ESP_OK(sdspi_host_init_device(&dev_config, &handle));
@@ -58,4 +85,7 @@ TEST_CASE("WP input works in SPI mode", "[sdspi]")
TEST_ESP_OK(sdspi_host_deinit()); TEST_ESP_OK(sdspi_host_deinit());
TEST_ESP_OK(spi_bus_free(SDSPI_DEFAULT_HOST)); TEST_ESP_OK(spi_bus_free(SDSPI_DEFAULT_HOST));
sdmmc_test_board_card_power_set(false); sdmmc_test_board_card_power_set(false);
#if SOC_SDMMC_IO_POWER_EXTERNAL
TEST_ESP_OK(sd_pwr_ctrl_del_on_chip_ldo(pwr_ctrl_handle));
#endif
} }

1
components/esp_driver_sdspi/test_apps/sdspi/components/sdspi_tests/sdmmc_test_probe_spi.c
View File

@@ -18,6 +18,7 @@ static void do_one_sdspi_probe(int slot, int freq_khz)
sdmmc_card_print_info(stdout, &card); sdmmc_card_print_info(stdout, &card);
uint8_t* buffer = heap_caps_calloc(512, 1, MALLOC_CAP_DMA); uint8_t* buffer = heap_caps_calloc(512, 1, MALLOC_CAP_DMA);
TEST_ESP_OK(sdmmc_read_sectors(&card, buffer, 0, 1)); TEST_ESP_OK(sdmmc_read_sectors(&card, buffer, 0, 1));
free(buffer);
sdmmc_test_spi_end(slot, &card); sdmmc_test_spi_end(slot, &card);
} }

9
components/esp_driver_sdspi/test_apps/sdspi/pytest_sdspi.py
View File

@@ -1,8 +1,13 @@
# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
import pytest
from pytest_embedded_idf import IdfDut from pytest_embedded_idf import IdfDut
@pytest.mark.esp32
@pytest.mark.esp32c3
@pytest.mark.esp32s3
@pytest.mark.esp32p4
@pytest.mark.sdcard_spimode
def test_sdspi(dut: IdfDut) -> None: def test_sdspi(dut: IdfDut) -> None:
dut.run_all_single_board_cases() dut.run_all_single_board_cases()

2
components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32p4 Normal file
View File

@@ -0,0 +1,2 @@
CONFIG_SDMMC_BOARD_ESP32P4_EV_BOARD_WITH_SDSPI=y
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y

2
components/esp_driver_sdspi/test_apps/sdspi/sdkconfig.defaults.esp32s3 Normal file
View File

@@ -0,0 +1,2 @@
CONFIG_SDMMC_BOARD_ESP32S3_EMMC_TEST=y
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y

4
components/hal/include/hal/spi_hal.h
View File

@@ -72,7 +72,7 @@ typedef struct {
typedef struct { typedef struct {
spi_ll_clock_val_t clock_reg; ///< Register value used by the LL layer spi_ll_clock_val_t clock_reg; ///< Register value used by the LL layer
spi_clock_source_t clock_source; ///< Clock source of each device used by LL layer spi_clock_source_t clock_source; ///< Clock source of each device used by LL layer
uint32_t source_pre_div; ///< Pre divider befor enter SPI peripheral uint32_t source_pre_div; ///< Pre divider before enter SPI peripheral
int real_freq; ///< Output of the actual frequency int real_freq; ///< Output of the actual frequency
int timing_dummy; ///< Extra dummy needed to compensate the timing int timing_dummy; ///< Extra dummy needed to compensate the timing
int timing_miso_delay; ///< Extra miso delay clocks to compensate the timing int timing_miso_delay; ///< Extra miso delay clocks to compensate the timing
@@ -129,7 +129,7 @@ typedef struct {
#if SOC_SPI_AS_CS_SUPPORTED #if SOC_SPI_AS_CS_SUPPORTED
uint32_t as_cs : 1; ///< Whether to toggle the CS while the clock toggles, device specific uint32_t as_cs : 1; ///< Whether to toggle the CS while the clock toggles, device specific
#endif #endif
uint32_t positive_cs : 1; ///< Whether the postive CS feature is abled, device specific uint32_t positive_cs : 1; ///< Whether the positive CS feature is abled, device specific
};//boolean configurations };//boolean configurations
} spi_hal_dev_config_t; } spi_hal_dev_config_t;

5
examples/storage/.build-test-rules.yml
View File

@@ -139,9 +139,8 @@ examples/storage/sd_card/sdspi:
disable: disable:
- if: SOC_GPSPI_SUPPORTED != 1 - if: SOC_GPSPI_SUPPORTED != 1
disable_test: disable_test:
- if: IDF_TARGET not in ["esp32", "esp32c3"] - if: IDF_TARGET not in ["esp32", "esp32s3", "esp32c3", "esp32p4"]
temporary: true reason: needs special runner, select few typical targets for testing
reason: lack of runners
examples/storage/semihost_vfs: examples/storage/semihost_vfs:
depends_components: depends_components:

16
examples/storage/sd_card/sdspi/main/Kconfig.projbuild
View File

@@ -17,35 +17,35 @@ menu "SD SPI Example Configuration"
int "MOSI GPIO number" int "MOSI GPIO number"
default 15 if IDF_TARGET_ESP32 default 15 if IDF_TARGET_ESP32
default 35 if IDF_TARGET_ESP32S2 default 35 if IDF_TARGET_ESP32S2
default 35 if IDF_TARGET_ESP32S3 default 4 if IDF_TARGET_ESP32S3
default 5 if IDF_TARGET_ESP32H2 default 5 if IDF_TARGET_ESP32H2
default 11 if IDF_TARGET_ESP32P4 default 36 if IDF_TARGET_ESP32P4
default 4 # C3 and others default 4 # C3 and others
config EXAMPLE_PIN_MISO config EXAMPLE_PIN_MISO
int "MISO GPIO number" int "MISO GPIO number"
default 2 if IDF_TARGET_ESP32 default 2 if IDF_TARGET_ESP32
default 37 if IDF_TARGET_ESP32S2 default 37 if IDF_TARGET_ESP32S2
default 37 if IDF_TARGET_ESP32S3 default 5 if IDF_TARGET_ESP32S3
default 0 if IDF_TARGET_ESP32H2 default 0 if IDF_TARGET_ESP32H2
default 13 if IDF_TARGET_ESP32P4 default 47 if IDF_TARGET_ESP32P4
default 6 # C3 and others default 6 # C3 and others
config EXAMPLE_PIN_CLK config EXAMPLE_PIN_CLK
int "CLK GPIO number" int "CLK GPIO number"
default 14 if IDF_TARGET_ESP32 default 14 if IDF_TARGET_ESP32
default 36 if IDF_TARGET_ESP32S2 default 36 if IDF_TARGET_ESP32S2
default 36 if IDF_TARGET_ESP32S3 default 2 if IDF_TARGET_ESP32S3
default 4 if IDF_TARGET_ESP32H2 default 4 if IDF_TARGET_ESP32H2
default 12 if IDF_TARGET_ESP32P4 default 53 if IDF_TARGET_ESP32P4
default 5 # C3 and others default 5 # C3 and others
config EXAMPLE_PIN_CS config EXAMPLE_PIN_CS
int "CS GPIO number" int "CS GPIO number"
default 13 if IDF_TARGET_ESP32 default 13 if IDF_TARGET_ESP32
default 34 if IDF_TARGET_ESP32S2 default 34 if IDF_TARGET_ESP32S2
default 34 if IDF_TARGET_ESP32S3 default 8 if IDF_TARGET_ESP32S3
default 10 if IDF_TARGET_ESP32P4 default 33 if IDF_TARGET_ESP32P4
default 1 # C3 and others default 1 # C3 and others
config EXAMPLE_DEBUG_PIN_CONNECTIONS config EXAMPLE_DEBUG_PIN_CONNECTIONS

10
examples/storage/sd_card/sdspi/pytest_sdspi_card_example.py
View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD # SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Unlicense OR CC0-1.0 # SPDX-License-Identifier: Unlicense OR CC0-1.0
import logging import logging
import re import re
@@ -8,14 +8,16 @@ from pytest_embedded import Dut
@pytest.mark.esp32 @pytest.mark.esp32
@pytest.mark.esp32c3 # no runner available at the moment @pytest.mark.esp32s3
@pytest.mark.esp32c3
@pytest.mark.esp32p4
@pytest.mark.sdcard_spimode @pytest.mark.sdcard_spimode
def test_examples_sd_card_sdspi(dut: Dut) -> None: def test_examples_sd_card_sdspi(dut: Dut) -> None:
dut.expect('example: Initializing SD card', timeout=20) dut.expect('example: Initializing SD card', timeout=20)
dut.expect('example: Using SPI peripheral', timeout=20) dut.expect('example: Using SPI peripheral', timeout=20)
# Provide enough time for possible SD card formatting # Provide enough time for possible SD card formatting
dut.expect('Filesystem mounted', timeout=60) dut.expect('Filesystem mounted', timeout=180)
# These lines are matched separately because of ASCII color codes in the output # These lines are matched separately because of ASCII color codes in the output
name = dut.expect(re.compile(rb'Name: (\w+)\r'), timeout=20).group(1).decode() name = dut.expect(re.compile(rb'Name: (\w+)\r'), timeout=20).group(1).decode()
@@ -42,4 +44,4 @@ def test_examples_sd_card_sdspi(dut: Dut) -> None:
dut.expect_exact(msg, timeout=30) dut.expect_exact(msg, timeout=30)
dut.expect(sd_card_format, timeout=180) # Provide enough time for SD card FATFS format operation dut.expect(sd_card_format, timeout=180) # Provide enough time for SD card FATFS format operation
for msg in message_list2: for msg in message_list2:
dut.expect_exact(msg, timeout=30) dut.expect_exact(msg, timeout=180)

1
examples/storage/sd_card/sdspi/sdkconfig.defaults.esp32p4 Normal file
View File

@@ -0,0 +1 @@
CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y