Skip to content
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

[opentitantool] Several small fixes #26181

Merged
merged 3 commits into from
Feb 16, 2025
Merged

[opentitantool] Several small fixes #26181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf1bc46
[opentitantool] Adjusted operation order
jesultra Jan 14, 2025
ab6d92c
[opentitantool] Removed debug logging left by accident
jesultra Jan 14, 2025
40c4ca8
[opentitantool] Tolerate 1% deviation either way
jesultra Jan 31, 2025
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
1 change: 0 additions & 1 deletion sw/host/opentitanlib/src/app/i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ impl Bus for LogicalI2cWrapper {
serial_data: Option<&Rc<dyn GpioPin>>,
gsc_ready: Option<&Rc<dyn GpioPin>>,
) -> Result<()> {
log::error!("LogicalI2cWrapper::set_pins()");
let mut inner = self.inner.borrow_mut();
if serial_clock.is_some() {
inner.serial_clock = serial_clock.map(Rc::clone);
Expand Down
4 changes: 2 additions & 2 deletions sw/host/opentitanlib/src/tpm/driver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ const SPI_TPM_WRITE: u32 = 0x40000000;
const SPI_TPM_DATA_LEN_POS: u8 = 24;
const SPI_TPM_ADDRESS_OFFSET: u32 = 0x00D40000;

const MAX_TRANSACTION_SIZE: usize = 32;
const MAX_TRANSACTION_SIZE: usize = 64;
const RESPONSE_HEADER_SIZE: usize = 6;
const MAX_RESPONSE_SIZE: usize = 4096;
const TIMEOUT: Duration = Duration::from_millis(500);
Expand All @@ -288,9 +288,9 @@ impl Driver for SpiDriver {
if self.use_gsc_ready {
self.spi.run_transaction(&mut [
spi::Transfer::Write(&req),
spi::Transfer::GscReady,
spi::Transfer::TpmPoll,
spi::Transfer::Read(data),
spi::Transfer::GscReady,
])
} else {
self.spi.run_transaction(&mut [
Expand Down
2 changes: 1 addition & 1 deletion sw/host/opentitanlib/src/transport/hyperdebug/spi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ impl Target for HyperdebugSpiTarget {
self.receive(rbuf)?;
return Ok(());
}
[Transfer::Write(wbuf), Transfer::GscReady, Transfer::TpmPoll, Transfer::Read(rbuf)] => {
[Transfer::Write(wbuf), Transfer::TpmPoll, Transfer::Read(rbuf), Transfer::GscReady] => {
// Hyperdebug can do SPI TPM transaction as a single USB
// request/reply.
ensure!(
Expand Down
2 changes: 1 addition & 1 deletion sw/host/opentitanlib/src/util/bitbang.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ pub fn parse_delay(num: &str, time_unit: &str, clock: Duration) -> Result<u32> {
let actual_duration = clock.mul(closest_ticks);
let ratio = actual_duration.as_secs_f64() / duration;
ensure!(
(0.99..=1.00).contains(&ratio),
(0.99..=1.01).contains(&ratio),
"Requested delay cannot be approximated to within 1%, try increasing clock frequency",
);
Ok(closest_ticks)
Expand Down
Loading