Skip to content

[ot] hw/opentitan: ot_spi_host: rework SPI Host #139

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

Jump to bottom
Merged
merged 23 commits into from
Feb 13, 2025
Merged

[ot] hw/opentitan: ot_spi_host: rework SPI Host #139

merged 23 commits into from
Feb 13, 2025

Conversation

rivos-eblot
Copy link

@rivos-eblot rivos-eblot commented Feb 7, 2025 •
edited
Loading

  • fix STATUS.active bit
  • fix command FIFO management
  • add basic SPI bus clock pacing
  • improve FSM scheduling

All SPI Host tests from sw/device/tests now pass

+---------------------------------+--------+----------+--------+-------+
| Name                            | Result |     Time | Icount | Error |
+=================================+========+==========+========+=======+
| spi_host_irq_test               |   PASS |  6668 ms |      6 |       |
+---------------------------------+--------+----------+--------+-------+
| spi_host_macronix1Gb_flash_test |   PASS | 13669 ms |      6 |       |
+---------------------------------+--------+----------+--------+-------+
| spi_host_smoketest              |   PASS |  6786 ms |      6 |       |
+---------------------------------+--------+----------+--------+-------+
| spi_host_winbond_flash_test     |   PASS | 11870 ms |      6 |       |
+---------------------------------+--------+----------+--------+-------+

See #129 for details.

@rivos-eblot rivos-eblot mentioned this pull request Feb 7, 2025
Closed
@rivos-eblot rivos-eblot force-pushed the dev/ebl/spihost_active_bit branch from 0f93238 to 5fd3cb6 Compare February 10, 2025 11:42
@rivos-eblot rivos-eblot force-pushed the dev/ebl/spihost_active_bit branch 5 times, most recently from cd9a600 to 2549644 Compare February 11, 2025 09:15
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: add missing function name to log mess…
fbda5a4 
…ages

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot rivos-eblot force-pushed the dev/ebl/spihost_active_bit branch from 2549644 to 64f0245 Compare February 11, 2025 11:02
@rivos-eblot rivos-eblot changed the title [ot] hw/opentitan: ot_spi_host: fix STATUS.active bit and add basic clock management [ot] hw/opentitan: ot_spi_host: rework SPI Host Feb 11, 2025
loiclefort
loiclefort reviewed Feb 11, 2025
View reviewed changes
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: remove banked CONFIGOPTS management
8062500 
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: add PCLK property
ed7a1db 
Ideally, this should be implemented as a irq signal to receive
dynamic clock settings from the clock manager. Until ot_clkmgr supports
this feature, use a simple property.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/riscv: ot_earlgrey: configure SPI host clocks
65588b6 
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/riscv: ot_darjeeling: configure SPI host clock
7198a15 
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: restore reduced status trace configur…
364b4d4 
…ation

Restore configuration that got unexpectedly discarded in "rework SPI event management" commit

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: fix STATUS.active bit behavior
37b7093 
Documentation was misleading: "the command is complete when STATUS.ACTIVE goes low."
It turns out STATUS.active goes low when the last pushed command is completed,
in other words, STATUS.active is not released as soon as a command is complete.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: add experimental clock pacing
3630c49 
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: fix internal reset
23ce683 
Update SPI Host doc clarifies that registers are -not- reset upon a SW reset.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: remove bottom half that has been depr…
d6cdb33 
…ecated

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: remove duplicate code
ac220c0 
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: resume command execution even on error
ea8b7da 
Observing Verilator waves, it seems nothing precludes the SPI HOST FSM
from executing on error.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: rework command FIFO management
f464049 
Observing Verilator waves, the command FIFO only contains next command,
not the one that is being executed. In other words, there can be 5 in-fly commands,
not 4, as 4 are stored in the command FIFO + 1 is being executed.

Remove CS channel limitation (from 8 to 32 bits) and command tracking value
(from 16 to 32 bits)

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: deprecated fsm.active bit
0a0115a 
Active command status provides the same information.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: add command status to ot_spi_host_tra…
724f581 
…ce_status

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: refactor FSM scheduling
4db13fa 
Command completion is handled in a dedicated function.
Add a short delay on command push to yield execution back to the vCPU
before kicking the FSM.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: fix TX/RX stall management on new com…
47b198f 
…mand

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: add missing const qualifiers
d6a10f6 
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: ensure invalid CSID is a no-op on SPI…
8b3a59d 
… I/F

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: fix comment style
0517170 
Remove deprecated Doxygen-like C comments, use QEMU style.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot rivos-eblot force-pushed the dev/ebl/spihost_active_bit branch from 76c5a7f to 0a35efd Compare February 11, 2025 14:16
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: fix ResettableAPI usage
92a8ec0 
When overriding the parent's reset implementation, the child is responsible
to call its parent's implementation.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] hw/opentitan: ot_spi_host: remove unused constant
63a7c2b 
OT_SPI_HOST_IRQ_NUM is no longer used.

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot
[ot] docs/opentitan: earlgrey & darjeeling: update SPI Host documenta…
1063c4c 
…tion

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
@rivos-eblot rivos-eblot force-pushed the dev/ebl/spihost_active_bit branch from 0a35efd to 1063c4c Compare February 12, 2025 15:25
@rivos-eblot rivos-eblot merged commit 8ace5d2 into lowRISC:ot-earlgrey-9.2.0 Feb 13, 2025
7 checks passed
@rivos-eblot rivos-eblot deleted the dev/ebl/spihost_active_bit branch February 13, 2025 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@loiclefort loiclefort loiclefort approved these changes

@AlexJones0 AlexJones0 Awaiting requested review from AlexJones0

@jwnrt jwnrt Awaiting requested review from jwnrt

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rivos-eblot @loiclefort