nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fusee/sept: don't abort on SDMMC DMA transfer failures

Browse source
This commit is contained in:
hexkyz 2020-02-06 19:15:13 +00:00
parent 1309e93e26
commit 9dc7a4dc18
3 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fusee/fusee-primary/src/sdmmc/sdmmc_core.c
View file

@ -615,7 +615,7 @@ static void sdmmc_autocal_run(sdmmc_t *sdmmc, SdmmcBusVoltage voltage)
while ((sdmmc->regs->auto_cal_status & SDMMC_AUTOCAL_ACTIVE)) { while ((sdmmc->regs->auto_cal_status & SDMMC_AUTOCAL_ACTIVE)) {
/* Ensure we haven't timed out. */ /* Ensure we haven't timed out. */
if (get_time_since(timebase) > SDMMC_AUTOCAL_TIMEOUT) { if (get_time_since(timebase) > SDMMC_AUTOCAL_TIMEOUT) {
sdmmc_error(sdmmc, "Auto-calibration timed out!"); sdmmc_warn(sdmmc, "Auto-calibration timed out!");
/* Force a register read to refresh the clock control value. */ /* Force a register read to refresh the clock control value. */
sdmmc_get_sd_clock_control(sdmmc); sdmmc_get_sd_clock_control(sdmmc);
@ -1642,11 +1642,9 @@ int sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_command_t *cmd, sdmmc_request_t *req, u
is_dma = true; is_dma = true;
dma_blkcnt = sdmmc_dma_init(sdmmc, req); dma_blkcnt = sdmmc_dma_init(sdmmc, req);
/* Warn in case initialization failed. This could indicate hardware failure. */
if (!dma_blkcnt) if (!dma_blkcnt)
{ sdmmc_warn(sdmmc, "Failed to initialize the DMA transfer!");
sdmmc_error(sdmmc, "Failed to initialize the DMA transfer!");
return 0;
}
/* If this is a SDMA write operation, copy the data into our bounce buffer. */ /* If this is a SDMA write operation, copy the data into our bounce buffer. */
if (!sdmmc->use_adma && !req->is_read) if (!sdmmc->use_adma && !req->is_read)
@ -1672,11 +1670,9 @@ int sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_command_t *cmd, sdmmc_request_t *req, u
/* Process the DMA request. */ /* Process the DMA request. */
if (req) if (req)
{ {
/* Warn in case updating failed. This could indicate hardware failure. */
if (!sdmmc_dma_update(sdmmc)) if (!sdmmc_dma_update(sdmmc))
{ sdmmc_warn(sdmmc, "Failed to process the DMA transfer!");
sdmmc_error(sdmmc, "Failed to process the DMA transfer!");
return 0;
}
/* If this is a SDMA read operation, copy the data from our bounce buffer. */ /* If this is a SDMA read operation, copy the data from our bounce buffer. */
if (!sdmmc->use_adma && req->is_read) if (!sdmmc->use_adma && req->is_read)

14
fusee/fusee-secondary/src/sdmmc/sdmmc_core.c
View file

@ -615,7 +615,7 @@ static void sdmmc_autocal_run(sdmmc_t *sdmmc, SdmmcBusVoltage voltage)
while ((sdmmc->regs->auto_cal_status & SDMMC_AUTOCAL_ACTIVE)) { while ((sdmmc->regs->auto_cal_status & SDMMC_AUTOCAL_ACTIVE)) {
/* Ensure we haven't timed out. */ /* Ensure we haven't timed out. */
if (get_time_since(timebase) > SDMMC_AUTOCAL_TIMEOUT) { if (get_time_since(timebase) > SDMMC_AUTOCAL_TIMEOUT) {
sdmmc_error(sdmmc, "Auto-calibration timed out!"); sdmmc_warn(sdmmc, "Auto-calibration timed out!");
/* Force a register read to refresh the clock control value. */ /* Force a register read to refresh the clock control value. */
sdmmc_get_sd_clock_control(sdmmc); sdmmc_get_sd_clock_control(sdmmc);
@ -1642,11 +1642,9 @@ int sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_command_t *cmd, sdmmc_request_t *req, u
is_dma = true; is_dma = true;
dma_blkcnt = sdmmc_dma_init(sdmmc, req); dma_blkcnt = sdmmc_dma_init(sdmmc, req);
/* Warn in case initialization failed. This could indicate hardware failure. */
if (!dma_blkcnt) if (!dma_blkcnt)
{ sdmmc_warn(sdmmc, "Failed to initialize the DMA transfer!");
sdmmc_error(sdmmc, "Failed to initialize the DMA transfer!");
return 0;
}
/* If this is a SDMA write operation, copy the data into our bounce buffer. */ /* If this is a SDMA write operation, copy the data into our bounce buffer. */
if (!sdmmc->use_adma && !req->is_read) if (!sdmmc->use_adma && !req->is_read)
@ -1672,11 +1670,9 @@ int sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_command_t *cmd, sdmmc_request_t *req, u
/* Process the DMA request. */ /* Process the DMA request. */
if (req) if (req)
{ {
/* Warn in case updating failed. This could indicate hardware failure. */
if (!sdmmc_dma_update(sdmmc)) if (!sdmmc_dma_update(sdmmc))
{ sdmmc_warn(sdmmc, "Failed to process the DMA transfer!");
sdmmc_error(sdmmc, "Failed to process the DMA transfer!");
return 0;
}
/* If this is a SDMA read operation, copy the data from our bounce buffer. */ /* If this is a SDMA read operation, copy the data from our bounce buffer. */
if (!sdmmc->use_adma && req->is_read) if (!sdmmc->use_adma && req->is_read)

14
sept/sept-secondary/src/sdmmc/sdmmc_core.c
View file

@ -615,7 +615,7 @@ static void sdmmc_autocal_run(sdmmc_t *sdmmc, SdmmcBusVoltage voltage)
while ((sdmmc->regs->auto_cal_status & SDMMC_AUTOCAL_ACTIVE)) { while ((sdmmc->regs->auto_cal_status & SDMMC_AUTOCAL_ACTIVE)) {
/* Ensure we haven't timed out. */ /* Ensure we haven't timed out. */
if (get_time_since(timebase) > SDMMC_AUTOCAL_TIMEOUT) { if (get_time_since(timebase) > SDMMC_AUTOCAL_TIMEOUT) {
sdmmc_error(sdmmc, "Auto-calibration timed out!"); sdmmc_warn(sdmmc, "Auto-calibration timed out!");
/* Force a register read to refresh the clock control value. */ /* Force a register read to refresh the clock control value. */
sdmmc_get_sd_clock_control(sdmmc); sdmmc_get_sd_clock_control(sdmmc);
@ -1642,11 +1642,9 @@ int sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_command_t *cmd, sdmmc_request_t *req, u
is_dma = true; is_dma = true;
dma_blkcnt = sdmmc_dma_init(sdmmc, req); dma_blkcnt = sdmmc_dma_init(sdmmc, req);
/* Warn in case initialization failed. This could indicate hardware failure. */
if (!dma_blkcnt) if (!dma_blkcnt)
{ sdmmc_warn(sdmmc, "Failed to initialize the DMA transfer!");
sdmmc_error(sdmmc, "Failed to initialize the DMA transfer!");
return 0;
}
/* If this is a SDMA write operation, copy the data into our bounce buffer. */ /* If this is a SDMA write operation, copy the data into our bounce buffer. */
if (!sdmmc->use_adma && !req->is_read) if (!sdmmc->use_adma && !req->is_read)
@ -1672,11 +1670,9 @@ int sdmmc_send_cmd(sdmmc_t *sdmmc, sdmmc_command_t *cmd, sdmmc_request_t *req, u
/* Process the DMA request. */ /* Process the DMA request. */
if (req) if (req)
{ {
/* Warn in case updating failed. This could indicate hardware failure. */
if (!sdmmc_dma_update(sdmmc)) if (!sdmmc_dma_update(sdmmc))
{ sdmmc_warn(sdmmc, "Failed to process the DMA transfer!");
sdmmc_error(sdmmc, "Failed to process the DMA transfer!");
return 0;
}
/* If this is a SDMA read operation, copy the data from our bounce buffer. */ /* If this is a SDMA read operation, copy the data from our bounce buffer. */
if (!sdmmc->use_adma && req->is_read) if (!sdmmc->use_adma && req->is_read)