Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sdmmc: fix the probe issue that forbid sdspi working in highspeed mode

Browse source 
SD cards don't support CMD7 (select_card) in SPI mode. Highspeed probe
of sdspi will fail in this step and stop working in highspeed mode.
Remove the CMD7 in enable_hs_mode_and_check to fix this issue.

Please note that, on ESP32, you have to use the IOMUX pins to use sdspi
in 40MHz, otherwise the initialization process will report reading issue
and fail.
This commit is contained in:
Michael (XIAO Xufeng) 2020-06-30 17:29:49 +08:00 committed by Cao Sen Miao
parent 4f5577446b
commit 55bb42dc63
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
components/sdmmc/sdmmc_sd.c
View file

@ -225,24 +225,29 @@ esp_err_t sdmmc_enable_hs_mode_and_check(sdmmc_card_t* card)
/* HS mode has been enabled on the card. /* HS mode has been enabled on the card.
* Read CSD again, it should now indicate that the card supports * Read CSD again, it should now indicate that the card supports
* 50MHz clock. * 50MHz clock.
* Since SEND_CSD is allowed only in standby mode, and the card is * Since SEND_CSD is allowed only in standby mode, and the card is currently in data transfer
* currently in data transfer more, deselect the card first, then * mode, deselect the card first, then get the CSD, then select the card again. This step is
* get the CSD, then select the card again. * not required in SPI mode, since CMD7 (select_card) is not supported.
*/ */
err = sdmmc_send_cmd_select_card(card, 0); const bool is_spi = host_is_spi(card);
if (err != ESP_OK) { if (!is_spi) {
ESP_LOGE(TAG, "%s: select_card (1) returned 0x%x", __func__, err); err = sdmmc_send_cmd_select_card(card, 0);
return err; if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: select_card (1) returned 0x%x", __func__, err);
return err;
}
} }
err = sdmmc_send_cmd_send_csd(card, &card->csd); err = sdmmc_send_cmd_send_csd(card, &card->csd);
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_LOGE(TAG, "%s: send_csd returned 0x%x", __func__, err); ESP_LOGE(TAG, "%s: send_csd returned 0x%x", __func__, err);
return err; return err;
} }
err = sdmmc_send_cmd_select_card(card, card->rca); if (!is_spi) {
if (err != ESP_OK) { err = sdmmc_send_cmd_select_card(card, card->rca);
ESP_LOGE(TAG, "%s: select_card (2) returned 0x%x", __func__, err); if (err != ESP_OK) {
return err; ESP_LOGE(TAG, "%s: select_card (2) returned 0x%x", __func__, err);
return err;
}
} }
if (card->csd.tr_speed != 50000000) { if (card->csd.tr_speed != 50000000) {

2
components/sdmmc/test/test_sd.c
View file

@ -320,6 +320,8 @@ TEST_CASE("SDMMC read/write test (SD slot 1, in SPI mode)", "[sdspi][test_env=UT
sdspi_slot_config_t slot_config = SDSPI_SLOT_CONFIG_DEFAULT(); sdspi_slot_config_t slot_config = SDSPI_SLOT_CONFIG_DEFAULT();
TEST_ESP_OK(sdspi_host_init()); TEST_ESP_OK(sdspi_host_init());
TEST_ESP_OK(sdspi_host_init_slot(config.slot, &slot_config)); TEST_ESP_OK(sdspi_host_init_slot(config.slot, &slot_config));
// This test can only run under 20MHz on ESP32, because the runner connects the card to
// non-IOMUX pins of HSPI.
sdmmc_card_t* card = malloc(sizeof(sdmmc_card_t)); sdmmc_card_t* card = malloc(sizeof(sdmmc_card_t));
TEST_ASSERT_NOT_NULL(card); TEST_ASSERT_NOT_NULL(card);
TEST_ESP_OK(sdmmc_card_init(&config, card)); TEST_ESP_OK(sdmmc_card_init(&config, card));