From cebf87fc07f3612d603b969d83d4acb178964cd4 Mon Sep 17 00:00:00 2001 From: Pedro Custodio Date: Tue, 12 Jun 2018 16:59:46 +0100 Subject: [PATCH 1/2] smt: Add logging on mailbox ownership error Change-Id: I7e7108be6bae3d5489888746ae58da7bc00035ab Signed-off-by: Ronald Cron --- module/smt/src/mod_smt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module/smt/src/mod_smt.c b/module/smt/src/mod_smt.c index 5505a84a8..a1682b7c0 100644 --- a/module/smt/src/mod_smt.c +++ b/module/smt/src/mod_smt.c @@ -282,8 +282,14 @@ static int smt_slave_handler(struct smt_channel_ctx *channel_ctx) out = channel_ctx->out; /* Check we have ownership of the mailbox */ - if (memory->status & MOD_SMT_MAILBOX_STATUS_FREE_MASK) + if (memory->status & MOD_SMT_MAILBOX_STATUS_FREE_MASK) { + smt_ctx.log_api->log( + MOD_LOG_GROUP_ERROR, + "[SMT] Mailbox ownership error on channel %u\n", + fwk_id_get_element_idx(channel_ctx->id)); + return FWK_E_STATE; + } /* Commit to sending a response */ channel_ctx->locked = true; -- GitLab From ced7f09284c988b9e1e84d763a2c03b88543c9ec Mon Sep 17 00:00:00 2001 From: Pedro Custodio Date: Thu, 7 Jun 2018 11:34:01 +0100 Subject: [PATCH 2/2] system_power: Add API definition guard Change-Id: I8060024e45a187afacdc70f9f39c9083f4cce71c Signed-off-by: Ronald Cron --- module/system_power/include/mod_system_power.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/module/system_power/include/mod_system_power.h b/module/system_power/include/mod_system_power.h index 8d114b680..95c738275 100644 --- a/module/system_power/include/mod_system_power.h +++ b/module/system_power/include/mod_system_power.h @@ -95,16 +95,19 @@ struct mod_system_power_driver_api { * \brief API indices. */ enum mod_system_power_api_idx { +#if BUILD_HAS_MOD_SYSTEM_POWER /*! API index for the power domain driver API */ MOD_SYSTEM_POWER_API_IDX_PD_DRIVER, /*! API index for the power domain driver input API */ MOD_SYSTEM_POWER_API_IDX_PD_DRIVER_INPUT, +#endif /*! Number of exposed APIs */ MOD_SYSTEM_POWER_API_COUNT }; +#if BUILD_HAS_MOD_SYSTEM_POWER /*! Identifier of the power domain driver API */ static const fwk_id_t mod_system_power_api_id_pd_driver = FWK_ID_API_INIT(FWK_MODULE_IDX_SYSTEM_POWER, @@ -114,6 +117,7 @@ static const fwk_id_t mod_system_power_api_id_pd_driver = static const fwk_id_t mod_system_power_api_id_pd_driver_input = FWK_ID_API_INIT(FWK_MODULE_IDX_SYSTEM_POWER, MOD_SYSTEM_POWER_API_IDX_PD_DRIVER_INPUT); +#endif /*! * \} -- GitLab