forked from micropython/micropython
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
esp32s3: Implement sdioio #9641
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
32537ed
esp32s3: Implement sdioio
RetiredWizard 170da9b
Remove tempory comment - pre-commit find
RetiredWizard c872258
update local version of pre-commit and re-ran
RetiredWizard 68d3cf7
default enables, safe pin claims, reuse feq msg, use preprocessor
RetiredWizard 9bba9b0
pre-commit format fix
RetiredWizard cdecebf
disable for esp32 since not working yet
RetiredWizard 94f35b9
reuse number of datapin message
RetiredWizard 0ea2dd3
Another small message refactor
RetiredWizard 36c956a
added slot tracking and never_reset logic
RetiredWizard ad519ad
only init/deinit host periperal if both slots are currently unused
RetiredWizard 83f9f77
use slot 1 by default
RetiredWizard 8a2651a
Add sdioio reset to port startup
RetiredWizard File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,223 @@ | ||
| // This file is part of the CircuitPython project: https://circuitpython.org | ||
| // | ||
| // SPDX-FileCopyrightText: Copyright (c) 2024 Jacob Rigby | ||
| // | ||
| // SPDX-License-Identifier: MIT | ||
|
|
||
| #include <stdbool.h> | ||
| #include "esp_err.h" | ||
|
|
||
| #include "driver/sdmmc_host.h" | ||
| #include "ports/espressif/esp-idf/components/sdmmc/include/sdmmc_cmd.h" | ||
|
|
||
| #include "shared-bindings/microcontroller/Pin.h" | ||
| #include "shared-bindings/util.h" | ||
| #include "shared-bindings/sdioio/SDCard.h" | ||
| #include "py/mperrno.h" | ||
| #include "py/runtime.h" | ||
|
|
||
| #include "esp_log.h" | ||
| static const char *TAG = "SDCard.c"; | ||
|
|
||
| static bool sdio_host_init = false; | ||
|
|
||
| static void common_hal_sdioio_sdcard_check_for_deinit(sdioio_sdcard_obj_t *self) { | ||
| if (common_hal_sdioio_sdcard_deinited(self)) { | ||
| raise_deinited_error(); | ||
| } | ||
| } | ||
|
|
||
| static int check_pins(const mcu_pin_obj_t *clock, const mcu_pin_obj_t *command, const uint8_t num_data, const mcu_pin_obj_t **data) { | ||
| if (CONFIG_SOC_SDMMC_USE_GPIO_MATRIX) { | ||
RetiredWizard marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // ESP32-S3 and P4 can use any pin for any SDMMC func in either slot | ||
| // Default to SLOT_1 for SD cards | ||
| ESP_LOGI(TAG, "Using chip with CONFIG_SOC_SDMMC_USE_GPIO_MATRIX"); | ||
| return SDMMC_HOST_SLOT_1; | ||
tannewt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| if (command->number == GPIO_NUM_11 && clock->number == GPIO_NUM_6 && data[0]->number == GPIO_NUM_7) { | ||
| // Might be slot 0 | ||
| if (num_data == 1 || (num_data == 4 && data[1]->number == GPIO_NUM_8 && data[2]->number == GPIO_NUM_9 && data[3]->number == GPIO_NUM_10)) { | ||
| return SDMMC_HOST_SLOT_0; | ||
| } | ||
| } else if (command->number == GPIO_NUM_15 && clock->number == GPIO_NUM_14 && data[0]->number == 2) { | ||
| // Might be slot 1 | ||
| if (num_data == 1 || (num_data == 4 && data[1]->number == GPIO_NUM_4 && data[2]->number == GPIO_NUM_12 && data[3]->number == GPIO_NUM_13)) { | ||
| return SDMMC_HOST_SLOT_1; | ||
| } | ||
| } | ||
| return -1; | ||
| } | ||
|
|
||
| void common_hal_sdioio_sdcard_construct(sdioio_sdcard_obj_t *self, | ||
| const mcu_pin_obj_t *clock, const mcu_pin_obj_t *command, | ||
| uint8_t num_data, const mcu_pin_obj_t **data, uint32_t frequency) { | ||
| if (num_data != 4 && num_data != 1) { | ||
| mp_raise_ValueError(MP_ERROR_TEXT("SDIO: cards have either 1 or 4 data lines")); | ||
RetiredWizard marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| self->num_data = num_data; | ||
| int sd_slot = check_pins(clock, command, num_data, data); | ||
| if (sd_slot != SDMMC_HOST_SLOT_0 && sd_slot != SDMMC_HOST_SLOT_1) { | ||
| // Bad pin combo | ||
| raise_ValueError_invalid_pins(); | ||
| } | ||
|
|
||
| if (frequency > 40000000) { | ||
| // Higher than max 40Mhz frequency | ||
| mp_raise_ValueError(MP_ERROR_TEXT("SDIO: requested frequency out of range")); | ||
| } | ||
RetiredWizard marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| ESP_LOGI(TAG, "Using slot %d", sd_slot); | ||
| self->slot = (uint8_t)sd_slot; | ||
| esp_err_t err = ESP_OK; | ||
|
|
||
| sdmmc_host_t host = SDMMC_HOST_DEFAULT(); | ||
| host.max_freq_khz = frequency / 1000; | ||
|
|
||
| sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT(); | ||
| slot_config.width = 1; | ||
| slot_config.clk = clock->number; | ||
| claim_pin(clock); | ||
| self->clock = clock->number; | ||
| slot_config.cmd = command->number; | ||
| claim_pin(command); | ||
| self->command = command->number; | ||
| slot_config.d0 = data[0]->number; | ||
| self->data[0] = data[0]->number; | ||
| claim_pin(data[0]); | ||
| if (num_data == 4) { | ||
| slot_config.width = 4; | ||
| slot_config.d1 = data[1]->number; | ||
| claim_pin(data[1]); | ||
| self->data[1] = data[1]->number; | ||
| slot_config.d2 = data[2]->number; | ||
| claim_pin(data[2]); | ||
| self->data[2] = data[2]->number; | ||
| slot_config.d3 = data[3]->number; | ||
| claim_pin(data[3]); | ||
RetiredWizard marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| self->data[3] = data[3]->number; | ||
| } | ||
|
|
||
| ESP_LOGI(TAG, "slot_config:\nwidth: %d, clk: %d, cmd: %d\nd0: %d, d1: %d, d2: %d, d3: %d", | ||
| slot_config.width, slot_config.clk, slot_config.cmd, | ||
| slot_config.d0, slot_config.d1, slot_config.d2, slot_config.d3); | ||
|
|
||
| if (!sdio_host_init) { | ||
| err = sdmmc_host_init(); | ||
| if (err != ESP_OK) { | ||
| mp_raise_OSError_msg_varg(MP_ERROR_TEXT("SDIO Init Error %x"), err); | ||
| } | ||
| // sdio_host_init = true; | ||
| } | ||
| err = sdmmc_host_init_slot(sd_slot, &slot_config); | ||
| if (err != ESP_OK) { | ||
| ESP_LOGW(TAG, "Failed to initialize SDMMC slot: %x", err); | ||
| mp_raise_OSError_msg_varg(MP_ERROR_TEXT("SDIO Init Error %x"), err); | ||
| } | ||
| // sdmmc_card_t card; | ||
| // self->card = malloc(sizeof(sdmmc_card_t)); | ||
| err = sdmmc_card_init(&host, &self->card); | ||
| if (err != ESP_OK) { | ||
| ESP_LOGW(TAG, "Failed to initialize SDMMC card: %x", err); | ||
| mp_raise_OSError_msg_varg(MP_ERROR_TEXT("SDIO Init Error %x"), err); | ||
| } | ||
|
|
||
| common_hal_sdioio_sdcard_check_for_deinit(self); | ||
|
|
||
| ESP_LOGI(TAG, "Initialized SD card with ID %d:%d-%s", | ||
| self->card.cid.mfg_id, self->card.cid.oem_id, self->card.cid.name); | ||
|
|
||
| ESP_LOGI(TAG, "Number of sectors: %d with sector_size: %d", | ||
| self->card.csd.capacity, self->card.csd.sector_size); | ||
|
|
||
| self->frequency = self->card.real_freq_khz; | ||
| ESP_LOGI(TAG, "Real frequency is %lu", self->frequency); | ||
| self->capacity = self->card.csd.capacity; // Reported number of sectors | ||
| ESP_LOGI(TAG, "Reported capacity is %lu", self->capacity); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| uint32_t common_hal_sdioio_sdcard_get_count(sdioio_sdcard_obj_t *self) { | ||
| return self->capacity; | ||
| } | ||
|
|
||
| uint32_t common_hal_sdioio_sdcard_get_frequency(sdioio_sdcard_obj_t *self) { | ||
| return self->frequency; | ||
| } | ||
|
|
||
| uint8_t common_hal_sdioio_sdcard_get_width(sdioio_sdcard_obj_t *self) { | ||
| return self->num_data; | ||
| } | ||
|
|
||
| static void check_whole_block(mp_buffer_info_t *bufinfo, int sector_size) { | ||
| if (bufinfo->len % sector_size) { | ||
| mp_raise_ValueError_varg(MP_ERROR_TEXT("Buffer must be a multiple of %d bytes"), sector_size); | ||
| } | ||
| } | ||
|
|
||
| int common_hal_sdioio_sdcard_writeblocks(sdioio_sdcard_obj_t *self, uint32_t start_block, mp_buffer_info_t *bufinfo) { | ||
| common_hal_sdioio_sdcard_check_for_deinit(self); | ||
| check_whole_block(bufinfo, self->card.csd.sector_size); | ||
| esp_err_t err; | ||
| ESP_LOGI(TAG, "in common_hal_sdioio_sdcard_writeblocks"); | ||
| // err = sdmmc_io_write_blocks(&self->card, 1, start_block, bufinfo->buf, bufinfo->len); | ||
| err = sdmmc_write_sectors(&self->card, bufinfo->buf, start_block, bufinfo->len / self->card.csd.sector_size); | ||
| if (err != ESP_OK) { | ||
| ESP_LOGW(TAG, "Failed to write blocks with err 0x%X", err); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| int common_hal_sdioio_sdcard_readblocks(sdioio_sdcard_obj_t *self, uint32_t start_block, mp_buffer_info_t *bufinfo) { | ||
| common_hal_sdioio_sdcard_check_for_deinit(self); | ||
| check_whole_block(bufinfo, self->card.csd.sector_size); | ||
| esp_err_t err; | ||
| ESP_LOGI(TAG, "in common_hal_sdioio_sdcard_readblocks"); | ||
| // err = sdmmc_io_read_blocks(&self->card, 1, start_block, bufinfo->buf, bufinfo->len); | ||
| err = sdmmc_read_sectors(&self->card, bufinfo->buf, start_block, bufinfo->len / self->card.csd.sector_size); | ||
| if (err != ESP_OK) { | ||
| ESP_LOGW(TAG, "Failed to read blocks with err 0x%X", err); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| bool common_hal_sdioio_sdcard_configure(sdioio_sdcard_obj_t *self, uint32_t frequency, uint8_t bits) { | ||
| return true; | ||
| } | ||
|
|
||
| bool common_hal_sdioio_sdcard_deinited(sdioio_sdcard_obj_t *self) { | ||
| return self->command == COMMON_HAL_MCU_NO_PIN; | ||
| } | ||
|
|
||
| void common_hal_sdioio_sdcard_deinit(sdioio_sdcard_obj_t *self) { | ||
| if (common_hal_sdioio_sdcard_deinited(self)) { | ||
| return; | ||
| } | ||
| sdmmc_host_deinit(); | ||
| reset_pin_number(self->command); | ||
| self->command = COMMON_HAL_MCU_NO_PIN; | ||
| reset_pin_number(self->clock); | ||
| self->clock = COMMON_HAL_MCU_NO_PIN; | ||
| reset_pin_number(self->data[0]); | ||
| self->data[0] = COMMON_HAL_MCU_NO_PIN; | ||
| if (self->num_data == 4) { | ||
| reset_pin_number(self->data[1]); | ||
| self->data[1] = COMMON_HAL_MCU_NO_PIN; | ||
| reset_pin_number(self->data[2]); | ||
| self->data[2] = COMMON_HAL_MCU_NO_PIN; | ||
| reset_pin_number(self->data[3]); | ||
| self->data[3] = COMMON_HAL_MCU_NO_PIN; | ||
| } | ||
| return; | ||
| } | ||
|
|
||
| void common_hal_sdioio_sdcard_never_reset(sdioio_sdcard_obj_t *self) { | ||
| if (common_hal_sdioio_sdcard_deinited(self)) { | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| void sdioio_reset() { | ||
| return; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.