[sw/silicon_creator] Add structured kChipInfo to ROM #18100
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmcardle
force-pushed
the
dmcardle/chip_info
branch
2 times, most recently
from
4673b8f
to
95fd0b8
Compare
|
It looks like #17829 was merged recently. Can you rebase and check if it simplifies our lives? |
While not ideal, I think it was fine (static constant in a header), linker is responsible for shuffling things at the end according to our linker scripts. |
alphan
reviewed
Apr 21, 2023
dmcardle
force-pushed
the
dmcardle/chip_info
branch
3 times, most recently
from
9b26e6e
to
d123df0
Compare
dmcardle
commented
Apr 22, 2023
dmcardle
force-pushed
the
dmcardle/chip_info
branch
from
d123df0
to
a728316
Compare
dmcardle
commented
Apr 24, 2023
dmcardle
force-pushed
the
dmcardle/chip_info
branch
4 times, most recently
from
d91bb64
to
4df6a9c
Compare
|
Hey @cfrantz, this is ready for a review when you get a chance! |
dmcardle
force-pushed
the
dmcardle/chip_info
branch
from
4df6a9c
to
765cec7
Compare
dmcardle
commented
Apr 25, 2023
cfrantz
reviewed
Apr 25, 2023
dmcardle
force-pushed
the
dmcardle/chip_info
branch
2 times, most recently
from
02af19c
to
910d28c
Compare
cfrantz
reviewed
Apr 25, 2023
alphan
approved these changes
Apr 26, 2023
|
CC: @msfschaffner, |
dmcardle
force-pushed
the
dmcardle/chip_info
branch
from
910d28c
to
de4b7e5
Compare
ACK |
dmcardle
force-pushed
the
dmcardle/chip_info
branch
from
de4b7e5
to
7798787
Compare
dmcardle
commented
Apr 28, 2023
dmcardle
force-pushed
the
dmcardle/chip_info
branch
3 times, most recently
from
3876c62
to
7181b67
Compare
dmcardle
commented
May 1, 2023
PR lowRISC#17829 updated the FIFO size, but this constant was stale. Signed-off-by: Dan McArdle <dmcardle@opentitan.org>
PR lowRISC#17829 updated the FIFO size, but the constant in this macro was still stale. Signed-off-by: Dan McArdle <dmcardle@opentitan.org>
This commit adds a new `chip_info_t` struct that contains info about the
ROM's provenance. The ROM now prints the Git commit hash on shutdown
after the "VER:" prefix.
The ROM linker script was already configured to place the .chip_info
section at the top of ROM, but I'm not confident that it worked as
expected. The autogenerated header contained a static constant, so I
think a copy would be inlined at some arbitrary location into any
compilation unit that used it, rather than being placed by the linker
script.
To verify that the ROM prints the Git commit hash on shutdown:
./bazelisk.sh test --test_output=streamed \
//sw/device/silicon_creator/rom/e2e:shutdown_output_dev_fpga_cw310_rom
To verify that the .chip_info section contains data from chip_info.o:
./bazelisk.sh build-then 'less %s' --config riscv32 \
//sw/device/silicon_creator/rom:rom_with_fake_keys_fpga_cw310_map
To see the value of `kChipInfo` at the end of ROM:
./bazelisk.sh build-then 'xxd %s | less' --config riscv32 \
//sw/device/silicon_creator/rom:rom_with_fake_keys_fpga_cw310_bin
For example, here's the end of the ROM from the previous command. At
0x7f80, there are 64 bits of a Git commit hash (e20871e1cf102bf6).
00007f70: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00007f80: f62b 10cf e171 08e2 .+...q..
Issue lowRISC#14892
Signed-off-by: Dan McArdle <dmcardle@opentitan.org>
dmcardle
force-pushed
the
dmcardle/chip_info
branch
from
7181b67
to
6549f54
Compare
alphan
approved these changes
May 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds a new
chip_info_tstruct that contains info about the ROM's provenance. The ROM now prints the Git commit hash on shutdown after the "VER:" prefix.The ROM linker script was already configured to place the .chip_info section at the top of ROM, but I'm not confident that it worked as expected. The autogenerated header contained a static constant, so I think a copy would be inlined at some arbitrary location into any compilation unit that used it, rather than being placed by the linker script.
To verify that the ROM prints the Git commit hash on shutdown:
To verify that the .chip_info section contains data from chip_info.o:
To see the value of
kChipInfoat the end of ROM:For example, here's the end of the ROM from the previous command. At 0x7f80, there are 64 bits of a Git commit hash (e20871e1cf102bf6).
Fixes #14892
Further discussion in #18198