SD card v7 BSP (#361)

* Outdated apps: add api-light-usage

* Gpio: update SD card CS pin settings

* API-power: added fns to disable/enable external 3v3 dc-dc

* API-gpio: separated SD card detect routines

* Resources: removed sd cs pin

* SD card: low level init now resets card power supply

* App SD-filesystem: use new card detect fns

* SD card: fix low level init headers

* SD card: more realilable low level init, power reset, exit from command read cycle conditionally

* App SD-filesystem: led notifiers, init cycling

* SD card: backport to F4

* SD card: handle eject in init sequence

* SD card: api to set level on detect gpio

* SPI: api to set state on bus pins

* SD card: set low state on bus pins while power reset

Co-authored-by: coreglitch <mail@s3f.ru>

firmware/targets/f5/Inc/spi.h

@@ -46,6 +46,8 @@ void NFC_SPI_Reconfigure();
 void SD_SPI_Reconfigure_Slow();
 void SD_SPI_Reconfigure_Fast();
 void CC1101_SPI_Reconfigure();
+void SD_SPI_Bus_To_Down_State();
+void SD_SPI_Bus_To_Normal_State();
 /* USER CODE END Prototypes */
 
 #ifdef __cplusplus

firmware/targets/f5/Src/fatfs/stm32_adafruit_sd.c

@@ -92,7 +92,10 @@
 #include "string.h"
 #include "stdio.h"
 #include "spi.h"
-#include "api-hal-spi.h"
+#include <api-hal-spi.h>
+#include <api-hal-power.h>
+#include <api-hal-delay.h>
+#include <api-hal-sd.h>
 
 /** @addtogroup BSP
   * @{
@@ -290,19 +293,40 @@ static uint8_t SD_ReadData(void);
   *         - MSD_ERROR: Sequence failed
   *         - MSD_OK: Sequence succeed
   */
-uint8_t BSP_SD_Init(void) {
-    /* Init to maximum slow speed */
-    // TODO: SPI manager
+uint8_t BSP_SD_Init(bool reset_card) {
+    /* Slow speed init */
+
+    /* TODO: SPI manager */
     api_hal_spi_lock_device(&sd_slow_spi);
 
+    /* We must reset card in spi_lock context */
+    if(reset_card) {
+        /* disable power and set low on all bus pins */
+        api_hal_power_disable_external_3_3v();
+        SD_SPI_Bus_To_Down_State();
+        hal_sd_detect_set_low();
+        delay(250);
+
+        /* reinit bus and enable power */
+        SD_SPI_Bus_To_Normal_State();
+        hal_sd_detect_init();
+        api_hal_power_enable_external_3_3v();
+        delay(100);
+    }
+
     /* Configure IO functionalities for SD pin */
     SD_IO_Init();
 
     /* SD detection pin is not physically mapped on the Adafruit shield */
     SdStatus = SD_PRESENT;
-    uint8_t res = SD_GoIdleState();
+    uint8_t res = BSP_SD_ERROR;
 
-    // TODO: SPI manager
+    for(uint8_t i = 0; i < 128; i++) {
+        res = SD_GoIdleState();
+        if(res == BSP_SD_OK) break;
+    }
+
+    /* TODO: SPI manager */
     api_hal_spi_unlock_device(&sd_slow_spi);
 
     /* SD initialized and set to SPI mode properly */
@@ -872,9 +896,10 @@ uint8_t SD_GetDataResponse(void) {
   */
 uint8_t SD_GoIdleState(void) {
     SD_CmdAnswer_typedef response;
-    __IO uint8_t counter = 0;
+    __IO uint8_t counter;
     /* Send CMD0 (SD_CMD_GO_IDLE_STATE) to put SD in SPI mode and 
      wait for In Idle State Response (R1 Format) equal to 0x01 */
+    counter = 0;
     do {
         counter++;
         response = SD_SendCmd(SD_CMD_GO_IDLE_STATE, 0, 0x95, SD_ANSWER_R1_EXPECTED);
@@ -892,7 +917,9 @@ uint8_t SD_GoIdleState(void) {
     SD_IO_WriteByte(SD_DUMMY_BYTE);
     if((response.r1 & SD_R1_ILLEGAL_COMMAND) == SD_R1_ILLEGAL_COMMAND) {
         /* initialise card V1 */
+        counter = 0;
         do {
+            counter++;
             /* initialise card V1 */
             /* Send CMD55 (SD_CMD_APP_CMD) before any ACMD command: R1 response (0x00: no errors) */
             response = SD_SendCmd(SD_CMD_APP_CMD, 0x00000000, 0xFF, SD_ANSWER_R1_EXPECTED);
@@ -903,11 +930,16 @@ uint8_t SD_GoIdleState(void) {
             response = SD_SendCmd(SD_CMD_SD_APP_OP_COND, 0x00000000, 0xFF, SD_ANSWER_R1_EXPECTED);
             SD_IO_CSState(1);
             SD_IO_WriteByte(SD_DUMMY_BYTE);
+            if(counter >= SD_MAX_TRY) {
+                return BSP_SD_ERROR;
+            }
         } while(response.r1 == SD_R1_IN_IDLE_STATE);
         flag_SDHC = 0;
     } else if(response.r1 == SD_R1_IN_IDLE_STATE) {
         /* initialise card V2 */
+        counter = 0;
         do {
+            counter++;
             /* Send CMD55 (SD_CMD_APP_CMD) before any ACMD command: R1 response (0x00: no errors) */
             response = SD_SendCmd(SD_CMD_APP_CMD, 0, 0xFF, SD_ANSWER_R1_EXPECTED);
             SD_IO_CSState(1);
@@ -917,10 +949,15 @@ uint8_t SD_GoIdleState(void) {
             response = SD_SendCmd(SD_CMD_SD_APP_OP_COND, 0x40000000, 0xFF, SD_ANSWER_R1_EXPECTED);
             SD_IO_CSState(1);
             SD_IO_WriteByte(SD_DUMMY_BYTE);
+            if(counter >= SD_MAX_TRY) {
+                return BSP_SD_ERROR;
+            }
         } while(response.r1 == SD_R1_IN_IDLE_STATE);
 
         if((response.r1 & SD_R1_ILLEGAL_COMMAND) == SD_R1_ILLEGAL_COMMAND) {
+            counter = 0;
             do {
+                counter++;
                 /* Send CMD55 (SD_CMD_APP_CMD) before any ACMD command: R1 response (0x00: no errors) */
                 response = SD_SendCmd(SD_CMD_APP_CMD, 0, 0xFF, SD_ANSWER_R1_EXPECTED);
                 SD_IO_CSState(1);
@@ -933,6 +970,9 @@ uint8_t SD_GoIdleState(void) {
                     SD_SendCmd(SD_CMD_SD_APP_OP_COND, 0x00000000, 0xFF, SD_ANSWER_R1_EXPECTED);
                 SD_IO_CSState(1);
                 SD_IO_WriteByte(SD_DUMMY_BYTE);
+                if(counter >= SD_MAX_TRY) {
+                    return BSP_SD_ERROR;
+                }
             } while(response.r1 == SD_R1_IN_IDLE_STATE);
         }
 

firmware/targets/f5/Src/fatfs/stm32_adafruit_sd.h

@@ -46,6 +46,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
+#include <stdbool.h>
 
 /** @addtogroup BSP
   * @{
@@ -208,7 +209,7 @@ typedef struct
 /** @defgroup STM32_ADAFRUIT_SD_Exported_Functions
   * @{
   */   
-uint8_t BSP_SD_Init(void);
+uint8_t BSP_SD_Init(bool reset_card);
 uint8_t BSP_SD_ReadBlocks(uint32_t *pData, uint32_t ReadAddr, uint32_t NumOfBlocks, uint32_t Timeout);
 uint8_t BSP_SD_WriteBlocks(uint32_t *pData, uint32_t WriteAddr, uint32_t NumOfBlocks, uint32_t Timeout);
 uint8_t BSP_SD_Erase(uint32_t StartAddr, uint32_t EndAddr);

firmware/targets/f5/Src/gpio.c

@@ -163,10 +163,9 @@ void MX_GPIO_Init(void)
 
   /*Configure GPIO pin : PtPin */
   GPIO_InitStruct.Pin = SD_CS_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  GPIO_InitStruct.Alternate = GPIO_AF6_LSCO;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
   HAL_GPIO_Init(SD_CS_GPIO_Port, &GPIO_InitStruct);
 
   /*Configure GPIO pin : PtPin */

firmware/targets/f5/Src/spi.c

@@ -339,6 +339,36 @@ void Enable_SPI(SPI_HandleTypeDef* spi_instance){
     __HAL_SPI_ENABLE(spi_instance);
   }
 }
+
+void SD_SPI_Bus_To_Down_State(){
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+
+  GPIO_InitStruct.Pin = GPIO_PIN_2;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Pin = SPI_D_MOSI_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SPI_D_MOSI_GPIO_Port, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Pin = SPI_D_SCK_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SPI_D_SCK_GPIO_Port, &GPIO_InitStruct);
+
+  HAL_GPIO_WritePin(SD_CS_GPIO_Port, SD_CS_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOC, GPIO_PIN_2, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(SPI_D_MOSI_GPIO_Port, SPI_D_MOSI_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(SPI_D_SCK_GPIO_Port, SPI_D_SCK_Pin, GPIO_PIN_RESET);
+}
+
+void SD_SPI_Bus_To_Normal_State(){
+  HAL_GPIO_WritePin(SD_CS_GPIO_Port, SD_CS_Pin, GPIO_PIN_SET);
+  HAL_SPI_MspInit(&SPI_SD_HANDLE);
+}
 /* USER CODE END 1 */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

firmware/targets/f5/api-hal/api-hal-gpio.c

@@ -20,33 +20,6 @@ void hal_gpio_init(
     HAL_GPIO_Init(gpio->port, &GPIO_InitStruct);
 }
 
-bool hal_gpio_read_sd_detect(void) {
-    bool result = false;
-
-    // TODO open record
-    const GpioPin* sd_cs_record = &sd_cs_gpio;
-
-    // TODO: SPI manager
-    api_hal_spi_lock(sd_fast_spi.spi);
-
-    // configure pin as input
-    gpio_init_ex(sd_cs_record, GpioModeInput, GpioPullUp, GpioSpeedVeryHigh);
-    delay(1);
-
-    // if gpio_read == 0 return true else return false
-    result = !gpio_read(sd_cs_record);
-
-    // configure pin back
-    gpio_init_ex(sd_cs_record, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh);
-    gpio_write(sd_cs_record, 1);
-    delay(1);
-
-    // TODO: SPI manager
-    api_hal_spi_unlock(sd_fast_spi.spi);
-
-    return result;
-}
-
 void enable_cc1101_irq() {
     HAL_NVIC_SetPriority(EXTI4_IRQn, 5, 0);
     HAL_NVIC_EnableIRQ(EXTI4_IRQn);

firmware/targets/f5/api-hal/api-hal-gpio.h

@@ -68,8 +68,6 @@ static inline bool hal_gpio_read(const GpioPin* gpio) {
     }
 }
 
-bool hal_gpio_read_sd_detect(void);
-
 void enable_cc1101_irq();
 
 #ifdef __cplusplus

firmware/targets/f5/api-hal/api-hal-power.c

@@ -6,6 +6,7 @@
 #include <stm32wbxx_ll_pwr.h>
 #include <stm32wbxx_ll_hsem.h>
 #include <stm32wbxx_ll_cortex.h>
+#include <stm32wbxx_ll_gpio.h>
 
 #include <main.h>
 #include <hw_conf.h>
@@ -195,3 +196,11 @@ void api_hal_power_dump_state(string_t buffer) {
         bq25896_get_ntc_mpct()
     );
 }
+
+void api_hal_power_enable_external_3_3v(){
+    LL_GPIO_SetOutputPin(PERIPH_POWER_GPIO_Port, PERIPH_POWER_Pin);
+}
+
+void api_hal_power_disable_external_3_3v(){
+    LL_GPIO_ResetOutputPin(PERIPH_POWER_GPIO_Port, PERIPH_POWER_Pin);
+}

firmware/targets/f5/api-hal/api-hal-resources.c

@@ -25,7 +25,6 @@ const InputPin input_pins[] = {
 
 const size_t input_pins_count = sizeof(input_pins) / sizeof(InputPin);
 
-const GpioPin sd_cs_gpio = {SD_CS_GPIO_Port, SD_CS_Pin};
 const GpioPin vibro_gpio = {VIBRO_GPIO_Port, VIBRO_Pin};
 const GpioPin ibutton_gpio = {iBTN_GPIO_Port, iBTN_Pin};
 const GpioPin cc1101_g0_gpio = {CC1101_G0_GPIO_Port, CC1101_G0_Pin};

firmware/targets/f5/api-hal/api-hal-resources.h

@@ -53,7 +53,6 @@ typedef struct {
 extern const InputPin input_pins[];
 extern const size_t input_pins_count;
 
-extern const GpioPin sd_cs_gpio;
 extern const GpioPin vibro_gpio;
 extern const GpioPin ibutton_gpio;
 extern const GpioPin cc1101_g0_gpio;

firmware/targets/f5/api-hal/api-hal-sd.c

@@ -0,0 +1,22 @@
+#include "api-hal-sd.h"
+#include <stm32wbxx_ll_gpio.h>
+#include <furi.h>
+
+void hal_sd_detect_init(void) {
+    // low speed input with pullup
+    LL_GPIO_SetPinMode(SD_CD_GPIO_Port, SD_CD_Pin, LL_GPIO_MODE_INPUT);
+    LL_GPIO_SetPinSpeed(SD_CD_GPIO_Port, SD_CD_Pin, LL_GPIO_SPEED_FREQ_LOW);
+    LL_GPIO_SetPinPull(SD_CD_GPIO_Port, SD_CD_Pin, LL_GPIO_PULL_UP);
+}
+
+void hal_sd_detect_set_low(void) {
+    // low speed input with pullup
+    LL_GPIO_SetPinMode(SD_CD_GPIO_Port, SD_CD_Pin, LL_GPIO_MODE_OUTPUT);
+    LL_GPIO_SetPinOutputType(SD_CD_GPIO_Port, SD_CD_Pin, LL_GPIO_OUTPUT_OPENDRAIN);
+    LL_GPIO_ResetOutputPin(SD_CD_GPIO_Port, SD_CD_Pin);
+}
+
+bool hal_sd_detect(void) {
+    bool result = !(LL_GPIO_IsInputPinSet(SD_CD_GPIO_Port, SD_CD_Pin));
+    return result;
+}