GFW TrustZone support. #772
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -55,7 +55,10 @@ extern "C" { | |||||
|
|
||||||
| #endif // (defined(SL_MATTER_RGB_LED_ENABLED) && SL_MATTER_RGB_LED_ENABLED == 1) | ||||||
| } | ||||||
| #endif | ||||||
|
|
||||||
| #if defined(SL_PROVISION_GENERATOR) && defined(SL_TRUSTZONE_NONSECURE) | ||||||
| #include "gfw_tz_secure.h" | ||||||
| #endif | ||||||
|
|
||||||
| #ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT | ||||||
|
|
@@ -155,26 +158,29 @@ void SilabsPlatform::SoftwareReset() | |||||
|
|
||||||
| CHIP_ERROR SilabsPlatform::FlashInit() | ||||||
| { | ||||||
| #if defined(SL_PROVISION_GENERATOR) && defined(SL_TRUSTZONE_NONSECURE) | ||||||
| return GFW_Flash_Init() ? CHIP_ERROR_INTERNAL : CHIP_NO_ERROR; | ||||||
| #elif defined(_SILICON_LABS_32B_SERIES_2) | ||||||
| MSC_Init(); | ||||||
| return CHIP_NO_ERROR; | ||||||
| #elif defined(_SILICON_LABS_32B_SERIES_3) | ||||||
| sl_status_t status; | ||||||
| status = sl_se_init(); | ||||||
| VerifyOrReturnError(status == SL_STATUS_OK, CHIP_ERROR(status)); | ||||||
| status = sl_se_init_command_context(&cmd_ctx); | ||||||
| VerifyOrReturnError(status == SL_STATUS_OK, CHIP_ERROR(status)); | ||||||
| return CHIP_NO_ERROR; | ||||||
| #else | ||||||
| return CHIP_ERROR_NOT_IMPLEMENTED; | ||||||
| #endif | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
nit |
||||||
| } | ||||||
|
|
||||||
| CHIP_ERROR SilabsPlatform::FlashErasePage(uint32_t addr) | ||||||
| { | ||||||
| #if defined(SL_PROVISION_GENERATOR) && defined(SL_TRUSTZONE_NONSECURE) | ||||||
| return GFW_Flash_ErasePage(addr) ? CHIP_ERROR_INTERNAL : CHIP_NO_ERROR; | ||||||
| #elif defined(_SILICON_LABS_32B_SERIES_2) | ||||||
| return MSC_ErasePage((uint32_t *) addr) ? CHIP_ERROR_INTERNAL : CHIP_NO_ERROR; | ||||||
|
There was a problem hiding this comment. The return value logic appears inverted. MSC_ErasePage typically returns 0 (msc_Return_OK) on success, so a successful call would incorrectly return CHIP_ERROR_INTERNAL. The ternary condition should be inverted to match the GFW pattern or the MSC function's actual return convention should be verified. |
||||||
| #elif defined(_SILICON_LABS_32B_SERIES_3) | ||||||
| sl_status_t status; | ||||||
| uint32_t * data_start = NULL; | ||||||
|
|
@@ -185,16 +191,18 @@ CHIP_ERROR SilabsPlatform::FlashErasePage(uint32_t addr) | |||||
| VerifyOrReturnError(GENERIC_ADDRESS(addr) > GENERIC_ADDRESS((uint32_t) data_start), CHIP_ERROR_INVALID_ADDRESS); | ||||||
| status = sl_se_data_region_erase(&cmd_ctx, (void *) addr, 1); // Erase one page | ||||||
| VerifyOrReturnError(status == SL_STATUS_OK, CHIP_ERROR(status)); | ||||||
| return CHIP_NO_ERROR; | ||||||
| #else | ||||||
| return CHIP_ERROR_NOT_IMPLEMENTED; | ||||||
| #endif | ||||||
| } | ||||||
|
|
||||||
| CHIP_ERROR SilabsPlatform::FlashWritePage(uint32_t addr, const uint8_t * data, size_t size) | ||||||
| { | ||||||
| #if defined(SL_PROVISION_GENERATOR) && defined(SL_TRUSTZONE_NONSECURE) | ||||||
| return GFW_Flash_WriteWord(addr, data, size) ? CHIP_ERROR_INTERNAL : CHIP_NO_ERROR; | ||||||
| #elif defined(_SILICON_LABS_32B_SERIES_2) | ||||||
| return MSC_WriteWord((uint32_t *) addr, data, size) ? CHIP_ERROR_INTERNAL : CHIP_NO_ERROR; | ||||||
|
There was a problem hiding this comment. The return value logic appears inverted. MSC_WriteWord typically returns 0 (msc_Return_OK) on success, so a successful call would incorrectly return CHIP_ERROR_INTERNAL. The ternary condition should be inverted to match the GFW pattern or the MSC function's actual return convention should be verified. |
||||||
| #elif defined(_SILICON_LABS_32B_SERIES_3) | ||||||
| sl_status_t status; | ||||||
| uint32_t * data_start = NULL; | ||||||
|
|
@@ -205,8 +213,10 @@ CHIP_ERROR SilabsPlatform::FlashWritePage(uint32_t addr, const uint8_t * data, s | |||||
| VerifyOrReturnError(GENERIC_ADDRESS(addr) > GENERIC_ADDRESS((uint32_t) data_start), CHIP_ERROR_INVALID_ADDRESS); | ||||||
| status = sl_se_data_region_write(&cmd_ctx, (void *) addr, data, size); | ||||||
| VerifyOrReturnError(status == SL_STATUS_OK, CHIP_ERROR(status)); | ||||||
| return CHIP_NO_ERROR; | ||||||
| #else | ||||||
| return CHIP_ERROR_NOT_IMPLEMENTED; | ||||||
| #endif | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
nit |
||||||
| } | ||||||
|
|
||||||
| #ifdef ENABLE_WSTK_LEDS | ||||||
|
|
||||||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit