software/liblitesdcard: Fix condition in sdcard_init

Instead of retrying `sdcard_app_send_op_cond` until it returns an error,
retry until it completes successfully and the command response has the
busy bit set.
This commit is contained in:
Piotr Wojnarowski 2022-06-22 13:19:46 +02:00
parent 1a90549fa3
commit e141826fd8
1 changed files with 8 additions and 2 deletions

View File

@ -382,6 +382,7 @@ void sdcard_decode_csd(void) {
int sdcard_init(void) {
uint16_t rca, timeout;
uint32_t r[SD_CMD_RESPONSE_SIZE/4];
/* Set SD clk freq to Initialization frequency */
sdcard_set_clk_freq(SDCARD_CLK_FREQ_INIT, 0);
@ -411,8 +412,13 @@ int sdcard_init(void) {
/* Set SDCard in Operational state */
for (timeout=1000; timeout>0; timeout--) {
sdcard_app_cmd(0);
if (sdcard_app_send_op_cond(1) != SD_OK)
if (sdcard_app_send_op_cond(1) == SD_OK) {
csr_rd_buf_uint32(CSR_SDCORE_CMD_RESPONSE_ADDR,
r, SD_CMD_RESPONSE_SIZE/4);
if (r[3] & 0x80000000) /* Busy bit, set when init is complete */
break;
}
busy_wait(1);
}
if (timeout == 0)