Skip to content

ot_lc_ctrl: Set LC_STATE to POST_TRANSITION after a transition #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: ot-9.2.0
Choose a base branch
from
Open

ot_lc_ctrl: Set LC_STATE to POST_TRANSITION after a transition #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions hw/opentitan/ot_lc_ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,6 +1284,7 @@ static void ot_lc_ctrl_handle_otp_ack(void *opaque, bool ack)
s->regs[R_STATUS] |= R_STATUS_OTP_ERROR_MASK;
}
LC_FSM_CHANGE_STATE(s, ST_POST_TRANS);
s->lc_state = LC_STATE_POST_TRANSITION;
break;
default:
g_assert_not_reached();
Expand All @@ -1302,6 +1303,7 @@ static void ot_lc_ctrl_program_otp(OtLcCtrlState *s, unsigned lc_tcount,
__func__);
s->regs[R_STATUS] |= R_STATUS_OTP_ERROR_MASK;
LC_FSM_CHANGE_STATE(s, ST_POST_TRANS);
s->lc_state = LC_STATE_POST_TRANSITION;
return;
}

Expand All @@ -1315,6 +1317,7 @@ static void ot_lc_ctrl_program_otp(OtLcCtrlState *s, unsigned lc_tcount,
trace_ot_lc_ctrl_error(s->ot_id, "OTP program request rejected");
s->regs[R_STATUS] |= R_STATUS_STATE_ERROR_MASK;
LC_FSM_CHANGE_STATE(s, ST_POST_TRANS);
s->lc_state = LC_STATE_POST_TRANSITION;
return;
}
}
Expand Down Expand Up @@ -1362,12 +1365,14 @@ static void ot_lc_ctrl_start_transition(OtLcCtrlState *s)
"Invalid volatile unlock token");
s->regs[R_STATUS] |= R_STATUS_TOKEN_ERROR_MASK;
LC_FSM_CHANGE_STATE(s, ST_POST_TRANS);
s->lc_state = LC_STATE_POST_TRANSITION;
}
} else {
trace_ot_lc_ctrl_error(s->ot_id,
"Invalid state(s) for volatile unlock");
s->regs[R_STATUS] |= R_STATUS_TRANSITION_ERROR_MASK;
LC_FSM_CHANGE_STATE(s, ST_POST_TRANS);
s->lc_state = LC_STATE_POST_TRANSITION;
}
return;
}
Expand Down Expand Up @@ -1407,6 +1412,7 @@ static void ot_lc_ctrl_start_transition(OtLcCtrlState *s)
trace_ot_lc_ctrl_error(s->ot_id, "Max transition count reached");
s->regs[R_STATUS] |= R_STATUS_TRANSITION_COUNT_ERROR_MASK;
LC_FSM_CHANGE_STATE(s, ST_POST_TRANS);
s->lc_state = LC_STATE_POST_TRANSITION;
return;
}

Expand Down Expand Up @@ -1454,10 +1460,12 @@ static void ot_lc_ctrl_resume_transition(OtLcCtrlState *s)
trace_ot_lc_ctrl_error(s->ot_id, "Invalid transition");
s->regs[R_STATUS] |= R_STATUS_TRANSITION_ERROR_MASK;
LC_FSM_CHANGE_STATE(s, ST_POST_TRANS);
s->lc_state = LC_STATE_POST_TRANSITION;
} else if (!ot_lc_ctrl_match_token(s, token)) {
trace_ot_lc_ctrl_error(s->ot_id, "Invalid OTP token");
s->regs[R_STATUS] |= R_STATUS_TOKEN_ERROR_MASK;
LC_FSM_CHANGE_STATE(s, ST_POST_TRANS);
s->lc_state = LC_STATE_POST_TRANSITION;
} else {
trace_ot_lc_ctrl_info(s->ot_id, "Valid token");

Expand Down
Loading