From 3e7e7b90ff2e845e3e6870c84ba91d6998d021db Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Mon, 27 Jan 2025 10:00:49 +0100 Subject: [PATCH] suit: Fix warnings in flash_ipuc tests Fix warnings in flash_ipuc tests. Ref: NCSDK-NONE Signed-off-by: Tomasz Chyrowicz --- drivers/flash/flash_ipuc/flash_ipuc.c | 14 +++++++------- scripts/quarantine.yaml | 6 ------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/flash/flash_ipuc/flash_ipuc.c b/drivers/flash/flash_ipuc/flash_ipuc.c index 0e6fdeffb20f..49418915504f 100644 --- a/drivers/flash/flash_ipuc/flash_ipuc.c +++ b/drivers/flash/flash_ipuc/flash_ipuc.c @@ -25,7 +25,7 @@ BUILD_ASSERT(WRITE_BLOCK_SIZE > 0, "zephyr,flash: write_block_size expected to b struct ipuc_context { struct zcbor_string component_id; uint8_t component_id_buf[IPUC_MEM_COMPONENT_MAX_SIZE]; - size_t address; + uintptr_t address; size_t size; bool read_access; }; @@ -282,8 +282,8 @@ static struct device *flash_component_ipuc(struct zcbor_string *component_id, if (!dry_run) { uint8_t cpu_id = 0; - plat_err = suit_plat_decode_component_id(&ctx->component_id, &cpu_id, - &ctx->address, &ctx->size); + plat_err = suit_plat_decode_component_id( + &ctx->component_id, &cpu_id, (intptr_t *)&ctx->address, &ctx->size); if (plat_err != SUIT_PLAT_SUCCESS) { LOG_ERR("Failed to decode IPUC %d component ID: %d", i, plat_err); continue; @@ -296,7 +296,7 @@ static struct device *flash_component_ipuc(struct zcbor_string *component_id, break; } - LOG_INF("IPUC for address range (0x%x, 0x%x) created", ctx->address, + LOG_INF("IPUC for address range (0x%lx, 0x%x) created", ctx->address, ctx->size); } @@ -403,8 +403,8 @@ static struct device *flash_cache_ipuc(uintptr_t min_address, uintptr_t *ipuc_ad return NULL; } - plat_err = suit_plat_decode_component_id(&ctx->component_id, &cpu_id, &ctx->address, - &ctx->size); + plat_err = suit_plat_decode_component_id(&ctx->component_id, &cpu_id, + (intptr_t *)&ctx->address, &ctx->size); if (plat_err != SUIT_PLAT_SUCCESS) { flash_ipuc_release(dev); return NULL; @@ -421,7 +421,7 @@ static struct device *flash_cache_ipuc(uintptr_t min_address, uintptr_t *ipuc_ad return NULL; } - LOG_INF("Cache IPUC at idx %d for address range (0x%x, 0x%x) created", i_max, + LOG_INF("Cache IPUC at idx %d for address range (0x%lx, 0x%x) created", i_max, ctx->address, ctx->size); } diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index feeca7d83cee..9acef94a766a 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -29,12 +29,6 @@ - native_posix comment: "native_posix will be removed soon - native_sim platform is the default simulator now" -- scenarios: - - drivers.flash.flash_ipuc - platforms: - - nrf54h20dk/nrf54h20/cpuapp - comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31492" - - scenarios: - applications.matter_bridge.lto - applications.matter_bridge.lto.br_ble