Skip to content

Commit 5dd7c73

Browse files
adsz-nordicrlubos
authored andcommitted
suit: utils: Get rid of MRAM write mode setting
SDFW now always uses direct write mode except when deleting. After deleting, write mode is set back to direct. Hence it is safe to assume that the write mode is direct. Ref: NCSDK-30143 Signed-off-by: Adam Szczygieł <[email protected]>
1 parent f951e1b commit 5dd7c73

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

subsys/suit/utils/src/suit_plat_mem_util.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -98,44 +98,19 @@ uint8_t *suit_plat_mem_nvm_ptr_get(uintptr_t offset)
9898
}
9999

100100
#ifdef CONFIG_SDFW_IS_UROT
101-
static nrf_mramc_mode_write_t set_mramc_write_mode(nrf_mramc_mode_write_t new_write_mode)
102-
{
103-
NRF_MRAMC_Type * const mramc = (NRF_MRAMC_Type * const)DT_REG_ADDR(DT_NODELABEL(mramc));
104-
nrf_mramc_config_t mramc_config;
105-
106-
nrf_mramc_config_get(mramc, &mramc_config);
107-
108-
nrf_mramc_mode_write_t previous_write_mode = mramc_config.mode_write;
109-
110-
if (new_write_mode != previous_write_mode) {
111-
mramc_config.mode_write = new_write_mode;
112-
nrf_mramc_config_set(mramc, &mramc_config);
113-
}
114-
115-
return previous_write_mode;
116-
}
117-
118101
bool suit_plat_mem_clear_sicr_update_registers(void)
119102
{
120103
bool cleared = true;
121104

122105
if (NRF_SICR->UROT.UPDATE.OPERATION != SICR_UROT_UPDATE_OPERATION_OPCODE_Nop ||
123106
NRF_SICR->UROT.UPDATE.STATUS != SICR_UROT_UPDATE_STATUS_CODE_None) {
124107

125-
const nrf_mramc_mode_write_t new_write_mode = NRF_MRAMC_MODE_WRITE_DIRECT;
126-
const nrf_mramc_mode_write_t previous_write_mode =
127-
set_mramc_write_mode(new_write_mode);
128-
129108
NRF_SICR->UROT.UPDATE.OPERATION = SICR_UROT_UPDATE_OPERATION_OPCODE_Nop;
130109
NRF_SICR->UROT.UPDATE.STATUS = SICR_UROT_UPDATE_STATUS_CODE_None;
131110

132111
/* Trigger MRAM write */
133112
NRF_SICR->UROT.UPDATE.SM.TBS.RFU[1] = (uint32_t)0xFFFFFFFF;
134113

135-
if (previous_write_mode != new_write_mode) {
136-
set_mramc_write_mode(previous_write_mode);
137-
}
138-
139114
if (NRF_SICR->UROT.UPDATE.OPERATION != SICR_UROT_UPDATE_OPERATION_OPCODE_Nop ||
140115
NRF_SICR->UROT.UPDATE.STATUS != SICR_UROT_UPDATE_STATUS_CODE_None) {
141116
cleared = false;

0 commit comments

Comments
 (0)