diff options
author | Thejaswani Puta thejaswani.putta@intel.com <thejaswani.putta@intel.corp-partner.google.com> | 2021-01-20 15:22:01 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-02-16 05:35:27 +0000 |
commit | b835c2feb06e72b48ef82845e114bb8af5d7145e (patch) | |
tree | 015f09b46a295bfbc8fad86c61a5ce383271e6b5 /test | |
parent | f1baecae5df8068ef4ee3b0d0f99659de47e7d71 (diff) | |
download | chrome-ec-b835c2feb06e72b48ef82845e114bb8af5d7145e.tar.gz |
CBI: Add rework_id fieldstabilize-rust-13795.B-main
This field will be used to describe all the reworks performed on
a board which includes the mandatory, optional and feature reworks.
Also modified existing command handlers under ectool and cbi-util tool
to support 64 bit length data.
Includes build fix for targets where long int is not 64 bits.
BUG: b:170385859
BUILD TEST:
make BOARD=<BOARD_NAME> -j;
make runfuzztests
make runhosttests
setup_board, cros_workon & emerge-<32-bit target> ec-utils
TEST: ./cbi-util create --file ~/cbi_image --board_version 1
--oem_id 2 --sku_id 255 --dram_part_num "01654329efghac"
--model_id 15 --rework_id 123456789123456712 --size 256
CBI image is created successfully
TEST: ./cbi-util show --file ~/cbi_image
CBI image: /home/thejaswani/cbi_image
TOTAL_SIZE: 47
Data Field: name: value (hex, tag, size)
BOARD_VERSION: 1 (0x1, 0, 1)
OEM_ID: 2 (0x2, 1, 1)
SKU_ID: 255 (0xff, 2, 1)
MODEL_ID: 15 (0xf, 5, 1)
REWORK_ID: 123456789123456712 (0x1b69b4bacd05ec8, 9, 8)
DRAM_PART_NUM: 01654329efghac (3, 15)
Data validated successfully
TEST: hexdump -C ~/cbi_image
00000000 43 42 49 1e 00 00 2f 00 00 01 01 01 01 02 02 01 |CBI.../.........|
00000010 ff 05 01 0f 09 08 c8 5e d0 ac 4b 9b b6 01 03 0f |.......^..K.....|
00000020 30 31 36 35 34 33 32 39 65 66 67 68 61 63 00 ff |01654329efghac..|
00000030 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
*
00000100
TEST:
localhost ~ # ectool cbi set 9 98765432 8
localhost ~ # ectool cbi get 9
As uint: 98765432 (0x5e30a78)
As binary: 78 0a e3 05 00 00 00 00
localhost ~ # ectool cbi set 9 123456789123456712 8
localhost ~ # ectool cbi get 9
As uint: 123456789123456712 (0x1b69b4bacd05ec8)
As binary: c8 5e d0 ac 4b 9b b6 01
localhost ~ # ectool cbi set 9 1234 2
localhost ~ # ectool cbi get 9
As uint: 1234 (0x4d2)
As binary: d2 04
TEST:
> cbi(from EC Console)
2021-01-19 20:59:56 [80.979692 CBI Reading board info]
2021-01-19 20:59:56 CBI_VERSION: 0x0000
2021-01-19 20:59:56 TOTAL_SIZE: 54
2021-01-19 20:59:56 BOARD_VERSION: 1 (0x1)
2021-01-19 20:59:56 OEM_ID: (Error 1)
2021-01-19 20:59:56 MODEL_ID: (Error 1)
2021-01-19 20:59:56 SKU_ID: 655361 (0xa0001)
2021-01-19 20:59:56 FW_CONFIG: 199683 (0x30c03)
2021-01-19 20:59:56 PCB_SUPPLIER: (Error 1)
2021-01-19 20:59:56 SSFC: (Error 1)
2021-01-19 20:59:56 REWORK_ID: 1234 (0x4d2)
2021-01-19 20:59:56 43 42 49 8c 00 00 36 00 00 01 01 02 04 01 00 0a |CBI...6.........|
2021-01-19 20:59:56 00 06 04 03 0c 03 00 03 19 4d 54 35 33 45 35 31 |.........MT53E51|
2021-01-19 20:59:56 32 4d 36 34 44 34 4e 57 2d 30 34 36 20 57 54 3a |2M64D4NW-046 WT:|
2021-01-19 20:59:56 45 00 09 02 d2 04 ff ff ff ff ff 7f ff ff ff ff |E...............|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2020-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
2021-01-19 20:59:56 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
Signed-off-by: Thejaswani Puta <thejaswani.putta@intel.com>
Change-Id: I073a119d43c94cd266503a0fc972a62134b3385f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2693746
Tested-by: Thejaswani Putta <thejaswani.putta@intel.corp-partner.google.com>
Commit-Queue: Thejaswani Putta <thejaswani.putta@intel.corp-partner.google.com>
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/cbi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/cbi.c b/test/cbi.c index f0fe68f162..eb2321a649 100644 --- a/test/cbi.c +++ b/test/cbi.c @@ -126,6 +126,7 @@ static int test_all_tags(void) { uint8_t d8; uint32_t d32; + uint64_t d64; const char string[] = "abc"; uint8_t buf[32]; uint8_t size; @@ -162,6 +163,9 @@ static int test_all_tags(void) TEST_ASSERT(cbi_set_board_info(CBI_TAG_SSFC, &d8, sizeof(d8)) == EC_SUCCESS); count++; + TEST_ASSERT(cbi_set_board_info(CBI_TAG_REWORK_ID, &d8, sizeof(d8)) + == EC_SUCCESS); + count++; /* Read out all */ TEST_ASSERT(cbi_get_board_version(&d32) == EC_SUCCESS); @@ -188,6 +192,8 @@ static int test_all_tags(void) TEST_EQ(d32, d8, "0x%x"); TEST_ASSERT(cbi_get_ssfc(&d32) == EC_SUCCESS); TEST_EQ(d32, d8, "0x%x"); + TEST_ASSERT(cbi_get_rework_id(&d64) == EC_SUCCESS); + TEST_EQ((unsigned long long)d64, (unsigned long long)d8, "0x%llx"); /* Fail if a (new) tag is missing from the unit test. */ TEST_EQ(count, CBI_TAG_COUNT, "%d"); |