tpm2: define reserved space's sizes and addresses at compile time
s_reservedSize[] and s_reservedAddr[] are practically compile-time
constants, but they are filled-in dynamically and also cleared on TPM
state transitions. This adds code size, use SRAM and requires proper
initialization sequence to use TPM reserved spaces early in the boot
sequence. By moving it to compile-time constants we can simplify code
and make sure they are always initialized.
Before: 9984 bytes in flash and 1076 bytes free
After: 10092 bytes in flash and 1364 bytes free
BUG=b:285094026, b:262324344
TEST=CQ, make & test/tpm_test.py -p
Manually check content of variables:
`objdump -t build/cr50/RW/ec.RW.elf | grep s_reserved`
00074eb4 g O .rodata 00000048 .hidden s_reservedAddr.lto_priv.0
00074e6c g O .rodata 00000048 .hidden s_reservedSize.lto_priv.0
`xxd -seek 0x30e6c -e -g 2 -l 144 build/cr50/RW/ec.RW.bin`
00030e6c: 0004 0002 0002 0002 0042 0042 0042 0042 ........B.B.B.B.
00030e7c: 0042 0042 0022 0022 0022 0042 0042 0042 B.B.".".".B.B.B.
00030e8c: 0008 0004 0086 001c 0003 0004 0004 0004 ................
00030e9c: 0004 0004 0002 000f 0002 0008 0004 0004 ................
00030eac: 0004 0060 0b1c 01a8|
s_reservedAddr: 0000 0004 0006 0008 ..`.............
00030ebc: 000a 004c 008e 00d0 0112 0154 0196 01b8 ..L.......T.....
00030ecc: 01da 01fc 023e 0280 02c2 02ca 02ce 0354 ....>.........T.
00030edc: 0370 0373 0377 037b 037f 0383 0387 0389 p.s.w.{.........
00030eec: 0398 039a 03a2 03a6 03aa 03ae 040e 0f2a ..............*.
This confirms that sizes are initialized and that addresses are
monotonically increasing and matches original computations.
e.g. 0xf2a = 0x40e + 0xb1c
Original addresses:
Space 0 0004, 0000
Space 1 0002, 0004
Space 2 0002, 0006
Space 3 0002, 0008
Space 4 0042, 000a
Space 5 0042, 004c
Space 6 0042, 008e
Space 7 0042, 00d0
Space 8 0042, 0112
Space 9 0042, 0154
Space 10 0022, 0196
Space 11 0022, 01b8
Space 12 0022, 01da
Space 13 0042, 01fc
Space 14 0042, 023e
Space 15 0042, 0280
Space 16 0008, 02c2
Space 17 0004, 02ca
Space 18 0086, 02ce
Space 19 001c, 0354
Space 20 0003, 0370
Space 21 0004, 0373
Space 22 0004, 0377
Space 23 0004, 037b
Space 24 0004, 037f
Space 25 0004, 0383
Space 26 0002, 0387
Space 27 000f, 0389
Space 28 0002, 0398
Space 29 0008, 039a
Space 30 0004, 03a2
Space 31 0004, 03a6
Space 32 0004, 03aa
Space 33 0060, 03ae
Space 34 0b1c, 040e
Space 35 01a8, 0f2a
Change-Id: Ie02ebeb304833e61273ee7cd3e0bbf9e7634f3e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/tpm2/+/4898271
Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-by: Yi Chou <yich@google.com>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Auto-Submit: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
2 files changed
