nold/hekate
1
0
Fork 0
mirror of https://github.com/CTCaer/hekate synced 2024-12-22 11:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

sdmmc v2: Add error checking for all cases

Browse source
This commit is contained in:
CTCaer 2020-04-29 22:09:36 +03:00
parent 5442547a59
commit d0a16a49b6
2 changed files with 74 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
bootloader/storage/sdmmc_driver.c
View file

@ -904,6 +904,7 @@ static int _sdmmc_update_dma(sdmmc_t *sdmmc)
} }
if (result != SDMMC_MASKINT_NOERROR) if (result != SDMMC_MASKINT_NOERROR)
{ {
DPRINTF("%08X!\n", result);
_sdmmc_reset(sdmmc); _sdmmc_reset(sdmmc);
return 0; return 0;
} }
@ -924,7 +925,11 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
bool is_data_present = false; bool is_data_present = false;
if (req) if (req)
{ {
_sdmmc_config_dma(sdmmc, &blkcnt, req); if (!_sdmmc_config_dma(sdmmc, &blkcnt, req))
{
DPRINTF("SDMMC: DMA Wrong cfg!\n");
return 0;
}
// Flush cache before starting the transfer. // Flush cache before starting the transfer.
bpmp_mmu_maintenance(BPMP_MMU_MAINT_CLN_INV_WAY, false); bpmp_mmu_maintenance(BPMP_MMU_MAINT_CLN_INV_WAY, false);
@ -936,9 +941,17 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
_sdmmc_enable_interrupts(sdmmc); _sdmmc_enable_interrupts(sdmmc);
_sdmmc_send_cmd(sdmmc, cmd, is_data_present); if (!_sdmmc_send_cmd(sdmmc, cmd, is_data_present))
{
DPRINTF("SDMMC: Wrong Response type %08X!\n", cmd->rsp_type);
return 0;
}
int result = _sdmmc_wait_response(sdmmc); int result = _sdmmc_wait_response(sdmmc);
if (!result)
{
DPRINTF("SDMMC: Transfer timeout!\n");
}
DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", result, DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", result,
sdmmc->regs->rspreg0, sdmmc->regs->rspreg1, sdmmc->regs->rspreg2, sdmmc->regs->rspreg3); sdmmc->regs->rspreg0, sdmmc->regs->rspreg1, sdmmc->regs->rspreg2, sdmmc->regs->rspreg3);
if (result) if (result)
@ -946,10 +959,20 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
if (cmd->rsp_type) if (cmd->rsp_type)
{ {
sdmmc->expected_rsp_type = cmd->rsp_type; sdmmc->expected_rsp_type = cmd->rsp_type;
_sdmmc_cache_rsp(sdmmc, sdmmc->rsp, 0x10, cmd->rsp_type); result = _sdmmc_cache_rsp(sdmmc, sdmmc->rsp, 0x10, cmd->rsp_type);
if (!result)
{
DPRINTF("SDMMC: Unknown response %08X!\n", sdmmc->rsp[0]);
}
}
if (req && result)
{
result = _sdmmc_update_dma(sdmmc);
if (!result)
{
DPRINTF("SDMMC: DMA Update failed!\n");
}
} }
if (req)
_sdmmc_update_dma(sdmmc);
} }
_sdmmc_mask_interrupts(sdmmc); _sdmmc_mask_interrupts(sdmmc);
@ -969,7 +992,14 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
} }
if (cmd->check_busy || req) if (cmd->check_busy || req)
return _sdmmc_wait_card_busy(sdmmc); {
result = _sdmmc_wait_card_busy(sdmmc);
if (!result)
{
DPRINTF("SDMMC: Busy timeout!\n");
}
return result;
}
} }
return result; return result;
@ -1056,12 +1086,11 @@ static void _sdmmc_config_emmc(u32 id)
APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) |= 1; // Enable Schmitt trigger. APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) |= 1; // Enable Schmitt trigger.
break; break;
} }
} }
int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int auto_cal_enable) int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int auto_cal_enable)
{ {
static const u32 trim_values[] = { 2, 8, 3, 8 }; const u32 trim_values[] = { 2, 8, 3, 8 };
if (id > SDMMC_4) if (id > SDMMC_4)
return 0; return 0;

45
nyx/nyx_gui/storage/sdmmc_driver.c
View file

@ -904,6 +904,7 @@ static int _sdmmc_update_dma(sdmmc_t *sdmmc)
} }
if (result != SDMMC_MASKINT_NOERROR) if (result != SDMMC_MASKINT_NOERROR)
{ {
EPRINTFARGS("%08X!", result);
_sdmmc_reset(sdmmc); _sdmmc_reset(sdmmc);
return 0; return 0;
} }
@ -924,7 +925,11 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
bool is_data_present = false; bool is_data_present = false;
if (req) if (req)
{ {
_sdmmc_config_dma(sdmmc, &blkcnt, req); if (!_sdmmc_config_dma(sdmmc, &blkcnt, req))
{
EPRINTF("DMA CFG Failed!");
return 0;
}
// Flush cache before starting the transfer. // Flush cache before starting the transfer.
bpmp_mmu_maintenance(BPMP_MMU_MAINT_CLN_INV_WAY, false); bpmp_mmu_maintenance(BPMP_MMU_MAINT_CLN_INV_WAY, false);
@ -936,9 +941,17 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
_sdmmc_enable_interrupts(sdmmc); _sdmmc_enable_interrupts(sdmmc);
_sdmmc_send_cmd(sdmmc, cmd, is_data_present); if (!_sdmmc_send_cmd(sdmmc, cmd, is_data_present))
{
EPRINTFARGS("SDMMC: Wrong Response type %08X!\n", cmd->rsp_type);
return 0;
}
int result = _sdmmc_wait_response(sdmmc); int result = _sdmmc_wait_response(sdmmc);
if (!result)
{
EPRINTF("SDMMC: Transfer timeout!");
}
DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", result, DPRINTF("rsp(%d): %08X, %08X, %08X, %08X\n", result,
sdmmc->regs->rspreg0, sdmmc->regs->rspreg1, sdmmc->regs->rspreg2, sdmmc->regs->rspreg3); sdmmc->regs->rspreg0, sdmmc->regs->rspreg1, sdmmc->regs->rspreg2, sdmmc->regs->rspreg3);
if (result) if (result)
@ -946,10 +959,20 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
if (cmd->rsp_type) if (cmd->rsp_type)
{ {
sdmmc->expected_rsp_type = cmd->rsp_type; sdmmc->expected_rsp_type = cmd->rsp_type;
_sdmmc_cache_rsp(sdmmc, sdmmc->rsp, 0x10, cmd->rsp_type); result = _sdmmc_cache_rsp(sdmmc, sdmmc->rsp, 0x10, cmd->rsp_type);
if (!result)
{
EPRINTFARGS("SDMMC: Unknown response %08X!", sdmmc->rsp[0]);
}
}
if (req && result)
{
result = _sdmmc_update_dma(sdmmc);
if (!result)
{
EPRINTF("SDMMC: DMA Update failed!");
}
} }
if (req)
_sdmmc_update_dma(sdmmc);
} }
_sdmmc_mask_interrupts(sdmmc); _sdmmc_mask_interrupts(sdmmc);
@ -969,7 +992,14 @@ static int _sdmmc_execute_cmd_inner(sdmmc_t *sdmmc, sdmmc_cmd_t *cmd, sdmmc_req_
} }
if (cmd->check_busy || req) if (cmd->check_busy || req)
return _sdmmc_wait_card_busy(sdmmc); {
result = _sdmmc_wait_card_busy(sdmmc);
if (!result)
{
EPRINTF("SDMMC: Busy timeout!");
}
return result;
}
} }
return result; return result;
@ -1056,12 +1086,11 @@ static void _sdmmc_config_emmc(u32 id)
APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) |= 1; // Enable Schmitt trigger. APB_MISC(APB_MISC_GP_EMMC4_PAD_CFGPADCTRL) |= 1; // Enable Schmitt trigger.
break; break;
} }
} }
int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int auto_cal_enable) int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int auto_cal_enable)
{ {
static const u32 trim_values[] = { 2, 8, 3, 8 }; const u32 trim_values[] = { 2, 8, 3, 8 };
if (id > SDMMC_4) if (id > SDMMC_4)
return 0; return 0;