Skip to content

pldm-fw: fd: Perform state transitions when processing UA responses #54

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

Merged
mkj merged 1 commit into from
Jun 22, 2026
Merged

pldm-fw: fd: Perform state transitions when processing UA responses #54

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
101 changes: 57 additions & 44 deletions pldm-fw/src/fd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,61 @@ impl<R: RespChannel> Responder<R> {

match Cmd::from_u8(rsp.cmd) {
Some(Cmd::RequestFirmwareData) => self.download_response(rsp, d),
Some(Cmd::TransferComplete) => {
if matches!(&self.state, State::Download { .. }) {
self.set_state_with(|prev| {
let State::Download {
details, req_comm, ..
} = prev
else {
unreachable!()
};
State::Verify {
verify_result: None,
request: FDReq::Ready,
details,
req_comm,
req_pending: false,
}
});
} else {
warn!(
"TransferComplete response but not in Download state"
);
}
Ok(())
}

// Ignore replies to these requests.
// We may have already moved on to a later state
// and don't have any useful retry for them.
Some(Cmd::TransferComplete)
| Some(Cmd::VerifyComplete)
| Some(Cmd::ApplyComplete) => Ok(()),

Some(Cmd::VerifyComplete) => {
if matches!(&self.state, State::Verify { .. }) {
self.set_state_with(|prev| {
let State::Verify {
details, req_comm, ..
} = prev
else {
unreachable!()
};
State::Apply {
apply_result: None,
request: FDReq::Ready,
details,
req_comm,
req_pending: false,
}
});
} else {
warn!("VerifyComplete response but not in Verify state");
}
Ok(())
}
Some(Cmd::ApplyComplete) => {
if matches!(&self.state, State::Apply { .. }) {
self.set_state(State::ReadyXfer);
} else {
warn!("ApplyComplete response but not in Apply state");
}
Ok(())
}
_ => Err(proto_error!("Unsupported PLDM response")),
}
}
Expand Down Expand Up @@ -808,23 +855,7 @@ impl<R: RespChannel> Responder<R> {

if let Some(tr) = transfer_result {
// transfer complete sent
if *tr == TransferResult::Success {
self.set_state_with(|prev| {
let State::Download {
details, req_comm, ..
} = prev
else {
unreachable!()
};
State::Verify {
verify_result: None,
request: FDReq::Ready,
details,
req_comm,
req_pending: false,
}
});
} else {
if *tr != TransferResult::Success {
// idle in Download state until the UA cancels
*request = FDReq::Failed((*tr).into())
}
Expand Down Expand Up @@ -880,23 +911,7 @@ impl<R: RespChannel> Responder<R> {
}
*req_pending = true;

if *vr == VerifyResult::Success {
self.set_state_with(|prev| {
let State::Verify {
details, req_comm, ..
} = prev
else {
unreachable!()
};
State::Apply {
apply_result: None,
request: FDReq::Ready,
details,
req_comm,
req_pending: false,
}
});
} else {
if *vr != VerifyResult::Success {
// on verify failure remain in State::Verify, wait for cancel
*request = FDReq::Failed(u8::from(*vr))
}
Expand Down Expand Up @@ -951,9 +966,7 @@ impl<R: RespChannel> Responder<R> {
}
*req_pending = true;

if *ar == ApplyResult::Success {
self.set_state(State::ReadyXfer);
} else {
if *ar != ApplyResult::Success {
// on failure remain in State::Apply, wait for cancel
*request = FDReq::Failed(u8::from(*ar));
}
Expand Down
Loading