Merge branch 'feat/sdmmc_support_concurrent_use' into 'master'

feat(sdmmc): Concurrent use of SDMMC peripheral

Closes IDF-9152

See merge request espressif/esp-idf!31150

components/esp_driver_sdmmc/include/driver/sdmmc_default_configs.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -26,7 +26,8 @@ extern "C" {
     .flags = SDMMC_HOST_FLAG_8BIT | \
              SDMMC_HOST_FLAG_4BIT | \
              SDMMC_HOST_FLAG_1BIT | \
-             SDMMC_HOST_FLAG_DDR, \
+             SDMMC_HOST_FLAG_DDR  | \
+             SDMMC_HOST_FLAG_DEINIT_ARG, \
     .slot = SDMMC_HOST_SLOT_1, \
     .max_freq_khz = SDMMC_FREQ_DEFAULT, \
     .io_voltage = 3.3f, \
@@ -37,7 +38,7 @@ extern "C" {
     .set_card_clk = &sdmmc_host_set_card_clk, \
     .set_cclk_always_on = &sdmmc_host_set_cclk_always_on, \
     .do_transaction = &sdmmc_host_do_transaction, \
-    .deinit = &sdmmc_host_deinit, \
+    .deinit_p = &sdmmc_host_deinit_slot, \
     .io_int_enable = sdmmc_host_io_int_enable, \
     .io_int_wait = sdmmc_host_io_int_wait, \
     .command_timeout_ms = 0, \

components/esp_driver_sdmmc/include/driver/sdmmc_host.h

@@ -58,14 +58,21 @@ typedef struct {
      */
 } sdmmc_slot_config_t;
 
+/**
+ * SD/MMC host state structure
+ */
+typedef struct {
+    bool host_initialized;  ///< Whether the host is initialized
+    int num_of_init_slots;  ///< Number of initialized slots
+} sdmmc_host_state_t;
+
 /**
  * @brief Initialize SDMMC host peripheral
  *
  * @note This function is not thread safe
  *
  * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if sdmmc_host_init was already called
+ *      - ESP_OK on success or if sdmmc_host_init was already initialized with this function
  *      - ESP_ERR_NO_MEM if memory can not be allocated
  */
 esp_err_t sdmmc_host_init(void);
@@ -201,13 +208,31 @@ esp_err_t sdmmc_host_io_int_enable(int slot);
 esp_err_t sdmmc_host_io_int_wait(int slot, TickType_t timeout_ticks);
 
 /**
- * @brief Disable SDMMC host and release allocated resources
+ * @brief Disable SDMMC host and release allocated resources gracefully
+ *
+ * @note If there are more than 1 active slots, this function will just decrease the reference count
+ *       and won't actually disable the host until the last slot is disabled
  *
  * @note This function is not thread safe
  *
+ * @param slot slot number (SDMMC_HOST_SLOT_0 or SDMMC_HOST_SLOT_1)
  * @return
  *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if sdmmc_host_init function has not been called
+ *      - ESP_ERR_INVALID_STATE if SDMMC host has not been initialized
+ *      - ESP_ERR_INVALID_ARG if invalid slot number is used
+ */
+esp_err_t sdmmc_host_deinit_slot(int slot);
+
+/**
+ * @brief Disable SDMMC host and release allocated resources forcefully
+ *
+ * @note This function will deinitialize the host immediately, regardless of the number of active slots
+ *
+ * @note This function is not thread safe
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_STATE if SDMMC host has not been initialized
  */
 esp_err_t sdmmc_host_deinit(void);
 
@@ -258,6 +283,17 @@ esp_err_t sdmmc_host_set_input_delay(int slot, sdmmc_delay_phase_t delay_phase);
  */
 esp_err_t sdmmc_host_get_dma_info(int slot, esp_dma_mem_info_t *dma_mem_info);
 
+/**
+ * @brief Get the state of SDMMC host
+ *
+ * @param[out] state output parameter for SDMMC host state structure
+ *
+ * @return
+ *      - ESP_OK on success
+ *      - ESP_ERR_INVALID_ARG on invalid argument
+ */
+esp_err_t sdmmc_host_get_state(sdmmc_host_state_t* state);
+
 #ifdef __cplusplus
 }
 #endif