diff --git a/.clang-tidy b/.clang-tidy index 17ac747bf37db72e852a42a770317fea14c37eb0..fbb4e34d06d954b79b2076fea15d047f9fbc9a0d 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,2 +1,2 @@ -Checks: "bugprone-*,cert-*,clang-analyzer-*,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,clang-diagnostic-*,-clang-diagnostic-deprecated-declarations,misc-*,-misc-unused-parameters,portability-*" +Checks: "bugprone-*,cert-*,clang-analyzer-*,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,clang-diagnostic-*,-clang-diagnostic-deprecated-declarations,misc-*,-misc-unused-parameters,portability-*,readability-braces-around-statements" FormatStyle: "file" diff --git a/arch/arm/armv7-m/src/arch_exceptions.c b/arch/arm/armv7-m/src/arch_exceptions.c index c8c01fc1a5c55309579e46a7f54edfc3031ab251..42227974a1309979b123a2dc605f4a2ae7cb8a47 100644 --- a/arch/arm/armv7-m/src/arch_exceptions.c +++ b/arch/arm/armv7-m/src/arch_exceptions.c @@ -36,8 +36,9 @@ void software_init_hook(void) char *start = &__data_start__; char *end = &__data_end__; - if (load != start) + if (load != start) { memcpy(start, load, end - start); + } } #endif diff --git a/arch/arm/armv7-m/src/arch_handlers.c b/arch/arm/armv7-m/src/arch_handlers.c index 8357b58f3c915b54a2169f4ce174d888c88feb56..39795498970f948cb0078aa115ed44e038454872 100644 --- a/arch/arm/armv7-m/src/arch_handlers.c +++ b/arch/arm/armv7-m/src/arch_handlers.c @@ -43,6 +43,7 @@ noreturn void arch_exception_reset(void) noreturn FWK_WEAK void arch_exception_invalid(void) { - while (true) + while (true) { __WFI(); + } } diff --git a/arch/arm/armv7-m/src/arch_main.c b/arch/arm/armv7-m/src/arch_main.c index 59e85748220decedf6fe395d50f2860a338841d7..d3e120e348810a9bc0a0afa2709e6bd8d40540be 100644 --- a/arch/arm/armv7-m/src/arch_main.c +++ b/arch/arm/armv7-m/src/arch_main.c @@ -22,8 +22,9 @@ /* Platform-dependent backend for the _Exit() function */ void _exit(int status) { - while (true) + while (true) { __WFI(); + } } #endif diff --git a/arch/arm/armv7-m/src/arch_nvic.c b/arch/arm/armv7-m/src/arch_nvic.c index 63ef49407d890693ab1cc927d09e95973bc1bbcf..3a5e8b5c6a97c5a5fb38f5ae1a16248930ba6a84 100644 --- a/arch/arm/armv7-m/src/arch_nvic.c +++ b/arch/arm/armv7-m/src/arch_nvic.c @@ -66,8 +66,9 @@ static int global_disable(void) static int is_enabled(unsigned int interrupt, bool *enabled) { - if (interrupt >= irq_count) + if (interrupt >= irq_count) { return FWK_E_PARAM; + } *enabled = NVIC_GetEnableIRQ(interrupt); @@ -76,8 +77,9 @@ static int is_enabled(unsigned int interrupt, bool *enabled) static int enable(unsigned int interrupt) { - if (interrupt >= irq_count) + if (interrupt >= irq_count) { return FWK_E_PARAM; + } NVIC_EnableIRQ(interrupt); @@ -86,8 +88,9 @@ static int enable(unsigned int interrupt) static int disable(unsigned int interrupt) { - if (interrupt >= irq_count) + if (interrupt >= irq_count) { return FWK_E_PARAM; + } NVIC_DisableIRQ(interrupt); @@ -96,8 +99,9 @@ static int disable(unsigned int interrupt) static int is_pending(unsigned int interrupt, bool *pending) { - if (interrupt >= irq_count) + if (interrupt >= irq_count) { return FWK_E_PARAM; + } *pending = NVIC_GetPendingIRQ(interrupt); @@ -106,8 +110,9 @@ static int is_pending(unsigned int interrupt, bool *pending) static int set_pending(unsigned int interrupt) { - if (interrupt >= irq_count) + if (interrupt >= irq_count) { return FWK_E_PARAM; + } NVIC_SetPendingIRQ(interrupt); @@ -116,8 +121,9 @@ static int set_pending(unsigned int interrupt) static int clear_pending(unsigned int interrupt) { - if (interrupt >= irq_count) + if (interrupt >= irq_count) { return FWK_E_PARAM; + } NVIC_ClearPendingIRQ(interrupt); @@ -126,8 +132,9 @@ static int clear_pending(unsigned int interrupt) static int set_isr_irq(unsigned int interrupt, void (*isr)(void)) { - if (interrupt >= irq_count) + if (interrupt >= irq_count) { return FWK_E_PARAM; + } NVIC_SetVector(interrupt, (uint32_t)isr); @@ -140,8 +147,9 @@ static int set_isr_irq_param( uintptr_t parameter) { struct callback *entry; - if (interrupt >= irq_count) + if (interrupt >= irq_count) { return FWK_E_PARAM; + } entry = &callback[NVIC_USER_IRQ_OFFSET + interrupt - 1]; entry->func = isr; @@ -187,15 +195,17 @@ static int get_current(unsigned int *interrupt) *interrupt = __get_IPSR(); /* Not an interrupt */ - if (*interrupt == 0) + if (*interrupt == 0) { return FWK_E_STATE; + } - if (*interrupt == (NVIC_USER_IRQ_OFFSET + (int)NonMaskableInt_IRQn)) + if (*interrupt == (NVIC_USER_IRQ_OFFSET + (int)NonMaskableInt_IRQn)) { *interrupt = FWK_INTERRUPT_NMI; - else if (*interrupt < NVIC_USER_IRQ_OFFSET) + } else if (*interrupt < NVIC_USER_IRQ_OFFSET) { *interrupt = FWK_INTERRUPT_EXCEPTION; - else + } else { *interrupt -= NVIC_USER_IRQ_OFFSET; + } return FWK_SUCCESS; } @@ -231,8 +241,9 @@ int arch_nvic_init(const struct fwk_arch_interrupt_driver **driver) uint32_t *vector; unsigned int irq; - if (driver == NULL) + if (driver == NULL) { return FWK_E_PARAM; + } /* Find the number of interrupt lines implemented in hardware */ ictr_intlinesnum = SCnSCB->ICTR & SCnSCB_ICTR_INTLINESNUM_Msk; diff --git a/arch/arm/src/arch_mm.c b/arch/arm/src/arch_mm.c index b684a7f7b4ddbc6075fa9771cf16d3bf2652d291..18b4ca39c7d1a03e553d9c8d91b60e1eaabbd52d 100644 --- a/arch/arm/src/arch_mm.c +++ b/arch/arm/src/arch_mm.c @@ -38,23 +38,27 @@ static struct arch_mm_ctx { int posix_memalign(void **memptr, size_t alignment, size_t size) { - if (alignment == 0) + if (alignment == 0) { return EINVAL; + } /* Enforce power-of-two alignment */ - if ((alignment & (alignment - 1)) != 0) + if ((alignment & (alignment - 1)) != 0) { return EINVAL; + } - if ((alignment % sizeof(void *)) != 0) + if ((alignment % sizeof(void *)) != 0) { return EINVAL; + } if (size == 0) { *memptr = NULL; } else { *memptr = _memalign_r(_REENT, alignment, size); - if (*memptr == NULL) + if (*memptr == NULL) { return ENOMEM; + } } return 0; diff --git a/doc/code_rules.md b/doc/code_rules.md index 83a0997f94ddddb3f8e7518b4b6d68de59650078..bfc6ff131f4be77e1552a43689b77cad0479ca55 100644 --- a/doc/code_rules.md +++ b/doc/code_rules.md @@ -156,15 +156,17 @@ Do not rely on the implicit precedence and associativity of C operators. Use parenthesis to make precedence and associativity explicit: \code -if ((a == 'a') || (x == 'x')) +if ((a == 'a') || (x == 'x')) { do_something(); +} \endcode Parenthesis around a unary operator and its operand may be omitted: \code -if (!a || &a) +if (!a || &a) { do_something(); +} \endcode Macros and Constants diff --git a/doc/code_style.md b/doc/code_style.md index 5d37acddfe6cac459d03b8892c18023f94cdd402..98cc55e0f95d3ed685b8d8eadf33cb6526a717b3 100644 --- a/doc/code_style.md +++ b/doc/code_style.md @@ -37,16 +37,8 @@ git clang-format ### Braces -Conditional statements with a single line of code should not use braces, -preferring indentation only: - -```c -if (condition) - function_call(); -``` - -Any sequence of statements that spans multiple lines must be surrounded by -braces: +Conditional statements and iteration statements with a single line or +multiple lines of code must be surrounded by braces: ```c if (condition) { @@ -57,7 +49,7 @@ if (condition) { } ``` -These rules apply independently of whether they are part of an if-else chain: +This rule applies also to an if-else chain: ```c if (condition) { @@ -65,15 +57,17 @@ if (condition) { long_variable_name_x, long_variable_name_y, long_variable_name_z); -} else +} else { function_call_b(); +} ``` Empty loop statements must use `continue`: ```c -while (condition) +while (condition) { continue; +} ``` ### Operators @@ -93,15 +87,17 @@ Do not rely on the implicit precedence and associativity of operators. Use parentheses to make precedence and associativity explicit: ```c -if ((a == 'a') || (x == 'x')) +if ((a == 'a') || (x == 'x')) { do_something(); +} ``` Parentheses around a unary operator and its operand may be omitted: ```c -if (!a && *b) +if (!a && *b) { do_something(); +} ``` ## Conventions diff --git a/framework/src/assert.c b/framework/src/assert.c index 42f51bd625c83998849e1079216a560ec67e369b..0b09649a0b473f55c457df81e1f8469c7d8a3d9e 100644 --- a/framework/src/assert.c +++ b/framework/src/assert.c @@ -10,8 +10,9 @@ #if defined(__ARMCC_VERSION) void __aeabi_assert(const char *expr, const char *file, int line) { - while (1) + while (1) { continue; + } } #elif defined(__NEWLIB__) void __assert_func( @@ -20,7 +21,8 @@ void __assert_func( const char *function, const char *assertion) { - while (1) + while (1) { continue; + } } #endif diff --git a/framework/src/fwk_arch.c b/framework/src/fwk_arch.c index fa0442aa8e938c310c92bb28400868e55e2f66a0..2f8420cc6e1ee26212ad371f9cb4af6424003235 100644 --- a/framework/src/fwk_arch.c +++ b/framework/src/fwk_arch.c @@ -33,13 +33,15 @@ static int fwk_arch_interrupt_init(int (*interrupt_init_handler)( * architecture layer. */ status = interrupt_init_handler(&driver); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } /* Initialize the interrupt management component */ status = fwk_interrupt_init(driver); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } return FWK_SUCCESS; } @@ -48,30 +50,36 @@ int fwk_arch_init(const struct fwk_arch_init_driver *driver) { int status; - if (driver == NULL) + if (driver == NULL) { return FWK_E_PARAM; + } - if (driver->interrupt == NULL) + if (driver->interrupt == NULL) { return FWK_E_PARAM; + } fwk_module_init(); status = fwk_io_init(); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } status = fwk_log_init(); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } /* Initialize interrupt management */ status = fwk_arch_interrupt_init(driver->interrupt); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } status = fwk_module_start(); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } return FWK_SUCCESS; } diff --git a/framework/src/fwk_dlist.c b/framework/src/fwk_dlist.c index 57b5805efdc2af877767c21204877165bb16f9e4..6fcfd08be697808fb654fc65ccf1db4ed598576d 100644 --- a/framework/src/fwk_dlist.c +++ b/framework/src/fwk_dlist.c @@ -56,8 +56,9 @@ struct fwk_dlist_node *__fwk_dlist_pop_head(struct fwk_dlist *list) list->head->prev = (struct fwk_dlist_node *)list; - if (popped != NULL) + if (popped != NULL) { popped->prev = NULL; + } return popped; } diff --git a/framework/src/fwk_id.c b/framework/src/fwk_id.c index e11c792bfe45e006be51ef939bf5ae5569ab8327..c32b494a6408b1fc44ca412bb0aa7af2d7e55ec0 100644 --- a/framework/src/fwk_id.c +++ b/framework/src/fwk_id.c @@ -49,8 +49,9 @@ static void fwk_id_format( fwk_assert(buffer_size > 0); - if (id.common.type >= FWK_ARRAY_SIZE(types)) + if (id.common.type >= FWK_ARRAY_SIZE(types)) { id.common.type = __FWK_ID_TYPE_INVALID; + } indices[0] = id.common.module_idx; @@ -178,8 +179,9 @@ bool fwk_id_is_type(fwk_id_t id, enum fwk_id_type type) bool fwk_id_type_is_valid(fwk_id_t id) { if ((id.common.type != __FWK_ID_TYPE_INVALID) && - (id.common.type < __FWK_ID_TYPE_COUNT)) + (id.common.type < __FWK_ID_TYPE_COUNT)) { return true; + } return false; } diff --git a/framework/src/fwk_interrupt.c b/framework/src/fwk_interrupt.c index 1ef83292b4aba4e5589bce7ddfdd0c03ee85680f..567f24a4dd8b02bd2662a9a8201eab26e719b65d 100644 --- a/framework/src/fwk_interrupt.c +++ b/framework/src/fwk_interrupt.c @@ -24,36 +24,51 @@ static unsigned int critical_section_nest_level; int fwk_interrupt_init(const struct fwk_arch_interrupt_driver *driver) { /* Validate driver by checking that all function pointers are non-null */ - if (driver == NULL) + if (driver == NULL) { return FWK_E_PARAM; - if (driver->global_enable == NULL) + } + if (driver->global_enable == NULL) { return FWK_E_PARAM; - if (driver->global_disable == NULL) + } + if (driver->global_disable == NULL) { return FWK_E_PARAM; - if (driver->is_enabled == NULL) + } + if (driver->is_enabled == NULL) { return FWK_E_PARAM; - if (driver->enable == NULL) + } + if (driver->enable == NULL) { return FWK_E_PARAM; - if (driver->disable == NULL) + } + if (driver->disable == NULL) { return FWK_E_PARAM; - if (driver->is_pending == NULL) + } + if (driver->is_pending == NULL) { return FWK_E_PARAM; - if (driver->set_pending == NULL) + } + if (driver->set_pending == NULL) { return FWK_E_PARAM; - if (driver->clear_pending == NULL) + } + if (driver->clear_pending == NULL) { return FWK_E_PARAM; - if (driver->set_isr_irq == NULL) + } + if (driver->set_isr_irq == NULL) { return FWK_E_PARAM; - if (driver->set_isr_irq_param == NULL) + } + if (driver->set_isr_irq_param == NULL) { return FWK_E_PARAM; - if (driver->set_isr_nmi == NULL) + } + if (driver->set_isr_nmi == NULL) { return FWK_E_PARAM; - if (driver->set_isr_nmi_param == NULL) + } + if (driver->set_isr_nmi_param == NULL) { return FWK_E_PARAM; - if (driver->set_isr_fault == NULL) + } + if (driver->set_isr_fault == NULL) { return FWK_E_PARAM; - if (driver->get_current == NULL) + } + if (driver->get_current == NULL) { return FWK_E_PARAM; + } fwk_interrupt_driver = driver; initialized = true; @@ -63,125 +78,146 @@ int fwk_interrupt_init(const struct fwk_arch_interrupt_driver *driver) int fwk_interrupt_global_enable(void) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } /* Decrement critical_section_nest_level only if in critical section */ - if (critical_section_nest_level > 0) + if (critical_section_nest_level > 0) { critical_section_nest_level--; + } /* Enable interrupts globally if now outside critical section */ - if (critical_section_nest_level == 0) + if (critical_section_nest_level == 0) { return fwk_interrupt_driver->global_enable(); + } return FWK_SUCCESS; } int fwk_interrupt_global_disable(void) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } critical_section_nest_level++; /* If now in outer-most critical section, disable interrupts globally */ - if (critical_section_nest_level == 1) + if (critical_section_nest_level == 1) { return fwk_interrupt_driver->global_disable(); + } return FWK_SUCCESS; } int fwk_interrupt_is_enabled(unsigned int interrupt, bool *enabled) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } - if (enabled == NULL) + if (enabled == NULL) { return FWK_E_PARAM; + } return fwk_interrupt_driver->is_enabled(interrupt, enabled); } int fwk_interrupt_enable(unsigned int interrupt) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } return fwk_interrupt_driver->enable(interrupt); } int fwk_interrupt_disable(unsigned int interrupt) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } return fwk_interrupt_driver->disable(interrupt); } int fwk_interrupt_is_pending(unsigned int interrupt, bool *pending) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } - if (pending == NULL) + if (pending == NULL) { return FWK_E_PARAM; + } return fwk_interrupt_driver->is_pending(interrupt, pending); } int fwk_interrupt_set_pending(unsigned int interrupt) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } return fwk_interrupt_driver->set_pending(interrupt); } int fwk_interrupt_clear_pending(unsigned int interrupt) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } return fwk_interrupt_driver->clear_pending(interrupt); } int fwk_interrupt_set_isr(unsigned int interrupt, void (*isr)(void)) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } - if (isr == NULL) + if (isr == NULL) { return FWK_E_PARAM; + } - if (interrupt == FWK_INTERRUPT_NMI) + if (interrupt == FWK_INTERRUPT_NMI) { return fwk_interrupt_driver->set_isr_nmi(isr); - else + } else { return fwk_interrupt_driver->set_isr_irq(interrupt, isr); + } } int fwk_interrupt_set_isr_param(unsigned int interrupt, void (*isr)(uintptr_t param), uintptr_t param) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } - if (isr == NULL) + if (isr == NULL) { return FWK_E_PARAM; + } - if (interrupt == FWK_INTERRUPT_NMI) + if (interrupt == FWK_INTERRUPT_NMI) { return fwk_interrupt_driver->set_isr_nmi_param(isr, param); - else + } else { return fwk_interrupt_driver->set_isr_irq_param(interrupt, isr, param); + } } int fwk_interrupt_get_current(unsigned int *interrupt) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } - if (interrupt == NULL) + if (interrupt == NULL) { return FWK_E_PARAM; + } return fwk_interrupt_driver->get_current(interrupt); } @@ -189,11 +225,13 @@ int fwk_interrupt_get_current(unsigned int *interrupt) /* This function is only for internal use by the framework */ int fwk_interrupt_set_isr_fault(void (*isr)(void)) { - if (!initialized) + if (!initialized) { return FWK_E_INIT; + } - if (isr == NULL) + if (isr == NULL) { return FWK_E_PARAM; + } return fwk_interrupt_driver->set_isr_fault(isr); } diff --git a/framework/src/fwk_io.c b/framework/src/fwk_io.c index 28a23a1b46a3cf101f205d579d5adff646d95206..27d16cd909420459c32d1397c4dd8b5d4d894847 100644 --- a/framework/src/fwk_io.c +++ b/framework/src/fwk_io.c @@ -82,20 +82,23 @@ int fwk_io_init(void) } else { status = fwk_io_open(&stdin_stream, FMW_IO_STDIN_ID, FWK_IO_MODE_READ); - if (fwk_expect(status == FWK_SUCCESS)) + if (fwk_expect(status == FWK_SUCCESS)) { fwk_io_stdin = &stdin_stream; + } } } if (configure_stdout && !stdout_is_stdin) { status = fwk_io_open(&stdout_stream, FMW_IO_STDOUT_ID, FWK_IO_MODE_WRITE); - if (fwk_expect(status == FWK_SUCCESS)) + if (fwk_expect(status == FWK_SUCCESS)) { fwk_io_stdout = &stdout_stream; + } } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { status = FWK_E_DEVICE; + } return status; } @@ -110,8 +113,9 @@ int fwk_io_open( bool read = (((unsigned int)mode & (unsigned int)FWK_IO_MODE_READ) != 0U); bool write = (((unsigned int)mode & (unsigned int)FWK_IO_MODE_WRITE) != 0U); - if (!fwk_expect(stream != NULL)) + if (!fwk_expect(stream != NULL)) { return FWK_E_PARAM; + } *stream = (struct fwk_io_stream){ .adapter = NULL, @@ -119,27 +123,33 @@ int fwk_io_open( .mode = mode, }; - if (!fwk_expect(read || write)) + if (!fwk_expect(read || write)) { return FWK_E_PARAM; /* Neither reading nor writing requested */ + } status = fwk_module_adapter(&stream->adapter, id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PARAM; /* System entity doesn't exist */ + } fwk_assert(stream->adapter != NULL); - if (!fwk_expect(stream->adapter->open != NULL)) + if (!fwk_expect(stream->adapter->open != NULL)) { return FWK_E_SUPPORT; /* Stream adapter is not implemented */ + } - if (!fwk_expect(!read || (stream->adapter->getch != NULL))) + if (!fwk_expect(!read || (stream->adapter->getch != NULL))) { return FWK_E_SUPPORT; /* Reads requested but no read interface */ + } - if (!fwk_expect(!write || (stream->adapter->putch != NULL))) + if (!fwk_expect(!write || (stream->adapter->putch != NULL))) { return FWK_E_SUPPORT; /* Writes requested but no write interface */ + } status = stream->adapter->open(stream); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -148,29 +158,34 @@ int fwk_io_getch(const struct fwk_io_stream *stream, char *ch) { int status; - if (!fwk_expect(stream != NULL)) + if (!fwk_expect(stream != NULL)) { return FWK_E_PARAM; + } - if (!fwk_expect(ch != NULL)) + if (!fwk_expect(ch != NULL)) { return FWK_E_PARAM; + } *ch = 0; - if (!fwk_expect(stream->adapter != NULL)) + if (!fwk_expect(stream->adapter != NULL)) { return FWK_E_STATE; /* The stream is not open */ + } if (!fwk_expect( (((unsigned int)stream->mode) & ((unsigned int)FWK_IO_MODE_READ)) != - 0U)) + 0U)) { return FWK_E_SUPPORT; /* Stream not open for read operations */ + } fwk_assert(stream->adapter->getch != NULL); status = stream->adapter->getch(stream, ch); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_PENDING; - else if (status != FWK_SUCCESS) + } else if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -179,22 +194,26 @@ int fwk_io_putch(const struct fwk_io_stream *stream, char ch) { int status; - if (!fwk_expect(stream != NULL)) + if (!fwk_expect(stream != NULL)) { return FWK_E_PARAM; + } - if (!fwk_expect(stream->adapter != NULL)) + if (!fwk_expect(stream->adapter != NULL)) { return FWK_E_STATE; /* The stream is not open */ + } if (!fwk_expect( (((unsigned int)stream->mode) & - ((unsigned int)FWK_IO_MODE_WRITE)) != 0U)) + ((unsigned int)FWK_IO_MODE_WRITE)) != 0U)) { return FWK_E_SUPPORT; /* Stream not open for read operations */ + } fwk_assert(stream->adapter->putch != NULL); status = stream->adapter->putch(stream, ch); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -210,19 +229,23 @@ int fwk_io_read( char *cbuffer = buffer; - if (read != NULL) + if (read != NULL) { *read = 0; + } for (size_t i = 0; (i < count) && (status == FWK_SUCCESS); i++) { - for (size_t j = 0; (j < size) && (status == FWK_SUCCESS); j++) + for (size_t j = 0; (j < size) && (status == FWK_SUCCESS); j++) { status = fwk_io_getch(stream, cbuffer++); + } - if ((status == FWK_SUCCESS) && (read != NULL)) + if ((status == FWK_SUCCESS) && (read != NULL)) { *read += 1; + } } - if ((status == FWK_PENDING) && (read == NULL)) + if ((status == FWK_PENDING) && (read == NULL)) { return FWK_E_DATA; /* Reached end-of-stream */ + } return status; } @@ -238,18 +261,22 @@ int fwk_io_write( const char *cbuffer = buffer; - if (!fwk_expect(cbuffer != NULL)) + if (!fwk_expect(cbuffer != NULL)) { return FWK_E_PARAM; + } - if (written != NULL) + if (written != NULL) { *written = 0; + } for (size_t i = 0; (i < count) && (status == FWK_SUCCESS); i++) { - for (size_t j = 0; (j < size) && (status == FWK_SUCCESS); j++) + for (size_t j = 0; (j < size) && (status == FWK_SUCCESS); j++) { status = fwk_io_putch(stream, *cbuffer++); + } - if ((status == FWK_SUCCESS) && (written != NULL)) + if ((status == FWK_SUCCESS) && (written != NULL)) { *written += 1; + } } return status; @@ -259,14 +286,17 @@ int fwk_io_close(struct fwk_io_stream *stream) { int status; - if (!fwk_expect(stream != NULL)) + if (!fwk_expect(stream != NULL)) { return FWK_E_PARAM; + } - if (!fwk_expect(stream->adapter != NULL)) + if (!fwk_expect(stream->adapter != NULL)) { return FWK_SUCCESS; /* The stream is not open */ + } - if (stream->adapter->close == NULL) + if (stream->adapter->close == NULL) { return FWK_SUCCESS; /* Nothing else to do */ + } status = stream->adapter->close(stream); @@ -276,8 +306,9 @@ int fwk_io_close(struct fwk_io_stream *stream) .mode = 0, }; - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -286,8 +317,9 @@ int fwk_io_puts( const struct fwk_io_stream *restrict stream, const char *restrict str) { - if (!fwk_expect(str != NULL)) + if (!fwk_expect(str != NULL)) { return FWK_E_PARAM; + } return fwk_io_write(stream, NULL, str, sizeof(char), strlen(str)); } @@ -304,25 +336,29 @@ int fwk_io_vprintf( char *buffer; - if (!fwk_expect(format != NULL)) + if (!fwk_expect(format != NULL)) { return FWK_E_PARAM; + } va_copy(length_args, args); length = vsnprintf(NULL, 0, format, length_args); va_end(length_args); - if (length < 0) /* Possibly invalid format string? */ + if (length < 0) { /* Possibly invalid format string? */ return FWK_E_STATE; + } buffer = fwk_mm_alloc_notrap(sizeof(buffer[0]), length + 1); - if (buffer == NULL) /* Not enough memory for the string buffer */ + if (buffer == NULL) { /* Not enough memory for the string buffer */ return FWK_E_NOMEM; + } length = vsnprintf(buffer, length + 1, format, args); - if (length >= 0) + if (length >= 0) { status = fwk_io_puts(stream, buffer); /* Write out the buffer */ - else + } else { status = FWK_E_STATE; + } fwk_mm_free(buffer); diff --git a/framework/src/fwk_log.c b/framework/src/fwk_log.c index 741d2ee459612c4b897ede3aea00e6d84781479e..90d5f76e417f38b77c9054441925aa8147f515e3 100644 --- a/framework/src/fwk_log.c +++ b/framework/src/fwk_log.c @@ -51,12 +51,13 @@ int fwk_log_init(void) int status = FWK_SUCCESS; - if (fwk_id_is_equal(FMW_LOG_DRAIN_ID, FMW_IO_STDOUT_ID)) + if (fwk_id_is_equal(FMW_LOG_DRAIN_ID, FMW_IO_STDOUT_ID)) { fwk_log_stream = fwk_io_stdout; - else if (!fwk_id_is_equal(FMW_LOG_DRAIN_ID, FWK_ID_NONE)) { + } else if (!fwk_id_is_equal(FMW_LOG_DRAIN_ID, FWK_ID_NONE)) { status = fwk_io_open(&stream, FMW_LOG_DRAIN_ID, FWK_IO_MODE_WRITE); - if (fwk_expect(status == FWK_SUCCESS)) + if (fwk_expect(status == FWK_SUCCESS)) { fwk_log_stream = &stream; + } } return status; @@ -73,8 +74,9 @@ static bool fwk_log_buffer(struct fwk_ring *ring, const char *message) * of each message does not exceed `UCHAR_MAX`. */ - if ((sizeof(length) + length) > fwk_ring_get_free(ring)) + if ((sizeof(length) + length) > fwk_ring_get_free(ring)) { return false; /* Not enough buffer space */ + } fwk_ring_push(ring, (char *)&length, sizeof(length)); fwk_ring_push(ring, message, length); @@ -147,8 +149,9 @@ static void fwk_log_vsnprintf( */ newline = strchr(buffer, '\n'); - if (newline == NULL) + if (newline == NULL) { newline = buffer + length; + } /* * Lastly, we follow through on the termination with a proper carriage @@ -187,12 +190,14 @@ static bool fwk_log_banner(void) fwk_log_snprintf(sizeof(buffer), buffer, "%s", banner); - if (fwk_io_puts(fwk_log_stream, buffer) != FWK_SUCCESS) + if (fwk_io_puts(fwk_log_stream, buffer) != FWK_SUCCESS) { return false; + } banner = strchr(banner, '\n'); - if (banner != NULL) + if (banner != NULL) { banner++; + } } return true; @@ -215,8 +220,9 @@ void fwk_log_printf(const char *format, ...) * succeeds. */ - if (!banner) + if (!banner) { banner = fwk_log_banner(); + } va_start(args, format); fwk_log_vsnprintf(sizeof(buffer), buffer, format, &args); @@ -241,8 +247,9 @@ void fwk_log_printf(const char *format, ...) } #else int status = fwk_io_puts(fwk_log_stream, buffer); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { fwk_log_ctx.dropped++; + } #endif fwk_interrupt_global_enable(); diff --git a/framework/src/fwk_mm.c b/framework/src/fwk_mm.c index 6d585a50d8809097ef8aecb4116cd8b138f81599..66d7061855decf4032d216ab63c964586b11833a 100644 --- a/framework/src/fwk_mm.c +++ b/framework/src/fwk_mm.c @@ -17,8 +17,9 @@ void *fwk_mm_alloc(size_t num, size_t size) { void *ptr = malloc(num * size); - if (ptr == NULL) + if (ptr == NULL) { fwk_trap(); + } return ptr; } @@ -32,8 +33,9 @@ void *fwk_mm_alloc_aligned(size_t alignment, size_t num, size_t size) { void *ptr = aligned_alloc(alignment, num * size); - if (ptr == NULL) + if (ptr == NULL) { fwk_trap(); + } return ptr; } @@ -41,8 +43,9 @@ void *fwk_mm_alloc_aligned(size_t alignment, size_t num, size_t size) void *fwk_mm_calloc(size_t num, size_t size) { void *ptr = calloc(num, size); - if (ptr == NULL) + if (ptr == NULL) { fwk_trap(); + } return ptr; } diff --git a/framework/src/fwk_module.c b/framework/src/fwk_module.c index fafc8893cfcc637f1de7bd612aa407b0c5e2acc1..f126bad5cf0e7afa06618b2286639e1d8c96ba6f 100644 --- a/framework/src/fwk_module.c +++ b/framework/src/fwk_module.c @@ -67,8 +67,9 @@ static size_t fwk_module_count_elements(const struct fwk_element *elements) { size_t count = 0; - for (; elements[count].name != NULL; count++) + for (; elements[count].name != NULL; count++) { continue; + } return count; } @@ -77,11 +78,13 @@ static size_t fwk_module_count_elements(const struct fwk_element *elements) static void fwk_module_init_subscriptions(struct fwk_dlist **list, size_t count) { *list = fwk_mm_calloc(count, sizeof((*list)[0])); - if (!fwk_expect(*list != NULL)) + if (!fwk_expect(*list != NULL)) { fwk_trap(); + } - for (size_t i = 0; i < count; i++) + for (size_t i = 0; i < count; i++) { fwk_list_init(&((*list)[i])); + } } #endif @@ -116,8 +119,9 @@ static void fwk_module_init_element_ctxs( ctx->element_ctx_table = fwk_mm_calloc(ctx->element_count, sizeof(ctx->element_ctx_table[0])); - if (!fwk_expect(ctx->element_ctx_table != NULL)) + if (!fwk_expect(ctx->element_ctx_table != NULL)) { fwk_trap(); + } for (size_t i = 0; i < ctx->element_count; i++) { fwk_module_init_element_ctx( @@ -177,8 +181,9 @@ static void fwk_module_init_elements(struct fwk_module_ctx *ctx) const struct fwk_module *desc = ctx->desc; - if (!fwk_expect(desc->element_init != NULL)) + if (!fwk_expect(desc->element_init != NULL)) { fwk_trap(); + } for (size_t i = 0; i < ctx->element_count; i++) { fwk_id_t element_id = fwk_id_build_element_id(ctx->id, i); @@ -188,13 +193,15 @@ static void fwk_module_init_elements(struct fwk_module_ctx *ctx) fwk_module_ctx.bind_id = element_id; /* Each element must have a valid pointer to specific data */ - if (!fwk_expect(element->data != NULL)) + if (!fwk_expect(element->data != NULL)) { fwk_trap(); + } status = desc->element_init( element_id, element->sub_element_count, element->data); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { fwk_trap(); + } ctx->state = FWK_MODULE_STATE_INITIALIZED; } @@ -207,30 +214,36 @@ static void fwk_module_init_module(struct fwk_module_ctx *ctx) const struct fwk_module *desc = ctx->desc; const struct fwk_module_config *config = ctx->config; - if (!fwk_expect(desc->name != NULL)) + if (!fwk_expect(desc->name != NULL)) { fwk_trap(); + } - if (!fwk_expect(desc->type < FWK_MODULE_TYPE_COUNT)) + if (!fwk_expect(desc->type < FWK_MODULE_TYPE_COUNT)) { fwk_trap(); + } - if (!fwk_expect(desc->init != NULL)) + if (!fwk_expect(desc->init != NULL)) { fwk_trap(); + } if (!fwk_expect( - (desc->api_count == 0) == (desc->process_bind_request == NULL))) + (desc->api_count == 0) == (desc->process_bind_request == NULL))) { fwk_trap(); + } if (config->elements.type == FWK_MODULE_ELEMENTS_TYPE_DYNAMIC) { size_t notification_count = 0; const struct fwk_element *elements = NULL; - if (!fwk_expect(config->elements.generator != NULL)) + if (!fwk_expect(config->elements.generator != NULL)) { fwk_trap(); + } elements = config->elements.generator(ctx->id); - if (!fwk_expect(elements != NULL)) + if (!fwk_expect(elements != NULL)) { fwk_trap(); + } #ifdef BUILD_HAS_NOTIFICATION notification_count = desc->notification_count; @@ -240,16 +253,19 @@ static void fwk_module_init_module(struct fwk_module_ctx *ctx) } status = desc->init(ctx->id, ctx->element_count, config->data); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { fwk_trap(); + } - if (ctx->element_count > 0) + if (ctx->element_count > 0) { fwk_module_init_elements(ctx); + } if (desc->post_init != NULL) { status = desc->post_init(ctx->id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { fwk_trap(); + } } ctx->state = FWK_MODULE_STATE_INITIALIZED; @@ -257,8 +273,9 @@ static void fwk_module_init_module(struct fwk_module_ctx *ctx) static void fwk_module_init_modules(void) { - for (unsigned int i = 0U; i < (unsigned int)FWK_MODULE_IDX_COUNT; i++) + for (unsigned int i = 0U; i < (unsigned int)FWK_MODULE_IDX_COUNT; i++) { fwk_module_init_module(&fwk_module_ctx.module_ctx_table[i]); + } } static int fwk_module_bind_elements( @@ -310,8 +327,9 @@ static int fwk_module_bind_module( return status; } - if (round == FWK_MODULE_BIND_ROUND_MAX) + if (round == FWK_MODULE_BIND_ROUND_MAX) { module_ctx->state = FWK_MODULE_STATE_BOUND; + } return fwk_module_bind_elements(module_ctx, round); } @@ -325,8 +343,9 @@ static int fwk_module_bind_modules(unsigned int round) for (module_idx = 0; module_idx < FWK_MODULE_IDX_COUNT; module_idx++) { module_ctx = &fwk_module_ctx.module_ctx_table[module_idx]; status = fwk_module_bind_module(module_ctx, round); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -387,8 +406,9 @@ static int start_modules(void) for (module_idx = 0; module_idx < FWK_MODULE_IDX_COUNT; module_idx++) { module_ctx = &fwk_module_ctx.module_ctx_table[module_idx]; status = fwk_module_start_module(module_ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -407,8 +427,9 @@ int fwk_module_start(void) CLI_DEBUGGER(); status = __fwk_thread_init(FWK_MODULE_EVENT_COUNT); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } fwk_module_ctx.stage = MODULE_STAGE_INITIALIZE; fwk_module_init_modules(); @@ -417,14 +438,16 @@ int fwk_module_start(void) for (bind_round = 0; bind_round <= FWK_MODULE_BIND_ROUND_MAX; bind_round++) { status = fwk_module_bind_modules(bind_round); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } fwk_module_ctx.stage = MODULE_STAGE_START; status = start_modules(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } fwk_module_ctx.initialized = true; @@ -449,17 +472,19 @@ struct fwk_element_ctx *fwk_module_get_element_ctx(fwk_id_t element_id) int fwk_module_get_state(fwk_id_t id, enum fwk_module_state *state) { - if (state == NULL) + if (state == NULL) { return FWK_E_PARAM; + } if (fwk_module_is_valid_element_id(id) || - fwk_module_is_valid_sub_element_id(id)) + fwk_module_is_valid_sub_element_id(id)) { *state = fwk_module_get_element_ctx(id)->state; - else { - if (fwk_module_is_valid_module_id(id)) + } else { + if (fwk_module_is_valid_module_id(id)) { *state = fwk_module_get_ctx(id)->state; - else + } else { return FWK_E_PARAM; + } } return FWK_SUCCESS; @@ -472,11 +497,13 @@ void fwk_module_reset(void) bool fwk_module_is_valid_module_id(fwk_id_t id) { - if (!fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return false; + } - if (fwk_id_get_module_idx(id) >= FWK_MODULE_IDX_COUNT) + if (fwk_id_get_module_idx(id) >= FWK_MODULE_IDX_COUNT) { return false; + } return true; } @@ -485,12 +512,14 @@ bool fwk_module_is_valid_element_id(fwk_id_t id) { unsigned int module_idx; - if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return false; + } module_idx = fwk_id_get_module_idx(id); - if (module_idx >= FWK_MODULE_IDX_COUNT) + if (module_idx >= FWK_MODULE_IDX_COUNT) { return false; + } return ( fwk_id_get_element_idx(id) < @@ -503,17 +532,20 @@ bool fwk_module_is_valid_sub_element_id(fwk_id_t id) struct fwk_module_ctx *module_ctx; unsigned int element_idx; - if (!fwk_id_is_type(id, FWK_ID_TYPE_SUB_ELEMENT)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_SUB_ELEMENT)) { return false; + } module_idx = fwk_id_get_module_idx(id); - if (module_idx >= FWK_MODULE_IDX_COUNT) + if (module_idx >= FWK_MODULE_IDX_COUNT) { return false; + } module_ctx = &fwk_module_ctx.module_ctx_table[module_idx]; element_idx = fwk_id_get_element_idx(id); - if (element_idx >= module_ctx->element_count) + if (element_idx >= module_ctx->element_count) { return false; + } return (fwk_id_get_sub_element_idx(id) < module_ctx->element_ctx_table[element_idx].sub_element_count); @@ -542,12 +574,14 @@ bool fwk_module_is_valid_api_id(fwk_id_t id) { unsigned int module_idx; - if (!fwk_id_is_type(id, FWK_ID_TYPE_API)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_API)) { return false; + } module_idx = fwk_id_get_module_idx(id); - if (module_idx >= FWK_MODULE_IDX_COUNT) + if (module_idx >= FWK_MODULE_IDX_COUNT) { return false; + } return ( fwk_id_get_api_idx(id) < @@ -558,12 +592,14 @@ bool fwk_module_is_valid_event_id(fwk_id_t id) { unsigned int module_idx; - if (!fwk_id_is_type(id, FWK_ID_TYPE_EVENT)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_EVENT)) { return false; + } module_idx = fwk_id_get_module_idx(id); - if (module_idx >= FWK_MODULE_IDX_COUNT) + if (module_idx >= FWK_MODULE_IDX_COUNT) { return false; + } return ( fwk_id_get_event_idx(id) < @@ -575,12 +611,14 @@ bool fwk_module_is_valid_notification_id(fwk_id_t id) #ifdef BUILD_HAS_NOTIFICATION unsigned int module_idx; - if (!fwk_id_is_type(id, FWK_ID_TYPE_NOTIFICATION)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_NOTIFICATION)) { return false; + } module_idx = fwk_id_get_module_idx(id); - if (module_idx >= FWK_MODULE_IDX_COUNT) + if (module_idx >= FWK_MODULE_IDX_COUNT) { return false; + } return ( fwk_id_get_notification_idx(id) < @@ -592,26 +630,29 @@ bool fwk_module_is_valid_notification_id(fwk_id_t id) int fwk_module_get_element_count(fwk_id_t id) { - if (fwk_module_is_valid_module_id(id)) + if (fwk_module_is_valid_module_id(id)) { return fwk_module_get_ctx(id)->element_count; - else + } else { return FWK_E_PARAM; + } } int fwk_module_get_sub_element_count(fwk_id_t element_id) { - if (fwk_module_is_valid_element_id(element_id)) + if (fwk_module_is_valid_element_id(element_id)) { return fwk_module_get_element_ctx(element_id)->sub_element_count; - else + } else { return FWK_E_PARAM; + } } const char *fwk_module_get_name(fwk_id_t id) { - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { return fwk_module_get_element_ctx(id)->desc->name; - else if (fwk_module_is_valid_module_id(id)) + } else if (fwk_module_is_valid_module_id(id)) { return fwk_module_get_ctx(id)->desc->name; + } return NULL; } @@ -619,10 +660,11 @@ const char *fwk_module_get_name(fwk_id_t id) const void *fwk_module_get_data(fwk_id_t id) { if (fwk_module_is_valid_element_id(id) || - fwk_module_is_valid_sub_element_id(id)) + fwk_module_is_valid_sub_element_id(id)) { return fwk_module_get_element_ctx(id)->desc->data; - else if (fwk_module_is_valid_module_id(id)) + } else if (fwk_module_is_valid_module_id(id)) { return fwk_module_get_ctx(id)->config->data; + } return NULL; } @@ -632,18 +674,21 @@ int fwk_module_bind(fwk_id_t target_id, fwk_id_t api_id, const void *api) int status = FWK_E_PARAM; struct fwk_module_ctx *module_ctx; - if (!fwk_module_is_valid_entity_id(target_id)) + if (!fwk_module_is_valid_entity_id(target_id)) { goto error; + } - if (!fwk_module_is_valid_api_id(api_id)) + if (!fwk_module_is_valid_api_id(api_id)) { goto error; + } - if (fwk_id_get_module_idx(target_id) != - fwk_id_get_module_idx(api_id)) + if (fwk_id_get_module_idx(target_id) != fwk_id_get_module_idx(api_id)) { goto error; + } - if (api == NULL) + if (api == NULL) { goto error; + } module_ctx = fwk_module_get_ctx(target_id); @@ -678,13 +723,15 @@ int fwk_module_adapter(const struct fwk_io_adapter **adapter, fwk_id_t id) { unsigned int idx; - if (adapter == NULL) + if (adapter == NULL) { return FWK_E_PARAM; + } *adapter = NULL; - if (!fwk_module_is_valid_entity_id(id)) + if (!fwk_module_is_valid_entity_id(id)) { return FWK_E_PARAM; + } idx = fwk_id_get_module_idx(id); diff --git a/framework/src/fwk_multi_thread.c b/framework/src/fwk_multi_thread.c index 3b3fd756328e8102f469834425e65fa7610f88a9..26c5a7e255679529a2a0d1835fbb6a4ad4fd255f 100644 --- a/framework/src/fwk_multi_thread.c +++ b/framework/src/fwk_multi_thread.c @@ -88,14 +88,14 @@ static struct fwk_event *duplicate_event(struct fwk_event *event) fwk_assert(event != NULL); fwk_interrupt_global_disable(); - allocated_event = FWK_LIST_GET(fwk_list_pop_head(&ctx.event_free_queue), - struct fwk_event, slist_node); + allocated_event = FWK_LIST_GET( + fwk_list_pop_head(&ctx.event_free_queue), struct fwk_event, slist_node); fwk_interrupt_global_enable(); if (allocated_event != NULL) { *allocated_event = *event; - allocated_event->slist_node = (struct fwk_slist_node) { 0 }; + allocated_event->slist_node = (struct fwk_slist_node){ 0 }; return allocated_event; } @@ -119,10 +119,11 @@ static struct __fwk_thread_ctx *thread_get_ctx(fwk_id_t id) if (fwk_module_is_valid_element_id(id)) { element_ctx = fwk_module_get_element_ctx(id); - if (element_ctx->thread_ctx != NULL) + if (element_ctx->thread_ctx != NULL) { return element_ctx->thread_ctx; - else + } else { id = FWK_ID_MODULE(id.element.module_idx); + } } if (fwk_module_is_valid_module_id(id)) { @@ -151,8 +152,9 @@ static int put_isr_event(struct fwk_event *event) uint32_t flags; allocated_event = duplicate_event(event); - if (allocated_event == NULL) + if (allocated_event == NULL) { return FWK_E_NOMEM; + } /* * Assumption: there are no interrupt priorities, at least among interrupts @@ -190,11 +192,13 @@ static int put_isr_event(struct fwk_event *event) static bool is_thread_wakeup_event(struct __fwk_thread_ctx *thread_ctx, struct fwk_event *event) { - if (!thread_ctx->waiting_event_processing_completion) + if (!thread_ctx->waiting_event_processing_completion) { return false; + } - if (!event->is_response) + if (!event->is_response) { return false; + } return thread_ctx->response_event->cookie == event->cookie; } @@ -226,8 +230,9 @@ static int put_event(struct __fwk_thread_ctx *target_thread_ctx, if (event->is_delayed_response) { allocated_event = __fwk_thread_search_delayed_response( event->source_id, event->cookie); - if (allocated_event == NULL) + if (allocated_event == NULL) { goto error; + } fwk_list_remove( __fwk_thread_get_delayed_response_list(event->source_id), @@ -238,8 +243,9 @@ static int put_event(struct __fwk_thread_ctx *target_thread_ctx, allocated_event->is_thread_wakeup_event = event->is_thread_wakeup_event; } else { allocated_event = duplicate_event(event); - if (allocated_event == NULL) + if (allocated_event == NULL) { return FWK_E_NOMEM; + } } allocated_event->cookie = event->cookie = ctx.event_cookie_counter++; @@ -254,11 +260,11 @@ static int put_event(struct __fwk_thread_ctx *target_thread_ctx, fwk_list_push_tail(&target_thread_ctx->event_queue, &allocated_event->slist_node); - if (is_empty && - (target_thread_ctx != ctx.current_thread_ctx) && - (!(target_thread_ctx->waiting_event_processing_completion))) - fwk_list_push_tail(&ctx.thread_ready_queue, - &target_thread_ctx->slist_node); + if (is_empty && (target_thread_ctx != ctx.current_thread_ctx) && + (!(target_thread_ctx->waiting_event_processing_completion))) { + fwk_list_push_tail( + &ctx.thread_ready_queue, &target_thread_ctx->slist_node); + } } #if FWK_LOG_LEVEL <= FWK_LOG_LEVEL_TRACE FWK_LOG_TRACE( @@ -294,8 +300,8 @@ static void process_event_requiring_response(struct fwk_event *event) module = fwk_module_get_ctx(event->target_id)->desc; source_thread_ctx = thread_get_ctx(event->source_id); - process_event = event->is_notification ? - module->process_notification : module->process_event; + process_event = event->is_notification ? module->process_notification : + module->process_event; resp_event = *event; resp_event.source_id = event->target_id; @@ -303,14 +309,15 @@ static void process_event_requiring_response(struct fwk_event *event) resp_event.is_delayed_response = false; status = process_event(event, &resp_event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { FWK_LOG_CRIT(err_msg_line, status, __LINE__); + } resp_event.is_response = true; resp_event.response_requested = false; - if (!resp_event.is_delayed_response) + if (!resp_event.is_delayed_response) { put_event(source_thread_ctx, &resp_event); - else { + } else { allocated_event = duplicate_event(&resp_event); if (allocated_event != NULL) { fwk_list_push_tail( @@ -354,14 +361,15 @@ static void process_next_thread_event(struct __fwk_thread_ctx *thread_ctx) FWK_ID_STR(event->target_id)); #endif - if (event->response_requested) + if (event->response_requested) { process_event_requiring_response(event); - else { + } else { module = fwk_module_get_ctx(event->target_id)->desc; - if (event->is_notification) + if (event->is_notification) { status = module->process_notification(event, &async_resp_event); - else + } else { status = module->process_event(event, &async_resp_event); + } if (status != FWK_SUCCESS) { FWK_LOG_ERR( "[FWK] %s%s%s error: %s %s -> %s", @@ -380,8 +388,9 @@ static void process_next_thread_event(struct __fwk_thread_ctx *thread_ctx) free_event(event); - if (!fwk_list_is_empty(&thread_ctx->event_queue)) + if (!fwk_list_is_empty(&thread_ctx->event_queue)) { fwk_list_push_tail(&ctx.thread_ready_queue, &thread_ctx->slist_node); + } } /* @@ -409,8 +418,9 @@ static struct __fwk_thread_ctx *launch_next_event_processing( fwk_list_pop_head(&ctx.thread_ready_queue), struct __fwk_thread_ctx, slist_node); - if (next_thread_ctx == current_thread_ctx) + if (next_thread_ctx == current_thread_ctx) { return current_thread_ctx; + } event = FWK_LIST_GET(fwk_list_head(&next_thread_ctx->event_queue), struct fwk_event, slist_node); @@ -429,8 +439,9 @@ static struct __fwk_thread_ctx *launch_next_event_processing( } else { flags = osThreadFlagsSet(next_thread_ctx->os_thread_id, SIGNAL_EVENT_TO_PROCESS); - if ((int32_t)flags >= 0) + if ((int32_t)flags >= 0) { return next_thread_ctx; + } } FWK_LOG_CRIT(err_msg_line, FWK_E_OS, __LINE__); @@ -470,8 +481,9 @@ int execute_signal_handler(fwk_id_t target_id, fwk_id_t signal_id) int status; module = fwk_module_get_ctx(target_id)->desc; - if (!module->process_signal) + if (!module->process_signal) { return FWK_E_PARAM; + } status = module->process_signal(target_id, signal_id); if ((status != FWK_SUCCESS) && (status != FWK_PENDING)) { FWK_LOG_CRIT( @@ -504,16 +516,18 @@ void process_thread_signals(struct __fwk_thread_ctx *thread_ctx) execute_signal_handler(signal.target_id, signal.signal_id); target_ctx = thread_get_ctx(signal.target_id); - if (!fwk_list_is_empty(&target_ctx->event_queue)) + if (!fwk_list_is_empty(&target_ctx->event_queue)) { osThreadFlagsSet( target_ctx->os_thread_id, SIGNAL_EVENT_TO_PROCESS); + } fwk_interrupt_global_disable(); signal_ctx->pending_signals--; signal_ctx->signals[i].target_id = FWK_ID_NONE; fwk_interrupt_global_enable(); - if (signal_ctx->pending_signals == 0) + if (signal_ctx->pending_signals == 0) { break; + } } } ctx.current_signal = NULL; @@ -559,11 +573,12 @@ static void thread_function(struct __fwk_thread_ctx *thread_ctx, FWK_LOG_CRIT(err_msg_line, FWK_E_OS, __LINE__); continue; } - if (flags & SIGNAL_NO_READY_THREAD) + if (flags & SIGNAL_NO_READY_THREAD) { return; + } } - /* Process the first event of the thread event queue */ + /* Process the first event of the thread event queue */ next_thread_ctx = NULL; process_next_thread_event(thread_ctx); next_thread_ctx = launch_next_event_processing(thread_ctx); @@ -576,8 +591,9 @@ static void thread_function(struct __fwk_thread_ctx *thread_ctx, * (next_thread_ctx != thread_ctx), the present thread has successfully * signalled it to the other thread, loop to wait for a wake-up signal. */ - if (next_thread_ctx != NULL) + if (next_thread_ctx != NULL) { continue; + } /* * No event to process for the time being. If the current thread is the @@ -585,17 +601,20 @@ static void thread_function(struct __fwk_thread_ctx *thread_ctx, * next ISR event. Otherwise, signal the common thread with a * SIGNAL_NO_READY_THREAD signal that it has to get the next ISR event. */ - if (thread_ctx == &ctx.common_thread_ctx) + if (thread_ctx == &ctx.common_thread_ctx) { return; + } flags = osThreadFlagsSet( ctx.common_thread_ctx.os_thread_id, SIGNAL_NO_READY_THREAD); - if ((int32_t)flags < 0) + if ((int32_t)flags < 0) { FWK_LOG_CRIT(err_msg_line, FWK_E_OS, __LINE__); + } /* Let the logging thread know we might have messages to process */ flags = osThreadFlagsSet(ctx.log_thread_id, SIGNAL_CHECK_LOGS); - if ((int32_t)flags < 0) + if ((int32_t)flags < 0) { FWK_LOG_CRIT(err_msg_line, FWK_E_OS, __LINE__); + } } } @@ -620,8 +639,9 @@ static void get_next_isr_event(void) fwk_interrupt_global_enable(); flags = osThreadFlagsWait( SIGNAL_ISR_EVENT, osFlagsWaitAll, osWaitForever); - if (flags != SIGNAL_ISR_EVENT) + if (flags != SIGNAL_ISR_EVENT) { FWK_LOG_CRIT(err_msg_line, FWK_E_OS, __LINE__); + } continue; } @@ -645,17 +665,17 @@ static void get_next_isr_event(void) isr_event->cookie = ctx.event_cookie_counter++; if (isr_event->is_thread_wakeup_event) { - fwk_list_push_head(&target_thread_ctx->event_queue, - &isr_event->slist_node); + fwk_list_push_head( + &target_thread_ctx->event_queue, &isr_event->slist_node); } else { - fwk_list_push_tail(&target_thread_ctx->event_queue, - &isr_event->slist_node); + fwk_list_push_tail( + &target_thread_ctx->event_queue, &isr_event->slist_node); } if (!(target_thread_ctx->waiting_event_processing_completion) || isr_event->is_thread_wakeup_event) { - fwk_list_push_head(&ctx.thread_ready_queue, - &target_thread_ctx->slist_node); + fwk_list_push_head( + &ctx.thread_ready_queue, &target_thread_ctx->slist_node); break; } } @@ -670,8 +690,9 @@ static void common_thread_function(void *arg) for (;;) { next_thread_ctx = launch_next_event_processing(&ctx.common_thread_ctx); - if (next_thread_ctx != NULL) + if (next_thread_ctx != NULL) { thread_function(&ctx.common_thread_ctx, next_thread_ctx); + } get_next_isr_event(); } @@ -696,10 +717,11 @@ static void logging_thread(void *arg) */ status = fwk_log_unbuffer(); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { osThreadFlagsClear(SIGNAL_CHECK_LOGS); - else if (status != FWK_PENDING) + } else if (status != FWK_PENDING) { FWK_LOG_WARN("[FWK] Warning: unable to unbuffer logged message"); + } } } @@ -731,9 +753,10 @@ int __fwk_thread_init(size_t event_count) fwk_list_init(&(ctx.event_isr_queue)); fwk_list_init(&(ctx.common_thread_ctx.event_queue)); for (event = event_table, event_table_end = event_table + event_count; - event < event_table_end; event++) - fwk_list_push_tail(&ctx.event_free_queue, - &event->slist_node); + event < event_table_end; + event++) { + fwk_list_push_tail(&ctx.event_free_queue, &event->slist_node); + } ctx.common_thread_ctx.os_thread_id = osThreadNew(common_thread_function, &ctx.common_thread_ctx, &thread_attr); @@ -781,15 +804,16 @@ error: struct __fwk_multi_thread_ctx *__fwk_multi_thread_get_ctx(void) { - return &ctx; + return &ctx; } noreturn void __fwk_thread_run(void) { osKernelStart(); - while (true) + while (true) { continue; + } } const struct fwk_event *__fwk_thread_get_current_event(void) @@ -807,8 +831,9 @@ int __fwk_thread_put_notification(struct fwk_event *event) event->is_delayed_response = false; /* Call from a thread */ - if (fwk_interrupt_get_current(&interrupt) != FWK_SUCCESS) + if (fwk_interrupt_get_current(&interrupt) != FWK_SUCCESS) { return put_event(thread_get_ctx(event->target_id), event); + } /* Call from an ISR */ if (!fwk_module_is_valid_entity_id(event->source_id)) { @@ -837,11 +862,11 @@ int fwk_thread_create(fwk_id_t id) goto error; } - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { p_thread_ctx = &fwk_module_get_element_ctx(id)->thread_ctx; - else if (fwk_module_is_valid_module_id(id)) + } else if (fwk_module_is_valid_module_id(id)) { p_thread_ctx = &fwk_module_get_ctx(id)->thread_ctx; - else { + } else { status = FWK_E_PARAM; goto error; } @@ -859,8 +884,8 @@ int fwk_thread_create(fwk_id_t id) fwk_list_init(&thread_ctx->event_queue); thread_ctx->id = id; - thread_ctx->os_thread_id = osThreadNew(specific_thread_function, thread_ctx, - &thread_attr); + thread_ctx->os_thread_id = + osThreadNew(specific_thread_function, thread_ctx, &thread_attr); if (thread_ctx->os_thread_id == NULL) { status = FWK_E_OS; @@ -888,43 +913,54 @@ int fwk_thread_put_event(struct fwk_event *event) goto error; } - if (event == NULL) + if (event == NULL) { goto error; + } thread_ctx = thread_get_ctx(event->target_id); - if (thread_ctx == NULL) + if (thread_ctx == NULL) { goto error; + } thread_interrupt_status = fwk_interrupt_get_current(&interrupt); - if ((thread_interrupt_status != FWK_SUCCESS) && (ctx.current_event != NULL)) + if ((thread_interrupt_status != FWK_SUCCESS) && + (ctx.current_event != NULL)) { event->source_id = ctx.current_event->target_id; - else { - if (!fwk_module_is_valid_entity_id(event->source_id)) + } else { + if (!fwk_module_is_valid_entity_id(event->source_id)) { goto error; + } } #ifdef BUILD_MODE_DEBUG if (event->is_notification) { - if (!fwk_module_is_valid_notification_id(event->id)) + if (!fwk_module_is_valid_notification_id(event->id)) { goto error; - if ((!event->is_response) || (event->response_requested)) + } + if ((!event->is_response) || (event->response_requested)) { goto error; + } if (fwk_id_get_module_idx(event->target_id) != - fwk_id_get_module_idx(event->id)) - goto error; + fwk_id_get_module_idx(event->id)) { + goto error; + } } else { - if (!fwk_module_is_valid_event_id(event->id)) + if (!fwk_module_is_valid_event_id(event->id)) { goto error; + } if (event->is_response) { if (fwk_id_get_module_idx(event->source_id) != - fwk_id_get_module_idx(event->id)) + fwk_id_get_module_idx(event->id)) { goto error; - if (event->response_requested) + } + if (event->response_requested) { goto error; + } } else { if (fwk_id_get_module_idx(event->target_id) != - fwk_id_get_module_idx(event->id)) + fwk_id_get_module_idx(event->id)) { goto error; + } } } #endif @@ -958,15 +994,18 @@ int fwk_thread_put_event_and_wait(struct fwk_event *event, goto error; } - if ((event == NULL) || (resp_event == NULL)) + if ((event == NULL) || (resp_event == NULL)) { goto error; + } target_thread_ctx = thread_get_ctx(event->target_id); - if (target_thread_ctx == NULL) + if (target_thread_ctx == NULL) { goto error; + } - if (!fwk_module_is_valid_event_id(event->id)) + if (!fwk_module_is_valid_event_id(event->id)) { goto error; + } if ((fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) || (ctx.current_thread_ctx == &ctx.common_thread_ctx) || @@ -975,22 +1014,24 @@ int fwk_thread_put_event_and_wait(struct fwk_event *event, goto error; } - if (ctx.current_event != NULL) + if (ctx.current_event != NULL) { event->source_id = ctx.current_event->target_id; - else if (ctx.current_signal != NULL) + } else if (ctx.current_signal != NULL) { event->source_id = ctx.current_signal->source_id; - else if ( + } else if ( (!fwk_id_type_is_valid(event->source_id)) || - (!fwk_module_is_valid_entity_id(event->source_id))) + (!fwk_module_is_valid_entity_id(event->source_id))) { goto error; + } event->is_response = false; event->is_delayed_response = false; event->response_requested = true; event->is_notification = false; status = put_event(target_thread_ctx, event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } resp_event->cookie = event->cookie; ctx.current_thread_ctx->response_event = resp_event; @@ -1006,8 +1047,8 @@ int fwk_thread_put_event_and_wait(struct fwk_event *event, launch_next_event_processing(ctx.current_thread_ctx); /* Wait the completion of 'processed_event' */ - flags = osThreadFlagsWait(SIGNAL_EVENT_PROCESSED, - osFlagsWaitAll, osWaitForever); + flags = osThreadFlagsWait( + SIGNAL_EVENT_PROCESSED, osFlagsWaitAll, osWaitForever); calling_thread_ctx->response_event = NULL; calling_thread_ctx->waiting_event_processing_completion = false; @@ -1037,8 +1078,9 @@ int fwk_thread_put_signal( int signal_idx; uint32_t flags; - if (!ctx.running) + if (!ctx.running) { return FWK_E_SUPPORT; + } signal_ctx = &ctx.fwk_signal_ctx; diff --git a/framework/src/fwk_notification.c b/framework/src/fwk_notification.c index b1389879fc5110daa6e1abcdf23ab2082615bd21..0d025944a7d9c53bee1346af83df6d5ffc8e6bb6 100644 --- a/framework/src/fwk_notification.c +++ b/framework/src/fwk_notification.c @@ -97,8 +97,9 @@ static struct __fwk_notification_subscription *search_subscription( struct __fwk_notification_subscription, dlist_node); if (fwk_id_is_equal(subscription->source_id, source_id) && - fwk_id_is_equal(subscription->target_id, target_id)) + fwk_id_is_equal(subscription->target_id, target_id)) { return subscription; + } } return NULL; @@ -131,15 +132,17 @@ static void send_notifications(struct fwk_event *notification_event, subscription = FWK_LIST_GET(node, struct __fwk_notification_subscription, dlist_node); - if (!fwk_id_is_equal(subscription->source_id, - notification_event->source_id)) + if (!fwk_id_is_equal( + subscription->source_id, notification_event->source_id)) { continue; + } notification_event->target_id = subscription->target_id; status = __fwk_thread_put_notification(notification_event); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { (*count)++; + } } } @@ -273,8 +276,9 @@ int fwk_notification_notify(struct fwk_event *notification_event, unsigned int interrupt; const struct fwk_event *current_event; - if ((notification_event == NULL) || (count == NULL)) + if ((notification_event == NULL) || (count == NULL)) { return FWK_E_PARAM; + } if (fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) { if (!fwk_module_is_valid_entity_id(notification_event->source_id)) { diff --git a/framework/src/fwk_ring.c b/framework/src/fwk_ring.c index 210354d4d6b6743b1ff0fcaf32df053113242226..6a4f4cc6d4cf5cfe6c07819276be15655a50dfbc 100644 --- a/framework/src/fwk_ring.c +++ b/framework/src/fwk_ring.c @@ -43,10 +43,11 @@ size_t fwk_ring_get_length(const struct fwk_ring *ring) { fwk_assert(ring != NULL); - if ((ring->tail >= ring->head) && !ring->full) + if ((ring->tail >= ring->head) && !ring->full) { return (ring->tail - ring->head); - else + } else { return ((ring->capacity - ring->head) + ring->tail); + } } size_t fwk_ring_get_free(const struct fwk_ring *ring) @@ -96,12 +97,13 @@ size_t fwk_ring_peek( fwk_assert(buffer != NULL); buffer_size = FWK_MIN(buffer_size, fwk_ring_get_length(ring)); - if (buffer_size == 0) + if (buffer_size == 0) { return buffer_size; + } - if (fwk_ring_offset(ring, ring->head + buffer_size) > ring->head) + if (fwk_ring_offset(ring, ring->head + buffer_size) > ring->head) { memcpy(buffer, ring->storage + ring->head, buffer_size); - else { + } else { size_t chunk_size = ring->capacity - ring->head; memcpy(buffer, ring->storage + ring->head, chunk_size); @@ -121,8 +123,9 @@ size_t fwk_ring_push( fwk_assert(ring != NULL); fwk_assert(buffer != NULL); - if (buffer_size == 0) + if (buffer_size == 0) { return buffer_size; + } if (buffer_size > ring->capacity) { /* @@ -136,9 +139,9 @@ size_t fwk_ring_push( remaining = fwk_ring_get_free(ring); - if (fwk_ring_offset(ring, ring->tail + buffer_size) > ring->tail) + if (fwk_ring_offset(ring, ring->tail + buffer_size) > ring->tail) { memcpy(ring->storage + ring->tail, buffer, buffer_size); - else { + } else { size_t chunk_size = ring->capacity - ring->tail; memcpy(ring->storage + ring->tail, buffer, chunk_size); diff --git a/framework/src/fwk_slist.c b/framework/src/fwk_slist.c index 05eca7ab945aa79c4f141f0ae5bc74437f34bc05..b4f410065b50bb1451fcf9a216c086abf322f588 100644 --- a/framework/src/fwk_slist.c +++ b/framework/src/fwk_slist.c @@ -27,8 +27,9 @@ struct fwk_slist_node *__fwk_slist_head(const struct fwk_slist *list) { fwk_assert(list != NULL); - if (__fwk_slist_is_empty(list)) + if (__fwk_slist_is_empty(list)) { return NULL; + } return list->head; } @@ -41,8 +42,9 @@ bool __fwk_slist_is_empty(const struct fwk_slist *list) is_empty = list->head == (struct fwk_slist_node *)list; - if (is_empty) + if (is_empty) { fwk_assert(list->tail == list->head); + } return is_empty; } @@ -58,8 +60,9 @@ void __fwk_slist_push_head( new->next = list->head; list->head = new; - if (list->tail == (struct fwk_slist_node *)list) + if (list->tail == (struct fwk_slist_node *)list) { list->tail = new; + } } void __fwk_slist_push_tail( @@ -82,12 +85,14 @@ struct fwk_slist_node *__fwk_slist_pop_head(struct fwk_slist *list) fwk_assert(list != NULL); - if (__fwk_slist_is_empty(list)) + if (__fwk_slist_is_empty(list)) { return NULL; + } popped = list->head; - if (popped->next == (struct fwk_slist_node *)list) + if (popped->next == (struct fwk_slist_node *)list) { list->tail = (struct fwk_slist_node *)list; + } list->head = popped->next; @@ -122,8 +127,9 @@ void __fwk_slist_remove( if (node_iter->next == node) { node_iter->next = node->next; - if (node->next == (struct fwk_slist_node *)list) + if (node->next == (struct fwk_slist_node *)list) { list->tail = (struct fwk_slist_node *)node_iter; + } node->next = NULL; @@ -148,8 +154,9 @@ bool __fwk_slist_contains( node_iter = (struct fwk_slist_node *)list; while (node_iter->next != (struct fwk_slist_node *)list) { - if (node_iter->next == node) + if (node_iter->next == node) { return true; + } node_iter = node_iter->next; } diff --git a/framework/src/fwk_status.c b/framework/src/fwk_status.c index 35b1c7c9ab8cc35ea8b815b6c1b93d4bdead31a1..4531e6bf45d9ac7bd93f815a15d1990288904bc8 100644 --- a/framework/src/fwk_status.c +++ b/framework/src/fwk_status.c @@ -43,10 +43,11 @@ const char *fwk_status_str(int status) unsigned int error_idx = (unsigned int)(-status); - if ((status < 0) && (error_idx < FWK_ARRAY_SIZE(error_string))) + if ((status < 0) && (error_idx < FWK_ARRAY_SIZE(error_string))) { return error_string[error_idx]; - else if ((status >= 0) && (status < (int)FWK_ARRAY_SIZE(status_string))) + } else if ((status >= 0) && (status < (int)FWK_ARRAY_SIZE(status_string))) { return status_string[status]; + } return unknown; } diff --git a/framework/src/fwk_thread.c b/framework/src/fwk_thread.c index 1d8e6c3888b6b8e24c71087121326f30ee93f546..7612c079a7a4133271c2bc40d96f47dd071b4022 100644 --- a/framework/src/fwk_thread.c +++ b/framework/src/fwk_thread.c @@ -119,30 +119,35 @@ static int put_event( /* Is this the event put_event_and_wait is waiting for ? */ if (ctx.waiting_event_processing_completion && - (ctx.cookie == event->cookie)) + (ctx.cookie == event->cookie)) { is_wakeup_event = true; + } } else { allocated_event = duplicate_event(event); - if (allocated_event == NULL) + if (allocated_event == NULL) { return FWK_E_NOMEM; + } } allocated_event->cookie = event->cookie = ctx.event_cookie_counter++; - if (is_wakeup_event) + if (is_wakeup_event) { ctx.cookie = event->cookie; + } if (intr_state == UNKNOWN_THREAD) { status = fwk_interrupt_get_current(&interrupt); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { intr_state = NOT_INTERRUPT_THREAD; - else + } else { intr_state = INTERRUPT_THREAD; + } } - if (intr_state == NOT_INTERRUPT_THREAD) + if (intr_state == NOT_INTERRUPT_THREAD) { fwk_list_push_tail(&ctx.event_queue, &allocated_event->slist_node); - else + } else { fwk_list_push_tail(&ctx.isr_event_queue, &allocated_event->slist_node); + } #if FWK_LOG_LEVEL <= FWK_LOG_LEVEL_TRACE FWK_LOG_TRACE( @@ -162,8 +167,9 @@ static int execute_signal_handler(fwk_id_t target_id, fwk_id_t signal_id) int status; module = fwk_module_get_ctx(target_id)->desc; - if (module->process_signal == 0) + if (module->process_signal == 0) { return FWK_E_PARAM; + } status = module->process_signal(target_id, signal_id); if ((status != FWK_SUCCESS) && (status != FWK_PENDING)) { FWK_LOG_CRIT( @@ -254,14 +260,15 @@ static void process_next_event(void) async_response_event.is_delayed_response = false; status = process_event(event, &async_response_event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { FWK_LOG_CRIT(err_msg_line, status, __func__, __LINE__); + } async_response_event.is_response = true; async_response_event.response_requested = false; - if (!async_response_event.is_delayed_response) + if (!async_response_event.is_delayed_response) { put_event(&async_response_event, UNKNOWN_THREAD); - else { + } else { allocated_event = duplicate_event(&async_response_event); if (allocated_event != NULL) { fwk_list_push_tail( @@ -296,8 +303,9 @@ static bool process_isr(void) fwk_list_pop_head(&ctx.isr_event_queue), struct fwk_event, slist_node); fwk_interrupt_global_enable(); - if (isr_event == NULL) + if (isr_event == NULL) { return false; + } #if FWK_LOG_LEVEL <= FWK_LOG_LEVEL_TRACE FWK_LOG_TRACE( @@ -328,8 +336,9 @@ int __fwk_thread_init(size_t event_count) fwk_list_init(&ctx.event_queue); fwk_list_init(&ctx.isr_event_queue); - for (event = event_table; event < (event_table + event_count); event++) + for (event = event_table; event < (event_table + event_count); event++) { fwk_list_push_tail(&ctx.free_event_queue, &event->slist_node); + } for (i = 0; i < FWK_MODULE_SIGNAL_COUNT; i++) { fwk_signal_ctx.signals[i].source_id = FWK_ID_NONE; @@ -353,8 +362,9 @@ noreturn void __fwk_thread_run(void) fwk_process_signal(); } - if (process_isr()) + if (process_isr()) { continue; + } fwk_log_unbuffer(); } @@ -396,19 +406,21 @@ int fwk_thread_put_event(struct fwk_event *event) goto error; } - if (event == NULL) + if (event == NULL) { goto error; + } #endif status = fwk_interrupt_get_current(&interrupt); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { intr_state = NOT_INTERRUPT_THREAD; - else + } else { intr_state = INTERRUPT_THREAD; + } - if ((intr_state == NOT_INTERRUPT_THREAD) && (ctx.current_event != NULL)) + if ((intr_state == NOT_INTERRUPT_THREAD) && (ctx.current_event != NULL)) { event->source_id = ctx.current_event->target_id; - else if ( + } else if ( !fwk_id_type_is_valid(event->source_id) || !fwk_module_is_valid_entity_id(event->source_id)) { if (!fwk_id_is_equal( @@ -423,26 +435,33 @@ int fwk_thread_put_event(struct fwk_event *event) #ifdef BUILD_MODE_DEBUG status = FWK_E_PARAM; if (event->is_notification) { - if (!fwk_module_is_valid_notification_id(event->id)) + if (!fwk_module_is_valid_notification_id(event->id)) { goto error; - if ((!event->is_response) || (event->response_requested)) + } + if ((!event->is_response) || (event->response_requested)) { goto error; + } if (fwk_id_get_module_idx(event->target_id) != - fwk_id_get_module_idx(event->id)) + fwk_id_get_module_idx(event->id)) { goto error; + } } else { - if (!fwk_module_is_valid_event_id(event->id)) + if (!fwk_module_is_valid_event_id(event->id)) { goto error; + } if (event->is_response) { if (fwk_id_get_module_idx(event->source_id) != - fwk_id_get_module_idx(event->id)) + fwk_id_get_module_idx(event->id)) { goto error; - if (event->response_requested) + } + if (event->response_requested) { goto error; + } } else { if (fwk_id_get_module_idx(event->target_id) != - fwk_id_get_module_idx(event->id)) + fwk_id_get_module_idx(event->id)) { goto error; + } } } #endif @@ -474,11 +493,13 @@ int fwk_thread_put_event_and_wait( goto error; } - if ((event == NULL) || (resp_event == NULL)) + if ((event == NULL) || (resp_event == NULL)) { goto error; + } - if (!fwk_module_is_valid_event_id(event->id)) + if (!fwk_module_is_valid_event_id(event->id)) { goto error; + } if (fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) { status = FWK_E_STATE; @@ -486,16 +507,16 @@ int fwk_thread_put_event_and_wait( } #endif - if (ctx.current_event != NULL) + if (ctx.current_event != NULL) { event->source_id = ctx.current_event->target_id; - else if ( + } else if ( !fwk_id_type_is_valid(event->source_id) || !fwk_module_is_valid_entity_id(event->source_id)) { if (fwk_id_type_is_valid(fwk_signal_ctx.current_signal.target_id) && !fwk_id_is_equal( - fwk_signal_ctx.current_signal.target_id, FWK_ID_NONE)) + fwk_signal_ctx.current_signal.target_id, FWK_ID_NONE)) { event->source_id = fwk_signal_ctx.current_signal.source_id; - else { + } else { FWK_LOG_ERR( "[FWK] deprecated put_event_and_wait (%s: %s -> %s)\n", FWK_ID_STR(event->id), @@ -527,8 +548,9 @@ int fwk_thread_put_event_and_wait( event->is_notification = false; status = put_event(event, NOT_INTERRUPT_THREAD); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } ctx.cookie = event->cookie; @@ -567,8 +589,9 @@ int fwk_thread_put_event_and_wait( /* Execute the event handler */ status = process_event(next_event, &response_event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* * The response event goes onto the queue now @@ -579,8 +602,9 @@ int fwk_thread_put_event_and_wait( response_event.response_requested = false; if (!response_event.is_delayed_response) { status = put_event(&response_event, UNKNOWN_THREAD); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } ctx.cookie = response_event.cookie; } else { allocated_event = duplicate_event(&response_event); @@ -625,8 +649,9 @@ int fwk_thread_put_event_and_wait( exit: ctx.current_event = ctx.previous_event; ctx.waiting_event_processing_completion = false; - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { return status; + } error: FWK_LOG_CRIT(err_msg_func, status, __func__); return status; diff --git a/framework/src/fwk_thread_delayed_resp.c b/framework/src/fwk_thread_delayed_resp.c index 27ed189968ba79eda66f860af07be345f43f72d5..84f739e1e00a365ebb52054d462b93ee1ace8ca3 100644 --- a/framework/src/fwk_thread_delayed_resp.c +++ b/framework/src/fwk_thread_delayed_resp.c @@ -28,11 +28,13 @@ static int check_api_call(fwk_id_t id, void *data) { unsigned int interrupt; - if (fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) + if (fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) { return FWK_E_ACCESS; + } - if ((!fwk_module_is_valid_entity_id(id)) || (data == NULL)) + if ((!fwk_module_is_valid_entity_id(id)) || (data == NULL)) { return FWK_E_PARAM; + } return FWK_SUCCESS; } @@ -42,8 +44,9 @@ static int check_api_call(fwk_id_t id, void *data) */ struct fwk_slist *__fwk_thread_get_delayed_response_list(fwk_id_t id) { - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return &fwk_module_get_ctx(id)->delayed_response_list; + } return &fwk_module_get_element_ctx(id)->delayed_response_list; } @@ -63,8 +66,9 @@ struct fwk_event *__fwk_thread_search_delayed_response( delayed_response = FWK_LIST_GET(delayed_response_node, struct fwk_event, slist_node); - if (delayed_response->cookie == cookie) + if (delayed_response->cookie == cookie) { return delayed_response; + } delayed_response_node = fwk_list_next(delayed_response_list, delayed_response_node); @@ -85,8 +89,9 @@ int fwk_thread_get_delayed_response( struct fwk_event *delayed_response; status = check_api_call(id, event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } delayed_response = __fwk_thread_search_delayed_response(id, cookie); if (delayed_response == NULL) { @@ -112,8 +117,9 @@ int fwk_thread_is_delayed_response_list_empty( struct fwk_slist_node *delayed_response_node; status = check_api_call(id, is_empty); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } delayed_response_list = __fwk_thread_get_delayed_response_list(id); delayed_response_node = fwk_list_head(delayed_response_list); @@ -136,8 +142,9 @@ int fwk_thread_get_first_delayed_response( struct fwk_slist_node *delayed_response_node; status = check_api_call(id, event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } delayed_response_list = __fwk_thread_get_delayed_response_list(id); delayed_response_node = fwk_list_head(delayed_response_list); @@ -145,8 +152,9 @@ int fwk_thread_get_first_delayed_response( if (delayed_response_node != NULL) { *event = *(FWK_LIST_GET(delayed_response_node, struct fwk_event, slist_node)); - } else + } else { return FWK_E_STATE; + } return FWK_SUCCESS; diff --git a/framework/src/fwk_time.c b/framework/src/fwk_time.c index c9dc13253b730be718300fa9f44e5238e49ff0ee..b8f7446af80ddce41f64a038c1fc740bfe75e7d4 100644 --- a/framework/src/fwk_time.c +++ b/framework/src/fwk_time.c @@ -26,8 +26,9 @@ FWK_CONSTRUCTOR void fwk_time_init(void) fwk_timestamp_t fwk_time_current(void) { - if (fwk_time_ctx.driver.timestamp == NULL) + if (fwk_time_ctx.driver.timestamp == NULL) { return FWK_NS(0); + } return fwk_time_ctx.driver.timestamp(fwk_time_ctx.driver_ctx); } diff --git a/module/clock/src/mod_clock.c b/module/clock/src/mod_clock.c index 794bc977345c6fa38fd664c5cc8c585855919e4b..b646fbd481366437bb0e8e97c883539af7328b3e 100644 --- a/module/clock/src/mod_clock.c +++ b/module/clock/src/mod_clock.c @@ -77,8 +77,9 @@ static int process_response_event(const struct fwk_event *event) status = fwk_thread_get_delayed_response(event->target_id, ctx->cookie, &resp_event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } resp_params->status = event_params->status; resp_params->value = event_params->value; @@ -115,8 +116,9 @@ static int create_async_request( }; status = fwk_thread_put_event(&request_event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } ctx->is_request_ongoing = true; @@ -160,8 +162,9 @@ void request_complete(fwk_id_t dev_id, if (response != NULL) { event_params->status = response->status; event_params->value = response->value; - } else + } else { event_params->status = FWK_E_PARAM; + } status = fwk_thread_put_event(&event); fwk_assert(status == FWK_SUCCESS); @@ -184,17 +187,19 @@ static int clock_set_rate(fwk_id_t clock_id, uint64_t rate, get_ctx(clock_id, &ctx); /* Concurrency is not supported */ - if (ctx->is_request_ongoing) + if (ctx->is_request_ongoing) { return FWK_E_BUSY; + } status = ctx->api->set_rate(ctx->config->driver_id, rate, round_mode); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return create_async_request( ctx, clock_id, mod_clock_event_id_set_rate_request); - else + } else { return status; + } } static int clock_get_rate(fwk_id_t clock_id, uint64_t *rate) @@ -204,21 +209,24 @@ static int clock_get_rate(fwk_id_t clock_id, uint64_t *rate) get_ctx(clock_id, &ctx); - if (rate == NULL) + if (rate == NULL) { return FWK_E_PARAM; + } /* Concurrency is not supported */ - if (ctx->is_request_ongoing) + if (ctx->is_request_ongoing) { return FWK_E_BUSY; + } status = ctx->api->get_rate(ctx->config->driver_id, rate); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return create_async_request( ctx, clock_id, mod_clock_event_id_get_rate_request); - else + } else { return status; + } } static int clock_get_rate_from_index(fwk_id_t clock_id, unsigned int rate_index, @@ -228,8 +236,9 @@ static int clock_get_rate_from_index(fwk_id_t clock_id, unsigned int rate_index, get_ctx(clock_id, &ctx); - if (rate == NULL) + if (rate == NULL) { return FWK_E_PARAM; + } return ctx->api->get_rate_from_index(ctx->config->driver_id, rate_index, rate); @@ -243,17 +252,19 @@ static int clock_set_state(fwk_id_t clock_id, enum mod_clock_state state) get_ctx(clock_id, &ctx); /* Concurrency is not supported */ - if (ctx->is_request_ongoing) + if (ctx->is_request_ongoing) { return FWK_E_BUSY; + } status = ctx->api->set_state(ctx->config->driver_id, state); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return create_async_request( ctx, clock_id, mod_clock_event_id_set_state_request); - else + } else { return status; + } } static int clock_get_state(fwk_id_t clock_id, enum mod_clock_state *state) @@ -263,21 +274,24 @@ static int clock_get_state(fwk_id_t clock_id, enum mod_clock_state *state) get_ctx(clock_id, &ctx); - if (state == NULL) + if (state == NULL) { return FWK_E_PARAM; + } /* Concurrency is not supported */ - if (ctx->is_request_ongoing) + if (ctx->is_request_ongoing) { return FWK_E_BUSY; + } status = ctx->api->get_state(ctx->config->driver_id, state); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return create_async_request( ctx, clock_id, mod_clock_event_id_get_state_request); - else + } else { return status; + } } static int clock_get_info(fwk_id_t clock_id, struct mod_clock_info *info) @@ -287,12 +301,14 @@ static int clock_get_info(fwk_id_t clock_id, struct mod_clock_info *info) get_ctx(clock_id, &ctx); - if (info == NULL) + if (info == NULL) { return FWK_E_PARAM; + } status = ctx->api->get_range(ctx->config->driver_id, &info->range); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } info->name = fwk_module_get_name(clock_id); @@ -317,11 +333,13 @@ static int clock_init(fwk_id_t module_id, unsigned int element_count, { const struct mod_clock_config *config = data; - if (element_count == 0) + if (element_count == 0) { return FWK_SUCCESS; + } - if (config == NULL) + if (config == NULL) { return FWK_E_PARAM; + } module_ctx.config = config; module_ctx.dev_ctx_table = fwk_mm_calloc(element_count, @@ -345,8 +363,9 @@ static int clock_bind(fwk_id_t id, unsigned int round) { struct clock_dev_ctx *ctx; - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { /* Only element binding is supported */ @@ -366,13 +385,15 @@ static int clock_start(fwk_id_t id) struct clock_dev_ctx *ctx; /* Nothing to be done at the module level */ - if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return FWK_SUCCESS; + } ctx = &module_ctx.dev_ctx_table[fwk_id_get_element_idx(id)]; - if (fwk_id_is_type(ctx->config->pd_source_id, FWK_ID_TYPE_NONE)) - return FWK_SUCCESS; + if (fwk_id_is_type(ctx->config->pd_source_id, FWK_ID_TYPE_NONE)) { + return FWK_SUCCESS; + } if ((ctx->api->process_power_transition != NULL) && (fwk_id_is_type( @@ -382,8 +403,9 @@ static int clock_start(fwk_id_t id) module_ctx.config->pd_transition_notification_id, ctx->config->pd_source_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } if ((ctx->api->process_pending_power_transition != NULL) && @@ -394,8 +416,9 @@ static int clock_start(fwk_id_t id) module_ctx.config->pd_pre_transition_notification_id, ctx->config->pd_source_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -414,15 +437,17 @@ static int clock_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, return FWK_SUCCESS; case MOD_CLOCK_API_TYPE_DRIVER_RESPONSE: - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_PARAM; + } ctx = &module_ctx.dev_ctx_table[fwk_id_get_element_idx(target_id)]; - if (fwk_id_is_equal(source_id, ctx->config->driver_id)) + if (fwk_id_is_equal(source_id, ctx->config->driver_id)) { *api = &clock_driver_response_api; - else + } else { return FWK_E_ACCESS; + } return FWK_SUCCESS; @@ -525,15 +550,17 @@ static int clock_process_pd_transition_notification( status = ctx->api->process_power_transition( ctx->config->driver_id, pd_params->state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Notify subscribers of the clock state change */ out_params = (struct clock_notification_params *)outbound_event.params; - if (pd_params->state == MOD_PD_STATE_ON) + if (pd_params->state == MOD_PD_STATE_ON) { out_params->new_state = MOD_CLOCK_STATE_RUNNING; - else + } else { out_params->new_state = MOD_CLOCK_STATE_STOPPED; + } status = fwk_notification_notify( &outbound_event, &(transition_notifications_sent)); @@ -561,8 +588,9 @@ static int clock_process_notification_response( mod_clock_notification_id_state_change_pending)); /* At least one notification response must be outstanding */ - if (!fwk_expect(ctx->transition_pending_notifications_sent != 0)) + if (!fwk_expect(ctx->transition_pending_notifications_sent != 0)) { return FWK_E_PANIC; + } resp_params = (struct clock_state_change_pending_resp_params *)event->params; @@ -574,8 +602,9 @@ static int clock_process_notification_response( * it to an error status code will veto the power domain state transition * that is pending. */ - if (resp_params->status != FWK_SUCCESS) + if (resp_params->status != FWK_SUCCESS) { ctx->transition_pending_response_status = resp_params->status; + } if ((--(ctx->transition_pending_notifications_sent)) == 0) { /* @@ -598,31 +627,36 @@ static int clock_process_notification( { struct clock_dev_ctx *ctx; - if (!fwk_id_is_type(event->target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(event->target_id, FWK_ID_TYPE_ELEMENT)) { /* Only elements should be registered for notifications */ return FWK_E_PARAM; + } ctx = &module_ctx.dev_ctx_table[fwk_id_get_element_idx(event->target_id)]; - if (event->is_response) + if (event->is_response) { return clock_process_notification_response(ctx, event); + } if (fwk_id_is_equal( - event->id, module_ctx.config->pd_transition_notification_id)) + event->id, module_ctx.config->pd_transition_notification_id)) { return clock_process_pd_transition_notification(ctx, event); - else if (fwk_id_is_equal(event->id, - module_ctx.config->pd_pre_transition_notification_id)) + } else if (fwk_id_is_equal( + event->id, + module_ctx.config->pd_pre_transition_notification_id)) { return clock_process_pd_pre_transition_notification( ctx, event, resp_event); - else + } else { return FWK_E_HANDLER; + } } static int clock_process_event(const struct fwk_event *event, struct fwk_event *resp_event) { - if (!fwk_module_is_valid_element_id(event->target_id)) + if (!fwk_module_is_valid_element_id(event->target_id)) { return FWK_E_PARAM; + } switch (fwk_id_get_event_idx(event->id)) { case MOD_CLOCK_EVENT_IDX_SET_RATE_REQUEST: diff --git a/module/debug/src/mod_debug.c b/module/debug/src/mod_debug.c index cdd415174f9aaecfec229a9a9ee09ac36f6f7517..2864108ef259e1b7c3ba0db277cf027724485c86 100644 --- a/module/debug/src/mod_debug.c +++ b/module/debug/src/mod_debug.c @@ -58,13 +58,15 @@ static int set_enabled(fwk_id_t id, bool enable, enum scp_debug_user user_id) int status; struct mod_debug_request_params *req_params; - if (!fwk_expect(user_id < SCP_DEBUG_USER_COUNT)) + if (!fwk_expect(user_id < SCP_DEBUG_USER_COUNT)) { return FWK_E_PARAM; + } ctx = &ctx_table[fwk_id_get_element_idx(id)]; - if (ctx->state != DEBUG_IDLE) + if (ctx->state != DEBUG_IDLE) { return FWK_E_BUSY; + } user_mask = (1 << user_id); @@ -73,8 +75,9 @@ static int set_enabled(fwk_id_t id, bool enable, enum scp_debug_user user_id) * enabled it. */ if ((enable && (ctx->debug_users_mask & user_mask)) || - (!enable && (!(ctx->debug_users_mask & user_mask)))) + (!enable && (!(ctx->debug_users_mask & user_mask)))) { return FWK_E_ACCESS; + } status = ctx->driver_api->set_enabled(ctx->config->driver_id, enable, user_id); @@ -106,8 +109,9 @@ static int set_enabled(fwk_id_t id, bool enable, enum scp_debug_user user_id) } return status; - } else if (status != FWK_SUCCESS) - return status; + } else if (status != FWK_SUCCESS) { + return status; + } mark_user(id, enable, user_id); @@ -121,13 +125,15 @@ static int get_enabled(fwk_id_t id, bool *enable, enum scp_debug_user user_id) int status; struct mod_debug_request_params *req_params; - if ((enable == NULL) || !fwk_expect(user_id < SCP_DEBUG_USER_COUNT)) + if ((enable == NULL) || !fwk_expect(user_id < SCP_DEBUG_USER_COUNT)) { return FWK_E_PARAM; + } ctx = &ctx_table[fwk_id_get_element_idx(id)]; - if (ctx->state != DEBUG_IDLE) + if (ctx->state != DEBUG_IDLE) { return FWK_E_BUSY; + } status = ctx->driver_api->get_enabled(ctx->config->driver_id, enable, user_id); @@ -227,10 +233,11 @@ static void request_complete(fwk_id_t id, .target_id = id, }; - if (ctx->state == DEBUG_GET) + if (ctx->state == DEBUG_GET) { event.id = mod_debug_event_id_get_complete; - else + } else { event.id = mod_debug_event_id_set_complete; + } resp_params->status = response->status; resp_params->enabled = response->enabled; @@ -255,8 +262,9 @@ static int mod_debug_init( fwk_assert(element_count > 0); ctx_table = fwk_mm_calloc(element_count, sizeof(struct debug_dev_ctx)); - if (ctx_table == NULL) + if (ctx_table == NULL) { return FWK_E_NOMEM; + } return FWK_SUCCESS; } @@ -285,8 +293,9 @@ static int mod_debug_bind(fwk_id_t id, unsigned int round) struct debug_dev_ctx *ctx; struct mod_debug_dev_config *dev_cfg; - if ((round > 0) || fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if ((round > 0) || fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } ctx = &ctx_table[fwk_id_get_element_idx(id)]; dev_cfg = ctx->config; @@ -296,12 +305,15 @@ static int mod_debug_bind(fwk_id_t id, unsigned int round) dev_cfg->driver_id, dev_cfg->driver_api_id, &driver_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Validate driver API */ - if ((driver_api->set_enabled == NULL) || (driver_api->get_enabled == NULL)) + if ((driver_api->set_enabled == NULL) || + (driver_api->get_enabled == NULL)) { return FWK_E_DATA; + } ctx->driver_api = driver_api; @@ -320,8 +332,9 @@ static int mod_debug_process_bind_request( api_idx = fwk_id_get_api_idx(api_id); /* Only binding to elements is allowed */ - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_ACCESS; + } ctx = &ctx_table[fwk_id_get_element_idx(target_id)]; @@ -332,8 +345,9 @@ static int mod_debug_process_bind_request( return FWK_SUCCESS; case MOD_DEBUG_API_IDX_DRIVER_INPUT: - if (fwk_id_is_equal(source_id, ctx->config->driver_id)) + if (fwk_id_is_equal(source_id, ctx->config->driver_id)) { *api = &driver_input_api; + } return FWK_SUCCESS; @@ -357,8 +371,9 @@ static int respond(const struct fwk_event *event) status = fwk_thread_get_delayed_response(event->target_id, ctx->cookie, &response); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } resp_params->status = req_result->status; resp_params->enabled = req_result->enabled; @@ -395,18 +410,21 @@ static int mod_debug_process_event(const struct fwk_event *event, */ status = set_enabled(ctx->config->driver_id, req_params->enable, req_params->user_id); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { break; - if (status != FWK_SUCCESS) + } + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } break; case MOD_DEBUG_EVENT_IDX_SET_COMPLETE: req_result = (struct mod_debug_response_params *)event->params; - if (req_result->status == FWK_SUCCESS) + if (req_result->status == FWK_SUCCESS) { mark_user(event->target_id, req_result->enabled, ctx->requester); + } return respond(event); diff --git a/module/dvfs/src/mod_dvfs.c b/module/dvfs/src/mod_dvfs.c index e9d85521e5c8c4649b830871a5e54b38067cdcc1..e072c7041c8824d3f3a117fb0a8d27625b155a88 100644 --- a/module/dvfs/src/mod_dvfs.c +++ b/module/dvfs/src/mod_dvfs.c @@ -169,18 +169,20 @@ static struct mod_dvfs_domain_ctx *get_domain_ctx(fwk_id_t domain_id) { uint32_t idx = fwk_id_get_element_idx(domain_id); - if (idx < dvfs_ctx.dvfs_domain_element_count) + if (idx < dvfs_ctx.dvfs_domain_element_count) { return &(*dvfs_ctx.domain_ctx)[idx]; - else + } else { return NULL; + } } static int count_opps(const struct mod_dvfs_opp *opps) { const struct mod_dvfs_opp *opp = &opps[0]; - while ((opp->level != 0) && (opp->voltage != 0) && (opp->frequency != 0)) + while ((opp->level != 0) && (opp->voltage != 0) && (opp->frequency != 0)) { opp++; + } return opp - &opps[0]; } @@ -195,15 +197,17 @@ static const struct mod_dvfs_opp *get_opp_for_level( for (opp_idx = 0; opp_idx < ctx->opp_count; opp_idx++) { opp = &ctx->config->opps[opp_idx]; - if (ctx->config->approximate_level && (opp->level < level)) + if (ctx->config->approximate_level && (opp->level < level)) { continue; - else if (opp->level != level) + } else if (opp->level != level) { continue; + } return opp; } - if (ctx->config->approximate_level) + if (ctx->config->approximate_level) { return &ctx->config->opps[ctx->opp_count - 1]; + } return NULL; } @@ -217,8 +221,9 @@ static const struct mod_dvfs_opp *get_opp_for_voltage( for (opp_idx = 0; opp_idx < ctx->opp_count; opp_idx++) { opp = &ctx->config->opps[opp_idx]; - if (opp->voltage != voltage) + if (opp->voltage != voltage) { continue; + } return opp; } @@ -237,14 +242,17 @@ static bool are_limits_valid( const struct mod_dvfs_domain_ctx *ctx, const struct mod_dvfs_level_limits *limits) { - if (limits->minimum > limits->maximum) + if (limits->minimum > limits->maximum) { return false; + } - if (get_opp_for_level(ctx, limits->minimum) == NULL) + if (get_opp_for_level(ctx, limits->minimum) == NULL) { return false; + } - if (get_opp_for_level(ctx, limits->maximum) == NULL) + if (get_opp_for_level(ctx, limits->maximum) == NULL) { return false; + } return true; } @@ -256,11 +264,11 @@ static const struct mod_dvfs_opp *adjust_opp_for_new_limits( { uint32_t needle; - if (opp->level < limits->minimum) + if (opp->level < limits->minimum) { needle = limits->minimum; - else if (opp->level > limits->maximum) + } else if (opp->level > limits->maximum) { needle = limits->maximum; - else { + } else { /* No transition necessary */ return opp; } @@ -284,8 +292,9 @@ static int put_event_request( .response_requested = ctx->request.response_required, }; - if (ctx->request.set_source_id) + if (ctx->request.set_source_id) { req.source_id = ctx->domain_id; + } ctx->state = state; @@ -358,8 +367,9 @@ static int dvfs_handle_pending_request(struct mod_dvfs_domain_ctx *ctx) { int status = FWK_SUCCESS; - if (ctx->state == DVFS_DOMAIN_STATE_RETRY) + if (ctx->state == DVFS_DOMAIN_STATE_RETRY) { return FWK_SUCCESS; + } if (ctx->config->retry_ms > 0) { status = ctx->apis.alarm_api->start( @@ -368,8 +378,9 @@ static int dvfs_handle_pending_request(struct mod_dvfs_domain_ctx *ctx) MOD_TIMER_ALARM_TYPE_ONCE, alarm_callback, (uintptr_t)ctx); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { ctx->state = DVFS_DOMAIN_STATE_RETRY; + } } else { /* * If this domain does not have a timeout configured we start @@ -388,12 +399,14 @@ static int dvfs_create_pending_level_request( { if (ctx->request_pending) { if ((new_opp->frequency == ctx->pending_request.new_opp.frequency) && - (new_opp->voltage == ctx->pending_request.new_opp.voltage)) + (new_opp->voltage == ctx->pending_request.new_opp.voltage)) { return FWK_SUCCESS; + } } else { if ((new_opp->frequency == ctx->current_opp.frequency) && - (new_opp->voltage == ctx->current_opp.voltage)) + (new_opp->voltage == ctx->current_opp.voltage)) { return FWK_SUCCESS; + } ctx->pending_request.num_retries = 0; ctx->pending_request.set_source_id = false; @@ -407,8 +420,9 @@ static int dvfs_create_pending_level_request( * Set the retry flag only if we have to retry the request. Otherwise don't * overwrite it. */ - if (retry_request) + if (retry_request) { ctx->pending_request.retry_request = retry_request; + } ctx->pending_request.cookie = cookie; return FWK_SUCCESS; } @@ -421,11 +435,13 @@ static int dvfs_get_sustained_opp(fwk_id_t domain_id, struct mod_dvfs_opp *opp) const struct mod_dvfs_domain_ctx *ctx; ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } - if (ctx->config->sustained_idx >= ctx->opp_count) + if (ctx->config->sustained_idx >= ctx->opp_count) { return FWK_E_PARAM; + } *opp = ctx->config->opps[ctx->config->sustained_idx]; @@ -439,15 +455,18 @@ static int dvfs_get_nth_opp( { const struct mod_dvfs_domain_ctx *ctx; - if (opp == NULL) + if (opp == NULL) { return FWK_E_PARAM; + } ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } - if (n >= ctx->opp_count) + if (n >= ctx->opp_count) { return FWK_E_PARAM; + } *opp = ctx->config->opps[n]; @@ -463,8 +482,9 @@ static int dvfs_get_level_id( size_t idx; ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } /* * When the setup code forces platform to provide frequency array @@ -486,12 +506,14 @@ static int dvfs_get_opp_count(fwk_id_t domain_id, size_t *opp_count) { const struct mod_dvfs_domain_ctx *ctx; - if (opp_count == NULL) + if (opp_count == NULL) { return FWK_E_PARAM; + } ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } *opp_count = ctx->opp_count; @@ -502,12 +524,14 @@ static int dvfs_get_latency(fwk_id_t domain_id, uint16_t *latency) { const struct mod_dvfs_domain_ctx *ctx; - if (latency == NULL) + if (latency == NULL) { return FWK_E_PARAM; + } ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } *latency = ctx->config->latency; @@ -520,12 +544,14 @@ static int dvfs_get_level_limits( { struct mod_dvfs_domain_ctx *ctx; - if (limits == NULL) + if (limits == NULL) { return FWK_E_PARAM; + } ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } *limits = ctx->level_limits; return FWK_SUCCESS; @@ -539,12 +565,14 @@ static int dvfs_get_current_opp(fwk_id_t domain_id, struct mod_dvfs_opp *opp) int status; struct mod_dvfs_domain_ctx *ctx; - if (opp == NULL) + if (opp == NULL) { return FWK_E_PARAM; + } ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } if (ctx->current_opp.level != 0) { opp->level = ctx->current_opp.level; @@ -553,8 +581,9 @@ static int dvfs_get_current_opp(fwk_id_t domain_id, struct mod_dvfs_opp *opp) return FWK_SUCCESS; } - if (ctx->state != DVFS_DOMAIN_STATE_IDLE) + if (ctx->state != DVFS_DOMAIN_STATE_IDLE) { return FWK_E_BUSY; + } ctx->request.response_required = true; status = @@ -585,29 +614,35 @@ static int dvfs_set_level(fwk_id_t domain_id, uintptr_t cookie, uint32_t level) unsigned int interrupt; ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } /* Only accept levels that exist in the operating point table */ new_opp = get_opp_for_level(ctx, level); - if (new_opp == NULL) + if (new_opp == NULL) { return FWK_E_RANGE; + } - if (!is_opp_within_limits(new_opp, &ctx->level_limits)) + if (!is_opp_within_limits(new_opp, &ctx->level_limits)) { return FWK_E_RANGE; + } - if (ctx->state != DVFS_DOMAIN_STATE_IDLE) + if (ctx->state != DVFS_DOMAIN_STATE_IDLE) { return dvfs_create_pending_level_request(ctx, cookie, new_opp, false); + } if ((new_opp->level == ctx->current_opp.level) && (new_opp->frequency == ctx->current_opp.frequency) && - (new_opp->voltage == ctx->current_opp.voltage)) + (new_opp->voltage == ctx->current_opp.voltage)) { return FWK_SUCCESS; + } - if (fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) + if (fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) { ctx->request.set_source_id = true; - else + } else { ctx->request.set_source_id = false; + } return dvfs_set_level_start(ctx, cookie, new_opp, false, 0); } @@ -621,15 +656,18 @@ static int dvfs_set_level_limits( unsigned int interrupt; ctx = get_domain_ctx(domain_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } - if (!are_limits_valid(ctx, limits)) + if (!are_limits_valid(ctx, limits)) { return FWK_E_PARAM; + } new_opp = adjust_opp_for_new_limits(ctx, &ctx->current_opp, limits); - if (new_opp == NULL) + if (new_opp == NULL) { return FWK_E_PARAM; + } ctx->level_limits = *limits; @@ -649,10 +687,11 @@ static int dvfs_set_level_limits( return dvfs_create_pending_level_request(ctx, cookie, new_opp, true); } - if (fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) + if (fwk_interrupt_get_current(&interrupt) == FWK_SUCCESS) { ctx->request.set_source_id = true; - else + } else { ctx->request.set_source_id = false; + } return dvfs_set_level_start(ctx, cookie, new_opp, true, 0); } @@ -685,8 +724,9 @@ static void dvfs_complete_respond( struct mod_dvfs_params_response *resp_params; bool return_opp = false; - if ((ctx->state == DVFS_DOMAIN_GET_OPP) && (req_status == FWK_SUCCESS)) + if ((ctx->state == DVFS_DOMAIN_GET_OPP) && (req_status == FWK_SUCCESS)) { return_opp = true; + } if (ctx->cookie != 0) { /* @@ -700,8 +740,9 @@ static void dvfs_complete_respond( if (status == FWK_SUCCESS) { resp_params->status = req_status; - if (return_opp) + if (return_opp) { resp_params->performance_level = ctx->current_opp.level; + } fwk_thread_put_event(&read_req_event); } ctx->cookie = 0; @@ -712,8 +753,9 @@ static void dvfs_complete_respond( */ resp_params = (struct mod_dvfs_params_response *)resp_event->params; resp_params->status = req_status; - if (return_opp) + if (return_opp) { resp_params->performance_level = ctx->current_opp.level; + } } } @@ -796,8 +838,9 @@ static int dvfs_handle_set_opp( return status; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return dvfs_complete(ctx, NULL, status); + } /* * Voltage set successsfully, continue to set the frequency @@ -825,8 +868,9 @@ static int dvfs_handle_set_opp( return status; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return dvfs_complete(ctx, NULL, status); + } /* * Clock set_rate() completed successfully, continue to set_voltage() @@ -858,8 +902,9 @@ static int dvfs_handle_set_opp( /* * SET_OPP() completed, return to caller. */ - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { ctx->current_opp = ctx->request.new_opp; + } return dvfs_complete(ctx, NULL, status); } @@ -878,19 +923,22 @@ static int dvfs_handle_psu_get_voltage_resp( { const struct mod_dvfs_opp *opp; - if (req_status != FWK_SUCCESS) + if (req_status != FWK_SUCCESS) { return dvfs_complete(ctx, resp_event, req_status); + } - if (ctx->state == DVFS_DOMAIN_SET_OPP) + if (ctx->state == DVFS_DOMAIN_SET_OPP) { return dvfs_handle_set_opp(ctx, voltage); + } /* * We have the actual voltage, get the frequency from the * corresponding OPP in the domain context table. */ opp = get_opp_for_voltage(ctx, voltage); - if (opp == NULL) + if (opp == NULL) { return dvfs_complete(ctx, resp_event, FWK_E_DEVICE); + } /* * We have successfully found the level, save it in the domain context. @@ -917,8 +965,9 @@ static int dvfs_handle_psu_set_voltage_resp( struct mod_psu_driver_response *psu_response = (struct mod_psu_driver_response *)event->params; - if (psu_response->status != FWK_SUCCESS) + if (psu_response->status != FWK_SUCCESS) { return dvfs_complete(ctx, NULL, psu_response->status); + } if (ctx->state == DVFS_DOMAIN_SET_FREQUENCY) { status = ctx->apis.clock->set_rate( @@ -931,14 +980,16 @@ static int dvfs_handle_psu_set_voltage_resp( } } else if (ctx->state == DVFS_DOMAIN_SET_OPP_DONE) { status = FWK_SUCCESS; - } else + } else { status = FWK_E_DEVICE; + } /* * SET_OPP() completed, return to caller. */ - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { ctx->current_opp = ctx->request.new_opp; + } return dvfs_complete(ctx, NULL, status); } @@ -955,8 +1006,9 @@ static int dvfs_handle_clk_set_freq_resp( struct mod_clock_driver_resp_params *clock_response = (struct mod_clock_driver_resp_params *)event->params; - if (clock_response->status != FWK_SUCCESS) + if (clock_response->status != FWK_SUCCESS) { return dvfs_complete(ctx, NULL, clock_response->status); + } if (ctx->state == DVFS_DOMAIN_SET_VOLTAGE) { /* @@ -971,14 +1023,16 @@ static int dvfs_handle_clk_set_freq_resp( } else if (ctx->state == DVFS_DOMAIN_SET_OPP_DONE) { status = FWK_SUCCESS; - } else + } else { status = FWK_E_DEVICE; + } /* * SET_OPP() completed, return to caller. */ - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { ctx->current_opp = ctx->request.new_opp; + } return dvfs_complete(ctx, NULL, status); } @@ -996,8 +1050,9 @@ static int mod_dvfs_process_signal( uint32_t voltage; ctx = get_domain_ctx(target_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } /* * local DVFS event from dvfs_set_level() @@ -1008,16 +1063,18 @@ static int mod_dvfs_process_signal( status = FWK_SUCCESS; } else { status = ctx->apis.psu->get_voltage(ctx->config->psu_id, &voltage); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } } /* * Handle get_voltage() synchronously */ status = dvfs_handle_psu_get_voltage_resp(ctx, NULL, status, voltage); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } return status; } @@ -1051,8 +1108,9 @@ static int mod_dvfs_process_event( uint32_t voltage; ctx = get_domain_ctx(event->target_id); - if (ctx == NULL) + if (ctx == NULL) { return FWK_E_PARAM; + } /* * local DVFS event from dvfs_get_current_opp() @@ -1071,8 +1129,9 @@ static int mod_dvfs_process_event( */ status = dvfs_handle_psu_get_voltage_resp( ctx, resp_event, status, ctx->request.new_opp.voltage); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } return status; } @@ -1085,16 +1144,18 @@ static int mod_dvfs_process_event( status = FWK_SUCCESS; } else { status = ctx->apis.psu->get_voltage(ctx->config->psu_id, &voltage); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } } /* * Handle get_voltage() synchronously */ status = dvfs_handle_psu_get_voltage_resp(ctx, NULL, status, voltage); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } return status; } @@ -1126,8 +1187,9 @@ static int mod_dvfs_process_event( psu_response = (struct mod_psu_driver_response *)event->params; status = dvfs_handle_psu_get_voltage_resp( ctx, NULL, psu_response->status, psu_response->voltage); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } return status; } @@ -1140,8 +1202,9 @@ static int mod_dvfs_process_event( * a SET_OPP() request so resp_event discarded. */ status = dvfs_handle_psu_set_voltage_resp(ctx, event); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } return status; } @@ -1154,8 +1217,9 @@ static int mod_dvfs_process_event( * a SET_OPP() request so resp_event discarded. */ status = dvfs_handle_clk_set_freq_resp(ctx, event); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } return status; } @@ -1176,8 +1240,9 @@ static int dvfs_start(fwk_id_t id) struct mod_dvfs_opp sustained_opp; struct mod_dvfs_domain_ctx *ctx; - if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return FWK_SUCCESS; + } status = dvfs_get_sustained_opp(id, &sustained_opp); if (status == FWK_SUCCESS) { @@ -1239,16 +1304,18 @@ static int dvfs_bind_element(fwk_id_t domain_id, unsigned int round) /* Bind to the power supply module */ status = fwk_module_bind( ctx->config->psu_id, mod_psu_api_id_device, &ctx->apis.psu); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } /* Bind to the clock module */ status = fwk_module_bind( ctx->config->clock_id, FWK_ID_API(FWK_MODULE_IDX_CLOCK, 0), &ctx->apis.clock); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } /* Bind to a notification module if required */ if (!(fwk_id_is_equal(ctx->config->notification_id, FWK_ID_NONE))) { @@ -1256,8 +1323,9 @@ static int dvfs_bind_element(fwk_id_t domain_id, unsigned int round) ctx->config->notification_id, ctx->config->updates_api_id, &ctx->apis.perf_updated_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } } /* Bind to the alarm HAL if required */ @@ -1266,8 +1334,9 @@ static int dvfs_bind_element(fwk_id_t domain_id, unsigned int round) ctx->config->alarm_id, MOD_TIMER_API_ID_ALARM, &ctx->apis.alarm_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } } return FWK_SUCCESS; @@ -1276,12 +1345,14 @@ static int dvfs_bind_element(fwk_id_t domain_id, unsigned int round) static int dvfs_bind(fwk_id_t id, unsigned int round) { /* Only handle the first round */ - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } /* Bind our elements */ - if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return dvfs_bind_element(id, round); + } return FWK_SUCCESS; } @@ -1293,11 +1364,13 @@ static int dvfs_process_bind_request( const void **api) { /* Only allow binding to the module */ - if (!fwk_id_is_equal(target_id, fwk_module_id_dvfs)) + if (!fwk_id_is_equal(target_id, fwk_module_id_dvfs)) { return FWK_E_PARAM; + } - if (!fwk_id_is_equal(api_id, mod_dvfs_api_id_dvfs)) + if (!fwk_id_is_equal(api_id, mod_dvfs_api_id_dvfs)) { return FWK_E_ACCESS; + } /* We don't do any permissions management */ *api = &mod_dvfs_domain_api; diff --git a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c index e965006252c7faca0a23c3e2908ac9a49006bc99..f6e4e1ddf6ef278bb4a9cfb067df830af9d0dc2d 100644 --- a/module/dw_apb_i2c/src/mod_dw_apb_i2c.c +++ b/module/dw_apb_i2c/src/mod_dw_apb_i2c.c @@ -55,12 +55,14 @@ static int disable_i2c(struct dw_apb_i2c_ctx *ctx) i2c_reg = ctx->i2c_reg; /* Check whether the device is already disabled */ - if (is_i2c_disabled(i2c_reg)) + if (is_i2c_disabled(i2c_reg)) { return FWK_SUCCESS; + } /* The bus should be idle */ - if ((ctx->i2c_reg->IC_STATUS & IC_STATUS_MST_ACTIVITY_MASK) != 0) + if ((ctx->i2c_reg->IC_STATUS & IC_STATUS_MST_ACTIVITY_MASK) != 0) { return FWK_E_DEVICE; + } /* Disable the I2C device */ ctx->i2c_reg->IC_ENABLE = IC_ENABLE_STATUS_DISABLED; @@ -68,8 +70,9 @@ static int disable_i2c(struct dw_apb_i2c_ctx *ctx) /* Wait until the device is disabled */ status = timer_api->wait(timer_id, I2C_TIMEOUT_US, is_i2c_disabled, i2c_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_TIMEOUT; + } return FWK_SUCCESS; } @@ -83,8 +86,9 @@ static int enable_i2c(struct dw_apb_i2c_ctx *ctx, uint8_t slave_address) /* Disable the I2C device to configure it */ status = disable_i2c(ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } /* Program the slave address */ i2c_reg->IC_TAR = (slave_address & IC_TAR_ADDRESS); @@ -118,15 +122,17 @@ static void i2c_isr(uintptr_t data) if (ctx->read_on_going) { ctx->read_on_going = false; /* Read the data from the device buffer */ - for (i = 0; i < ctx->byte_count; i++) + for (i = 0; i < ctx->byte_count; i++) { ctx->data[i] = (uint8_t)(i2c_reg->IC_DATA_CMD & IC_DATA_CMD_DATA_MASK); + } } } /* The transaction has been aborted */ - if (i2c_reg->IC_INTR_STAT & IC_INTR_TX_ABRT_MASK) + if (i2c_reg->IC_INTR_STAT & IC_INTR_TX_ABRT_MASK) { i2c_reg->IC_CLR_TX_ABRT; + } ctx->i2c_api->transaction_completed(ctx->i2c_id, i2c_status); } @@ -141,25 +147,28 @@ static int transmit_as_master(fwk_id_t dev_id, unsigned int sent_bytes; struct dw_apb_i2c_ctx *ctx; - - if (transmit_request->transmit_byte_count > I2C_TRANSMIT_BUFFER_LENGTH) + if (transmit_request->transmit_byte_count > I2C_TRANSMIT_BUFFER_LENGTH) { return FWK_E_SUPPORT; + } - if (transmit_request->slave_address == 0) + if (transmit_request->slave_address == 0) { return FWK_E_PARAM; + } ctx = ctx_table + fwk_id_get_element_idx(dev_id); status = enable_i2c(ctx, transmit_request->slave_address); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } /* The program of the I2C controller cannot be interrupted. */ fwk_interrupt_global_disable(); for (sent_bytes = 0; sent_bytes < transmit_request->transmit_byte_count; - sent_bytes++) + sent_bytes++) { ctx->i2c_reg->IC_DATA_CMD = transmit_request->transmit_data[sent_bytes]; + } fwk_interrupt_global_enable(); @@ -179,12 +188,13 @@ static int receive_as_master(fwk_id_t dev_id, unsigned int i; struct dw_apb_i2c_ctx *ctx; - - if (receive_request->receive_byte_count > I2C_RECEIVE_BUFFER_LENGTH) + if (receive_request->receive_byte_count > I2C_RECEIVE_BUFFER_LENGTH) { return FWK_E_SUPPORT; + } - if (receive_request->slave_address == 0) + if (receive_request->slave_address == 0) { return FWK_E_PARAM; + } ctx = ctx_table + fwk_id_get_element_idx(dev_id); @@ -193,15 +203,17 @@ static int receive_as_master(fwk_id_t dev_id, ctx->read_on_going = true; status = enable_i2c(ctx, receive_request->slave_address); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } /* The program of the I2C controller cannot be interrupted. */ fwk_interrupt_global_disable(); /* Program the I2C controller with the expected reply length in bytes. */ - for (i = 0; i < receive_request->receive_byte_count; i++) + for (i = 0; i < receive_request->receive_byte_count; i++) { ctx->i2c_reg->IC_DATA_CMD = IC_DATA_CMD_READ; + } fwk_interrupt_global_enable(); @@ -238,8 +250,9 @@ static int dw_apb_i2c_element_init(fwk_id_t element_id, struct mod_dw_apb_i2c_dev_config *config = (struct mod_dw_apb_i2c_dev_config *)data; - if (config->reg == 0) + if (config->reg == 0) { return FWK_E_DATA; + } ctx_table[fwk_id_get_element_idx(element_id)].config = config; ctx_table[fwk_id_get_element_idx(element_id)].i2c_reg = @@ -254,16 +267,18 @@ static int dw_apb_i2c_bind(fwk_id_t id, unsigned int round) struct dw_apb_i2c_ctx *ctx; const struct mod_dw_apb_i2c_dev_config *config; - if (!fwk_module_is_valid_element_id(id) || (round == 0)) + if (!fwk_module_is_valid_element_id(id) || (round == 0)) { return FWK_SUCCESS; + } ctx = ctx_table + fwk_id_get_element_idx(id); config = ctx->config; status = fwk_module_bind(config->timer_id, MOD_TIMER_API_ID_TIMER, &ctx->timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_module_bind(ctx->i2c_id, mod_i2c_api_id_driver_response, &ctx->i2c_api); @@ -276,13 +291,15 @@ static int dw_apb_i2c_process_bind_request(fwk_id_t source_id, { struct dw_apb_i2c_ctx *ctx; - if (!fwk_module_is_valid_element_id(target_id)) + if (!fwk_module_is_valid_element_id(target_id)) { return FWK_E_PARAM; + } ctx = ctx_table + fwk_id_get_element_idx(target_id); - if (!fwk_id_is_equal(api_id, mod_dw_apb_i2c_api_id_driver)) + if (!fwk_id_is_equal(api_id, mod_dw_apb_i2c_api_id_driver)) { return FWK_E_PARAM; + } ctx->i2c_id = source_id; @@ -298,23 +315,27 @@ static int dw_apb_i2c_start(fwk_id_t id) unsigned int i2c_irq; /* Nothing to do for the module */ - if (!fwk_module_is_valid_element_id(id)) + if (!fwk_module_is_valid_element_id(id)) { return FWK_SUCCESS; + } ctx = ctx_table + fwk_id_get_element_idx(id); i2c_irq = ctx->config->i2c_irq; status = fwk_interrupt_set_isr_param(i2c_irq, i2c_isr, (uintptr_t)ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } status = fwk_interrupt_clear_pending(i2c_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } status = fwk_interrupt_enable(i2c_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } return FWK_SUCCESS; } diff --git a/module/gtimer/src/mod_gtimer.c b/module/gtimer/src/mod_gtimer.c index 7b422a5c9112eef64e173ad785783dc94f078a16..5ee7940228e8990dadb17ec778056cf16e06ab64 100644 --- a/module/gtimer/src/mod_gtimer.c +++ b/module/gtimer/src/mod_gtimer.c @@ -108,8 +108,9 @@ static int set_timer(fwk_id_t dev_id, uint64_t timestamp) int status; status = get_counter(dev_id, &counter); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* * If an alarm's period is very small, the timer device could be configured @@ -151,8 +152,9 @@ static int get_frequency(fwk_id_t dev_id, uint32_t *frequency) { struct dev_ctx *ctx; - if (frequency == NULL) + if (frequency == NULL) { return FWK_E_PARAM; + } ctx = mod_gtimer_ctx.table + fwk_id_get_element_idx(dev_id); @@ -223,8 +225,9 @@ static int gtimer_process_bind_request(fwk_id_t requester_id, const void **api) { /* No binding to the module */ - if (fwk_module_is_valid_module_id(id)) + if (fwk_module_is_valid_module_id(id)) { return FWK_E_ACCESS; + } *api = &module_api; @@ -243,8 +246,9 @@ static int gtimer_start(fwk_id_t id) { struct dev_ctx *ctx; - if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return FWK_SUCCESS; + } ctx = mod_gtimer_ctx.table + fwk_id_get_element_idx(id); @@ -254,8 +258,9 @@ static int gtimer_start(fwk_id_t id) mod_clock_notification_id_state_changed, ctx->config->clock_id, id); - } else + } else { gtimer_control_init(ctx); + } return FWK_SUCCESS; } diff --git a/module/i2c/src/mod_i2c.c b/module/i2c/src/mod_i2c.c index 63650d0a86a4293c025a356f7904868ab540e5af..128ce9d9e4d7cddb68a91840f578232bc4962445 100644 --- a/module/i2c/src/mod_i2c.c +++ b/module/i2c/src/mod_i2c.c @@ -69,8 +69,9 @@ static int create_i2c_request(fwk_id_t dev_id, (struct mod_i2c_request *)event.params; /* The slave address should be on 7 bits */ - if (!fwk_expect(request->slave_address < 0x80)) + if (!fwk_expect(request->slave_address < 0x80)) { return FWK_E_PARAM; + } event = (struct fwk_event) { .target_id = dev_id, @@ -109,11 +110,13 @@ static int transmit_as_master(fwk_id_t dev_id, uint8_t *data, uint8_t byte_count) { - if (!fwk_expect(byte_count != 0)) + if (!fwk_expect(byte_count != 0)) { return FWK_E_PARAM; + } - if (!fwk_expect(data != NULL)) + if (!fwk_expect(data != NULL)) { return FWK_E_PARAM; + } struct mod_i2c_request request = { .slave_address = slave_address, @@ -129,11 +132,13 @@ static int receive_as_master(fwk_id_t dev_id, uint8_t *data, uint8_t byte_count) { - if (!fwk_expect(byte_count != 0)) + if (!fwk_expect(byte_count != 0)) { return FWK_E_PARAM; + } - if (!fwk_expect(data != NULL)) + if (!fwk_expect(data != NULL)) { return FWK_E_PARAM; + } struct mod_i2c_request request = { .slave_address = slave_address, @@ -151,11 +156,13 @@ static int transmit_then_receive_as_master(fwk_id_t dev_id, uint8_t transmit_byte_count, uint8_t receive_byte_count) { - if (!fwk_expect((transmit_byte_count != 0) && (receive_byte_count != 0))) + if (!fwk_expect((transmit_byte_count != 0) && (receive_byte_count != 0))) { return FWK_E_PARAM; + } - if (!fwk_expect((transmit_data != NULL) && (receive_data != NULL))) + if (!fwk_expect((transmit_data != NULL) && (receive_data != NULL))) { return FWK_E_PARAM; + } struct mod_i2c_request request = { .slave_address = slave_address, @@ -233,8 +240,9 @@ static int mod_i2c_bind(fwk_id_t id, unsigned int round) * Only bind in first round of calls * Nothing to do for module */ - if ((round > 0) || fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if ((round > 0) || fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } ctx = ctx_table + fwk_id_get_element_idx(id); @@ -242,12 +250,14 @@ static int mod_i2c_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(ctx->config->driver_id, ctx->config->api_id, &ctx->driver_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if ((ctx->driver_api->transmit_as_master == NULL) || - (ctx->driver_api->receive_as_master == NULL)) + (ctx->driver_api->receive_as_master == NULL)) { return FWK_E_DATA; + } return FWK_SUCCESS; } @@ -259,18 +269,21 @@ static int mod_i2c_process_bind_request(fwk_id_t source_id, { struct mod_i2c_dev_ctx *ctx; - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_PARAM; + } ctx = ctx_table + fwk_id_get_element_idx(target_id); if (fwk_id_is_equal(source_id, ctx->config->driver_id)) { - if (fwk_id_is_equal(api_id, mod_i2c_api_id_driver_response)) + if (fwk_id_is_equal(api_id, mod_i2c_api_id_driver_response)) { *api = &driver_response_api; - else + } else { return FWK_E_PARAM; - } else + } + } else { *api = &i2c_api; + } return FWK_SUCCESS; } @@ -286,8 +299,9 @@ static int respond_to_caller( (struct mod_i2c_event_param *)resp.params; status = fwk_thread_get_first_delayed_response(dev_id, &resp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } param->status = (drv_status == FWK_SUCCESS) ? FWK_SUCCESS : FWK_E_DEVICE; @@ -332,19 +346,20 @@ static int reload(fwk_id_t dev_id, struct mod_i2c_dev_ctx *ctx) struct fwk_event event; status = fwk_thread_is_delayed_response_list_empty(dev_id, &is_empty); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (is_empty) + if (is_empty) { ctx->state = MOD_I2C_DEV_IDLE; - else { + } else { ctx->state = MOD_I2C_DEV_RELOAD; event = (struct fwk_event) { .target_id = dev_id, .id = mod_i2c_event_id_reload, }; status = fwk_thread_put_event(&event); - } + } return status; } @@ -358,8 +373,9 @@ static int process_next_request(fwk_id_t dev_id, struct mod_i2c_dev_ctx *ctx) struct mod_i2c_event_param *event_param; status = fwk_thread_is_delayed_response_list_empty(dev_id, &is_empty); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (is_empty) { ctx->state = MOD_I2C_DEV_IDLE; @@ -368,8 +384,9 @@ static int process_next_request(fwk_id_t dev_id, struct mod_i2c_dev_ctx *ctx) status = fwk_thread_get_first_delayed_response( dev_id, &delayed_response); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } request = (struct mod_i2c_request *)delayed_response.params; ctx->request = *request; @@ -380,8 +397,9 @@ static int process_next_request(fwk_id_t dev_id, struct mod_i2c_dev_ctx *ctx) event_param->status = drv_status; status = fwk_thread_put_event(&delayed_response); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { status = reload(dev_id, ctx); + } } return status; @@ -419,9 +437,9 @@ static int mod_i2c_process_event(const struct fwk_event *event, drv_status = process_request(ctx, event->id); - if (drv_status == FWK_PENDING) + if (drv_status == FWK_PENDING) { resp_event->is_delayed_response = true; - else { + } else { /* The request has succeeded or failed, respond now */ resp_param = (struct mod_i2c_event_param *)resp_event->params; @@ -439,8 +457,9 @@ static int mod_i2c_process_event(const struct fwk_event *event, if ((ctx->state == MOD_I2C_DEV_TX) || (ctx->state == MOD_I2C_DEV_RX)) { status = respond_to_caller(dev_id, ctx, event_param->status); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { status = process_next_request(dev_id, ctx); + } } else if (ctx->state == MOD_I2C_DEV_TX_RX) { drv_status = event_param->status; @@ -460,10 +479,12 @@ static int mod_i2c_process_event(const struct fwk_event *event, } status = respond_to_caller(dev_id, ctx, drv_status); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { status = process_next_request(dev_id, ctx); - } else + } + } else { status = FWK_E_STATE; + } break; @@ -476,8 +497,9 @@ static int mod_i2c_process_event(const struct fwk_event *event, break; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { ctx->state = MOD_I2C_DEV_PANIC; + } return status; } diff --git a/module/mhu/src/mod_mhu.c b/module/mhu/src/mod_mhu.c index 64cef78b2897caec50bc3ef9534437c9c5633518..78e3809b3292676a2d856dd1e8b75b8f2b57241e 100644 --- a/module/mhu/src/mod_mhu.c +++ b/module/mhu/src/mod_mhu.c @@ -73,17 +73,20 @@ static void mhu_isr(void) struct mhu_smt_channel *smt_channel; status = fwk_interrupt_get_current(&interrupt); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return; + } for (device_idx = 0; device_idx < mhu_ctx.device_count; device_idx++) { device_ctx = &mhu_ctx.device_ctx_table[device_idx]; - if (device_ctx->config->irq == interrupt) + if (device_ctx->config->irq == interrupt) { break; + } } - if (device_idx >= mhu_ctx.device_count) + if (device_idx >= mhu_ctx.device_count) { return; + } reg = (struct mhu_reg *)device_ctx->config->in; @@ -136,8 +139,9 @@ const struct mod_smt_driver_api mhu_mod_smt_driver_api = { static int mhu_init(fwk_id_t module_id, unsigned int device_count, const void *unused) { - if (device_count == 0) + if (device_count == 0) { return FWK_E_PARAM; + } mhu_ctx.device_ctx_table = fwk_mm_calloc(device_count, sizeof(mhu_ctx.device_ctx_table[0])); @@ -153,8 +157,9 @@ static int mhu_device_init(fwk_id_t device_id, unsigned int slot_count, struct mod_mhu_device_config *config = (struct mod_mhu_device_config *)data; struct mhu_device_ctx *device_ctx; - if ((config->in == 0) || (config->out == 0)) + if ((config->in == 0) || (config->out == 0)) { return FWK_E_PARAM; + } device_ctx = &mhu_ctx.device_ctx_table[fwk_id_get_element_idx(device_id)]; @@ -179,16 +184,18 @@ static int mhu_bind(fwk_id_t id, unsigned int round) for (slot = 0; slot < MHU_SLOT_COUNT_MAX; slot++) { if ((device_ctx->bound_slots & (uint32_t)(1U << slot)) == - (uint32_t)0) + (uint32_t)0) { continue; + } smt_channel = &device_ctx->smt_channel_table[slot]; status = fwk_module_bind(smt_channel->id, FWK_ID_API(FWK_MODULE_IDX_SMT, MOD_SMT_API_IDX_DRIVER_INPUT), &smt_channel->api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } } @@ -201,14 +208,16 @@ static int mhu_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, struct mhu_device_ctx *device_ctx; unsigned int slot; - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_SUB_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_SUB_ELEMENT)) { return FWK_E_ACCESS; + } device_ctx = &mhu_ctx.device_ctx_table[fwk_id_get_element_idx(target_id)]; slot = fwk_id_get_sub_element_idx(target_id); - if (device_ctx->bound_slots & (1U << slot)) + if (device_ctx->bound_slots & (1U << slot)) { return FWK_E_ACCESS; + } device_ctx->smt_channel_table[slot].id = source_id; device_ctx->bound_slots |= 1U << slot; @@ -223,18 +232,21 @@ static int mhu_start(fwk_id_t id) int status; struct mhu_device_ctx *device_ctx; - if (fwk_id_get_type(id) == FWK_ID_TYPE_MODULE) + if (fwk_id_get_type(id) == FWK_ID_TYPE_MODULE) { return FWK_SUCCESS; + } device_ctx = &mhu_ctx.device_ctx_table[fwk_id_get_element_idx(id)]; if (device_ctx->bound_slots != 0) { status = fwk_interrupt_set_isr(device_ctx->config->irq, &mhu_isr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_enable(device_ctx->config->irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; diff --git a/module/mock_clock/src/mod_mock_clock.c b/module/mock_clock/src/mod_mock_clock.c index 9457c6a40d6a66fdea9d294f9f3505ac17a4adef..a131077ec06369e509df6ecfabe6a91059f3a44e 100644 --- a/module/mock_clock/src/mod_mock_clock.c +++ b/module/mock_clock/src/mod_mock_clock.c @@ -75,8 +75,9 @@ static int mod_mock_clock_set_rate( ctx = mod_mock_clock_get_ctx(clock_id); - if (ctx->state == MOD_CLOCK_STATE_STOPPED) + if (ctx->state == MOD_CLOCK_STATE_STOPPED) { return FWK_E_STATE; + } /* * Look up the divider and source settings. We do not perform any rounding @@ -84,8 +85,9 @@ static int mod_mock_clock_set_rate( * be refused with an FWK_E_PARAM error code. */ status = get_rate_entry(ctx, rate, &rate_entry); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PARAM; + } ctx->current_rate_index = rate_entry - ctx->config->rate_table; @@ -100,8 +102,9 @@ static int mod_mock_clock_get_rate(fwk_id_t clock_id, uint64_t *rate) ctx = mod_mock_clock_get_ctx(clock_id); - if (!ctx->rate_initialized) + if (!ctx->rate_initialized) { return FWK_E_STATE; + } *rate = ctx->config->rate_table[ctx->current_rate_index].rate; @@ -117,8 +120,9 @@ static int mod_mock_clock_get_rate_from_index( ctx = mod_mock_clock_get_ctx(clock_id); - if (rate_index >= ctx->config->rate_count) + if (rate_index >= ctx->config->rate_count) { return FWK_E_PARAM; + } *rate = ctx->config->rate_table[rate_index].rate; @@ -224,8 +228,9 @@ static int mod_mock_clock_element_init( rate = cfg->rate_table[rate_index].rate; /* The rate entries must be in ascending order */ - if (rate < last_rate) + if (rate < last_rate) { return FWK_E_DATA; + } last_rate = rate; @@ -250,8 +255,9 @@ static int mod_mock_clock_process_bind_request( { enum mod_mock_clock_api_type api_type = fwk_id_get_api_idx(api_id); - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_ACCESS; + } switch (api_type) { case MOD_MOCK_CLOCK_API_TYPE_DRIVER: diff --git a/module/mock_psu/src/mod_mock_psu.c b/module/mock_psu/src/mod_mock_psu.c index 467690f96e466710aa7cf6976bf3046ed7bde4af..2a9ec17ca926f52571cd01be7689653ae3af0582 100644 --- a/module/mock_psu/src/mod_mock_psu.c +++ b/module/mock_psu/src/mod_mock_psu.c @@ -68,14 +68,17 @@ static int mod_mock_psu_get_cfg_ctx( const struct mod_mock_psu_element_cfg **cfg, struct mod_mock_psu_element_ctx **ctx) { - if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_MOCK_PSU) + if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_MOCK_PSU) { return FWK_E_PARAM; + } - if (ctx != NULL) + if (ctx != NULL) { *ctx = mod_mock_psu_get_ctx(element_id); + } - if (cfg != NULL) + if (cfg != NULL) { *cfg = fwk_module_get_data(element_id); + } return FWK_SUCCESS; } @@ -92,8 +95,9 @@ static void mod_mock_psu_alarm_callback(uintptr_t element_idx) struct mod_psu_driver_response response; status = mod_mock_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return; + } response = (struct mod_psu_driver_response){ .status = FWK_SUCCESS, @@ -141,8 +145,9 @@ static int mod_mock_psu_trigger( struct mod_mock_psu_element_ctx *ctx; status = mod_mock_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = ctx->apis.alarm->start( cfg->async_alarm_id, @@ -155,8 +160,9 @@ static int mod_mock_psu_trigger( status = FWK_PENDING; ctx->op = op; - } else + } else { status = FWK_E_HANDLER; + } exit: return status; @@ -172,8 +178,9 @@ static int mod_mock_psu_get_enabled( struct mod_mock_psu_element_ctx *ctx; status = mod_mock_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (ctx->apis.alarm == NULL) { *enabled = ctx->state.enabled; @@ -187,8 +194,9 @@ static int mod_mock_psu_get_enabled( }; status = mod_mock_psu_trigger(element_id, op); - } else + } else { status = FWK_E_BUSY; + } exit: return status; @@ -204,8 +212,9 @@ static int mod_mock_psu_set_enabled( struct mod_mock_psu_element_ctx *ctx; status = mod_mock_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (ctx->apis.alarm == NULL) { ctx->state.enabled = enabled; @@ -220,8 +229,9 @@ static int mod_mock_psu_set_enabled( }; status = mod_mock_psu_trigger(element_id, op); - } else + } else { status = FWK_E_BUSY; + } exit: return status; @@ -235,8 +245,9 @@ static int mod_mock_psu_get_voltage(fwk_id_t element_id, uint32_t *voltage) struct mod_mock_psu_element_ctx *ctx; status = mod_mock_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (ctx->apis.alarm == NULL) { *voltage = ctx->state.voltage; @@ -250,8 +261,9 @@ static int mod_mock_psu_get_voltage(fwk_id_t element_id, uint32_t *voltage) }; status = mod_mock_psu_trigger(element_id, op); - } else + } else { status = FWK_E_BUSY; + } exit: return status; @@ -265,8 +277,9 @@ static int mod_mock_psu_set_voltage(fwk_id_t element_id, uint32_t voltage) struct mod_mock_psu_element_ctx *ctx; status = mod_mock_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (ctx->apis.alarm == NULL) { ctx->state.voltage = voltage; @@ -281,8 +294,9 @@ static int mod_mock_psu_set_voltage(fwk_id_t element_id, uint32_t voltage) }; status = mod_mock_psu_trigger(element_id, op); - } else + } else { status = FWK_E_BUSY; + } exit: return status; @@ -349,8 +363,9 @@ static int mod_mock_psu_bind(fwk_id_t id, unsigned int round) cfg->async_alarm_id, cfg->async_alarm_api_id, &ctx->apis.alarm); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = fwk_module_bind( cfg->async_response_id, @@ -371,11 +386,13 @@ static int mod_mock_psu_process_bind_request( { const struct mod_mock_psu_element_cfg *cfg; - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_ACCESS; + } - if (!fwk_id_is_equal(api_id, mod_mock_psu_api_id_driver)) + if (!fwk_id_is_equal(api_id, mod_mock_psu_api_id_driver)) { return FWK_E_ACCESS; + } cfg = fwk_module_get_data(target_id); @@ -385,8 +402,9 @@ static int mod_mock_psu_process_bind_request( * accept bind requests from is the entity that we have configured to be * our designated driver respondee. */ - if (!fwk_id_is_equal(source_id, cfg->async_response_id)) + if (!fwk_id_is_equal(source_id, cfg->async_response_id)) { return FWK_E_ACCESS; + } } *api = &mod_mock_psu_driver_api; diff --git a/module/pl011/src/mod_pl011.c b/module/pl011/src/mod_pl011.c index 6e918c7f8932f6e1d22f1278711cae4b18e8d520..00aed829e9085f7a13355fc0046005700d080a5f 100644 --- a/module/pl011/src/mod_pl011.c +++ b/module/pl011/src/mod_pl011.c @@ -60,12 +60,14 @@ static int mod_pl011_init_ctx(struct mod_pl011_ctx *ctx) fwk_assert(!mod_pl011_ctx.initialized); element_count = fwk_module_get_element_count(fwk_module_id_pl011); - if (element_count == 0) + if (element_count == 0) { return FWK_SUCCESS; + } ctx->elements = fwk_mm_alloc(element_count, sizeof(ctx->elements[0])); - if (!fwk_expect(ctx->elements != NULL)) + if (!fwk_expect(ctx->elements != NULL)) { return FWK_E_NOMEM; + } for (size_t i = 0; i < element_count; i++) { const struct mod_pl011_element_cfg *cfg = @@ -212,8 +214,9 @@ static int mod_pl011_init( unsigned int element_count, const void *data) { - if (mod_pl011_ctx.initialized) + if (mod_pl011_ctx.initialized) { return FWK_SUCCESS; + } return mod_pl011_init_ctx(&mod_pl011_ctx); } @@ -232,8 +235,9 @@ static int mod_pl011_start(fwk_id_t id) const struct mod_pl011_element_cfg *cfg; - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } cfg = fwk_module_get_data(id); @@ -247,15 +251,17 @@ static int mod_pl011_start(fwk_id_t id) if (!fwk_id_is_equal(cfg->pd_id, FWK_ID_NONE)) { status = fwk_notification_subscribe( mod_pd_notification_id_power_state_transition, cfg->pd_id, id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_HANDLER; + } status = fwk_notification_subscribe( mod_pd_notification_id_pre_shutdown, fwk_module_id_power_domain, id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_HANDLER; + } } #endif @@ -269,8 +275,9 @@ static int mod_pl011_start(fwk_id_t id) if (!fwk_id_is_equal(cfg->clock_id, FWK_ID_NONE)) { status = fwk_notification_subscribe( mod_clock_notification_id_state_changed, cfg->clock_id, id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_HANDLER; + } } #endif @@ -294,13 +301,15 @@ static int mod_pl011_powering_down(fwk_id_t id) /* We don't care about the pre-transition power on notification */ status = fwk_notification_unsubscribe( mod_pd_notification_id_power_state_pre_transition, cfg->pd_id, id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_HANDLER; + } status = fwk_notification_subscribe( mod_pd_notification_id_power_state_transition, cfg->pd_id, id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -318,14 +327,16 @@ static int mod_pl011_powered_on(fwk_id_t id) /* We need only the pre-transition in order to prepare for power down */ status = fwk_notification_unsubscribe( mod_pd_notification_id_power_state_transition, cfg->pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_subscribe( mod_pd_notification_id_power_state_pre_transition, cfg->pd_id, id); - if (ctx->clocked) /* Re-enable if no clock domain is configured */ + if (ctx->clocked) { /* Re-enable if no clock domain is configured */ mod_pl011_enable(id); + } return status; } @@ -375,10 +386,11 @@ static int mod_pl011_process_power_notification( (struct mod_pd_power_state_transition_notification_params *) event->params; - if (params->state != MOD_PD_STATE_ON) + if (params->state != MOD_PD_STATE_ON) { status = FWK_SUCCESS; - else + } else { status = mod_pl011_powered_on(event->target_id); + } break; } @@ -432,15 +444,17 @@ static int mod_pl011_clock_change_pending( mod_clock_notification_id_state_change_pending, cfg->clock_id, event->target_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_OS; + } status = fwk_notification_subscribe( mod_clock_notification_id_state_changed, cfg->clock_id, event->target_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_OS; + } return FWK_SUCCESS; } @@ -465,18 +479,21 @@ static int mod_pl011_clock_changed(const struct fwk_event *event) mod_clock_notification_id_state_changed, cfg->clock_id, event->target_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_OS; + } status = fwk_notification_subscribe( mod_clock_notification_id_state_change_pending, cfg->clock_id, event->target_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_OS; + } - if (ctx->powered) /* Re-enable if no clock domain is configured */ + if (ctx->powered) { /* Re-enable if no clock domain is configured */ mod_pl011_enable(event->target_id); + } return FWK_SUCCESS; } @@ -543,23 +560,27 @@ static int mod_pl011_io_open(const struct fwk_io_stream *stream) struct mod_pl011_element_ctx *ctx; - if (!fwk_id_is_type(stream->id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(stream->id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_SUPPORT; + } if (!mod_pl011_ctx.initialized) { status = mod_pl011_init_ctx(&mod_pl011_ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_STATE; + } } ctx = &mod_pl011_ctx.elements[fwk_id_get_element_idx(stream->id)]; - if (ctx->open) /* Refuse to open the same device twice */ + if (ctx->open) { /* Refuse to open the same device twice */ return FWK_E_BUSY; + } ctx->open = true; - if (ctx->powered && ctx->clocked) + if (ctx->powered && ctx->clocked) { mod_pl011_enable(stream->id); /* Enable the device if possible */ + } return FWK_SUCCESS; } @@ -575,12 +596,14 @@ static int mod_pl011_io_getch( fwk_assert(ctx->open); - if (!ctx->powered || !ctx->clocked) + if (!ctx->powered || !ctx->clocked) { return FWK_E_PWRSTATE; + } ok = mod_pl011_getch(stream->id, ch); - if (!ok) + if (!ok) { return FWK_PENDING; + } return FWK_SUCCESS; } @@ -592,12 +615,15 @@ static int mod_pl011_io_putch(const struct fwk_io_stream *stream, char ch) fwk_assert(ctx->open); - if (!ctx->powered || !ctx->clocked) + if (!ctx->powered || !ctx->clocked) { return FWK_E_PWRSTATE; + } if ((ch == '\n') && - (((unsigned int)stream->mode & (unsigned int)FWK_IO_MODE_BINARY)) == 0U) + (((unsigned int)stream->mode & (unsigned int)FWK_IO_MODE_BINARY)) == + 0U) { mod_pl011_putch(stream->id, '\r'); /* Prepend carriage return */ + } mod_pl011_putch(stream->id, ch); diff --git a/module/power_domain/src/mod_power_domain.c b/module/power_domain/src/mod_power_domain.c index 47083e64e8809014e707a6fcaf788295c2db9a90..78a4080405392c227b417b5f84e2390d384223e6 100644 --- a/module/power_domain/src/mod_power_domain.c +++ b/module/power_domain/src/mod_power_domain.c @@ -345,8 +345,9 @@ static bool is_shallower_state(unsigned int state, static bool is_allowed_by_child(const struct pd_ctx *child, unsigned int parent_state, unsigned int child_state) { - if (parent_state >= child->allowed_state_mask_table_size) + if (parent_state >= child->allowed_state_mask_table_size) { return false; + } return ( (child->allowed_state_mask_table[parent_state] & @@ -361,8 +362,9 @@ static bool is_allowed_by_children(const struct pd_ctx *pd, unsigned int state) FWK_LIST_FOR_EACH( &pd->children_list, c_node, struct pd_ctx, child_node, child) { - if (!is_allowed_by_child(child, state, child->requested_state)) + if (!is_allowed_by_child(child, state, child->requested_state)) { return false; + } } return true; @@ -386,8 +388,9 @@ static unsigned int number_of_bits_to_shift(uint32_t mask) { unsigned int num_bits = 0; - if (mask == (uint32_t)0) + if (mask == (uint32_t)0) { return 0; + } while ((mask & (uint32_t)1) == (uint32_t)0) { mask = mask >> 1; @@ -418,8 +421,9 @@ static int get_highest_level_from_composite_state( const uint32_t *state_mask_table; unsigned int table_size; - if (!pd->cs_support) + if (!pd->cs_support) { return 0; + } if (pd->composite_state_levels_mask) { shift = number_of_bits_to_shift(pd->composite_state_levels_mask); @@ -432,8 +436,9 @@ static int get_highest_level_from_composite_state( level++, pd = pd->parent) { state = get_level_state_from_composite_state( state_mask_table, composite_state, level); - if (!is_valid_state(pd, state)) + if (!is_valid_state(pd, state)) { break; + } } level--; } @@ -453,29 +458,35 @@ static bool is_valid_composite_state(struct pd_ctx *target_pd, assert(target_pd != NULL); - if (!pd->cs_support) + if (!pd->cs_support) { goto error; + } highest_level = get_highest_level_from_composite_state(pd, composite_state); state_mask_table = pd->composite_state_mask_table; table_size = pd->composite_state_mask_table_size; - if (highest_level >= table_size) + if (highest_level >= table_size) { goto error; + } for (level = 0; level <= highest_level; level++) { - if (pd == NULL) + if (pd == NULL) { goto error; + } state = get_level_state_from_composite_state( state_mask_table, composite_state, level); - if (!is_valid_state(pd, state)) + if (!is_valid_state(pd, state)) { goto error; + } - if ((child != NULL) && !is_allowed_by_child(child, state, child_state)) + if ((child != NULL) && + !is_allowed_by_child(child, state, child_state)) { goto error; + } child = pd; child_state = state; @@ -512,8 +523,9 @@ static bool is_upwards_transition_propagation(const struct pd_ctx *lowest_pd, highest_level = get_highest_level_from_composite_state(lowest_pd, composite_state); - if (!lowest_pd->cs_support) + if (!lowest_pd->cs_support) { return is_deeper_state(composite_state, lowest_pd->requested_state); + } state_mask_table = lowest_pd->composite_state_mask_table; @@ -521,8 +533,9 @@ static bool is_upwards_transition_propagation(const struct pd_ctx *lowest_pd, level++, pd = pd->parent) { state = get_level_state_from_composite_state( state_mask_table, composite_state, level); - if (state == pd->requested_state) + if (state == pd->requested_state) { continue; + } return is_deeper_state(state, pd->requested_state); } @@ -544,8 +557,9 @@ static int connect_pd_tree(void) } parent = pd->parent = &mod_pd_ctx.pd_ctx_table[pd->config->parent_idx]; - if (parent == NULL) + if (parent == NULL) { return FWK_E_DATA; + } fwk_list_push_tail(&parent->children_list, &pd->child_node); } @@ -568,15 +582,17 @@ static bool is_allowed_by_parent_and_children(struct pd_ctx *pd, parent = pd->parent; if (parent != NULL) { - if (!is_allowed_by_child(pd, parent->current_state, state)) + if (!is_allowed_by_child(pd, parent->current_state, state)) { return false; + } } FWK_LIST_FOR_EACH( &pd->children_list, c_node, struct pd_ctx, child_node, child) { - if (!is_allowed_by_child(child, state, child->current_state)) + if (!is_allowed_by_child(child, state, child->current_state)) { return false; + } } return true; @@ -623,19 +639,23 @@ static bool initiate_power_state_pre_transition_notification(struct pd_ctx *pd) }; struct mod_pd_power_state_pre_transition_notification_params *params; - if (pd->config->disable_state_transition_notifications == true) + if (pd->config->disable_state_transition_notifications == true) { return false; + } state = pd->requested_state; - if (!check_power_state_pre_transition_notification(pd, state)) + if (!check_power_state_pre_transition_notification(pd, state)) { return false; + } /* * If still waiting for some responses on the previous power state * pre-transition notification, wait for them before to issue the next one. */ - if (pd->power_state_pre_transition_notification_ctx.pending_responses != 0) + if (pd->power_state_pre_transition_notification_ctx.pending_responses != + 0) { return true; + } params = (struct mod_pd_power_state_pre_transition_notification_params *) notification_event.params; @@ -724,15 +744,17 @@ static void respond(struct pd_ctx *pd, int resp_status) struct pd_set_state_response *resp_params = (struct pd_set_state_response *)(&resp_event.params); - if (!pd->response.pending) + if (!pd->response.pending) { return; + } status = fwk_thread_get_delayed_response( pd->id, pd->response.cookie, &resp_event); pd->response.pending = false; - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return; + } resp_params->composite_state = req_params->composite_state; resp_params->status = resp_status; @@ -788,31 +810,35 @@ static void process_set_state_request( pd = lowest_pd; composite_state_operation = pd->cs_support; - if (composite_state_operation) + if (composite_state_operation) { state_mask_table = pd->composite_state_mask_table; + } for (pd_index = 0; pd_index < nb_pds; pd_index++, pd = pd->parent) { - if (up) + if (up) { level = pd_index; - else { + } else { /* * When walking down the power domain tree, get the context of the * next power domain to process as well as its level. */ pd = lowest_pd; - for (level = lowest_level; - level < (highest_level - pd_index); level++) + for (level = lowest_level; level < (highest_level - pd_index); + level++) { pd = pd->parent; + } } - if (composite_state_operation) + if (composite_state_operation) { state = get_level_state_from_composite_state( state_mask_table, composite_state, level); - else + } else { state = composite_state; + } - if (state == pd->requested_state) + if (state == pd->requested_state) { continue; + } /* * Check that the requested power state is compatible with the states @@ -825,8 +851,9 @@ static void process_set_state_request( break; } - if (!is_allowed_by_children(pd, state)) + if (!is_allowed_by_children(pd, state)) { continue; + } /* * A new valid power state is requested for the power domain. Send any @@ -836,8 +863,9 @@ static void process_set_state_request( pd->power_state_pre_transition_notification_ctx.valid = false; respond(pd, FWK_E_OVERWRITTEN); - if (pd->state_requested_to_driver == state) + if (pd->state_requested_to_driver == state) { continue; + } /* * The driver must be called thus the processing of the set state @@ -856,8 +884,9 @@ static void process_set_state_request( * now. It will be initiated on completion of the transition of one * of its ancestor or descendant. */ - if (first_power_state_transition_initiated) - continue; + if (first_power_state_transition_initiated) { + continue; + } /* * If the parent or a child is not currently in a power state @@ -865,15 +894,17 @@ static void process_set_state_request( * initiate the transition now as well. It will be initiated when the * parent and the children are in a proper state. */ - if (!is_allowed_by_parent_and_children(pd, state)) - continue; + if (!is_allowed_by_parent_and_children(pd, state)) { + continue; + } /* * Defer the power state transition if power state pre-transition * notification responses need to be waited for. */ - if (initiate_power_state_pre_transition_notification(pd)) + if (initiate_power_state_pre_transition_notification(pd)) { continue; + } status = initiate_power_state_transition(pd); if (status != FWK_SUCCESS) { @@ -888,8 +919,9 @@ static void process_set_state_request( first_power_state_transition_initiated = true; } - if (!event->response_requested) + if (!event->response_requested) { return; + } if (pd_in_charge_of_response != NULL) { resp_event->is_delayed_response = true; @@ -925,8 +957,9 @@ static int complete_system_suspend(struct pd_ctx *target_pd) const uint32_t *state_mask_table; int table_size; - if (!pd->cs_support) + if (!pd->cs_support) { return FWK_E_PARAM; + } state_mask_table = pd->composite_state_mask_table; table_size = pd->composite_state_mask_table_size; @@ -983,9 +1016,9 @@ static void process_get_state_request(struct pd_ctx *pd, const uint32_t *state_mask_table; int table_size, cs_idx = 0; - if (!pd->cs_support) + if (!pd->cs_support) { resp_params->state = pd->current_state; - else { + } else { state_mask_table = pd->composite_state_mask_table; table_size = pd->composite_state_mask_table_size; @@ -1032,15 +1065,17 @@ static void process_reset_request(struct pd_ctx *pd, struct fwk_slist *c_node = NULL; status = FWK_E_PWRSTATE; - if (pd->requested_state == MOD_PD_STATE_OFF) + if (pd->requested_state == MOD_PD_STATE_OFF) { goto exit; + } FWK_LIST_FOR_EACH( &pd->children_list, c_node, struct pd_ctx, child_node, child) { if ((child->requested_state != MOD_PD_STATE_OFF) || - (child->current_state != MOD_PD_STATE_OFF)) + (child->current_state != MOD_PD_STATE_OFF)) { goto exit; + } } status = pd->driver_api->reset(pd->driver_id); @@ -1061,19 +1096,23 @@ static void process_power_state_transition_report_deeper_state( struct pd_ctx *parent = pd->parent; unsigned int requested_state; - if (parent == NULL) + if (parent == NULL) { return; + } requested_state = parent->requested_state; - if (parent->state_requested_to_driver == requested_state) + if (parent->state_requested_to_driver == requested_state) { return; + } - if (!is_allowed_by_parent_and_children(parent, requested_state)) + if (!is_allowed_by_parent_and_children(parent, requested_state)) { return; + } - if (!initiate_power_state_pre_transition_notification(parent)) + if (!initiate_power_state_pre_transition_notification(parent)) { initiate_power_state_transition(parent); + } } /* @@ -1093,14 +1132,17 @@ static void process_power_state_transition_report_shallower_state( &pd->children_list, c_node, struct pd_ctx, child_node, child) { requested_state = child->requested_state; - if (child->state_requested_to_driver == requested_state) + if (child->state_requested_to_driver == requested_state) { continue; + } - if (!is_allowed_by_parent_and_children(child, requested_state)) + if (!is_allowed_by_parent_and_children(child, requested_state)) { return; + } - if (!initiate_power_state_pre_transition_notification(child)) + if (!initiate_power_state_pre_transition_notification(child)) { initiate_power_state_transition(child); + } } } @@ -1122,8 +1164,9 @@ static void process_power_state_transition_report(struct pd_ctx *pd, }; struct mod_pd_power_state_transition_notification_params *params; - if (new_state == pd->requested_state) + if (new_state == pd->requested_state) { respond(pd, FWK_SUCCESS); + } previous_state = pd->current_state; pd->current_state = new_state; @@ -1170,10 +1213,11 @@ static void process_power_state_transition_report(struct pd_ctx *pd, return; } - if (is_deeper_state(new_state, previous_state)) + if (is_deeper_state(new_state, previous_state)) { process_power_state_transition_report_deeper_state(pd); - else if (is_shallower_state(new_state, previous_state)) + } else if (is_shallower_state(new_state, previous_state)) { process_power_state_transition_report_shallower_state(pd); + } } /* @@ -1200,8 +1244,9 @@ static void process_system_suspend_request( for (pd_idx = 0; pd_idx < mod_pd_ctx.pd_count; pd_idx++) { pd = &mod_pd_ctx.pd_ctx_table[pd_idx]; if ((pd->requested_state == MOD_PD_STATE_OFF) && - (pd->current_state == MOD_PD_STATE_OFF)) + (pd->current_state == MOD_PD_STATE_OFF)) { continue; + } if (pd->config->attributes.pd_type == MOD_PD_TYPE_CORE) { if (last_core_pd != NULL) { @@ -1268,20 +1313,22 @@ void perform_shutdown( } } else { if ((api->deny != NULL) && - api->deny(pd->driver_id, MOD_PD_STATE_OFF)) + api->deny(pd->driver_id, MOD_PD_STATE_OFF)) { status = FWK_E_DEVICE; - else + } else { status = api->set_state(pd->driver_id, MOD_PD_STATE_OFF); + } } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { FWK_LOG_ERR( "[PD] Shutdown of %s returned %s (%d)", fwk_module_get_name(pd_id), fwk_status_str(status), status); - else + } else { FWK_LOG_INFO("[PD] %s shutdown", fwk_module_get_name(pd_id)); + } pd->requested_state = pd->state_requested_to_driver = @@ -1382,11 +1429,13 @@ static int pd_get_domain_type(fwk_id_t pd_id, enum mod_pd_type *type) { struct pd_ctx *pd; - if (type == NULL) + if (type == NULL) { return FWK_E_PARAM; + } - if (!fwk_module_is_valid_element_id(pd_id)) + if (!fwk_module_is_valid_element_id(pd_id)) { return FWK_E_PARAM; + } pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; @@ -1399,11 +1448,13 @@ static int pd_get_domain_parent_id(fwk_id_t pd_id, fwk_id_t *parent_pd_id) { const struct pd_ctx *pd; - if (parent_pd_id == NULL) + if (parent_pd_id == NULL) { return FWK_E_PARAM; + } - if (!fwk_module_is_valid_element_id(pd_id)) + if (!fwk_module_is_valid_element_id(pd_id)) { return FWK_E_PARAM; + } pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; @@ -1428,11 +1479,13 @@ static int pd_set_state(fwk_id_t pd_id, uint32_t state) pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; if (pd->cs_support) { - if (!is_valid_composite_state(pd, state)) + if (!is_valid_composite_state(pd, state)) { return FWK_E_PARAM; + } } else { - if (!is_valid_state(pd, state)) + if (!is_valid_state(pd, state)) { return FWK_E_PARAM; + } } req = (struct fwk_event) { @@ -1445,8 +1498,9 @@ static int pd_set_state(fwk_id_t pd_id, uint32_t state) req_params->composite_state = state; status = fwk_thread_put_event_and_wait(&req, &resp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return resp_params->status; } @@ -1464,11 +1518,13 @@ static int pd_set_state_async( pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(pd_id)]; if (pd->cs_support) { - if (!is_valid_composite_state(pd, state)) + if (!is_valid_composite_state(pd, state)) { return FWK_E_PARAM; + } } else { - if (!is_valid_state(pd, state)) + if (!is_valid_state(pd, state)) { return FWK_E_PARAM; + } } req = (struct fwk_event) { @@ -1494,8 +1550,9 @@ static int pd_get_state(fwk_id_t pd_id, unsigned int *state) struct pd_get_state_response *resp_params = (struct pd_get_state_response *)(&resp.params); - if (state == NULL) + if (state == NULL) { return FWK_E_PARAM; + } req = (struct fwk_event) { .id = FWK_ID_EVENT(FWK_MODULE_IDX_POWER_DOMAIN, @@ -1506,11 +1563,13 @@ static int pd_get_state(fwk_id_t pd_id, unsigned int *state) req_params->composite = false; status = fwk_thread_put_event_and_wait(&req, &resp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (resp_params->status != FWK_SUCCESS) + if (resp_params->status != FWK_SUCCESS) { return resp_params->status; + } *state = resp_params->state; @@ -1530,8 +1589,9 @@ static int pd_reset(fwk_id_t pd_id) }; status = fwk_thread_put_event_and_wait(&req, &resp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return resp_params->status; } @@ -1554,8 +1614,9 @@ static int pd_system_suspend(unsigned int state) req_params->state = state; status = fwk_thread_put_event_and_wait(&req, &resp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return resp_params->status; } @@ -1576,8 +1637,9 @@ static int pd_system_shutdown(enum mod_pd_system_shutdown system_shutdown) req_params->system_shutdown = system_shutdown; status = fwk_thread_put_event(&req); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { return FWK_PENDING; + } return status; } @@ -1630,11 +1692,13 @@ static int pd_report_power_state_transition(fwk_id_t pd_id, unsigned int state) static int pd_get_last_core_pd_id(fwk_id_t *last_core_pd_id) { bool system_suspend_ongoing = mod_pd_ctx.system_suspend.suspend_ongoing; - if (last_core_pd_id == NULL) + if (last_core_pd_id == NULL) { return FWK_E_PARAM; + } - if (!system_suspend_ongoing) + if (!system_suspend_ongoing) { return FWK_E_PWRSTATE; + } *last_core_pd_id = mod_pd_ctx.system_suspend.last_core_pd->id; @@ -1673,14 +1737,16 @@ static const struct mod_pd_driver_input_api pd_driver_input_api = { static int pd_init(fwk_id_t module_id, unsigned int dev_count, const void *data) { - if ((data == NULL) || (dev_count == 0)) + if ((data == NULL) || (dev_count == 0)) { return FWK_E_PARAM; + } mod_pd_ctx.config = (struct mod_power_domain_config *)data; if ((mod_pd_ctx.config->authorized_id_table == NULL) && - (mod_pd_ctx.config->authorized_id_table_size != 0)) + (mod_pd_ctx.config->authorized_id_table_size != 0)) { return FWK_E_PARAM; + } mod_pd_ctx.pd_ctx_table = fwk_mm_calloc(dev_count, sizeof(struct pd_ctx)); @@ -1702,20 +1768,22 @@ static int pd_power_domain_init(fwk_id_t pd_id, unsigned int unused, fwk_list_init(&pd->children_list); - if (pd_config->attributes.pd_type >= - MOD_PD_TYPE_COUNT) + if (pd_config->attributes.pd_type >= MOD_PD_TYPE_COUNT) { return FWK_E_PARAM; + } if ((pd_config->allowed_state_mask_table == NULL) || - (pd_config->allowed_state_mask_table_size == 0)) + (pd_config->allowed_state_mask_table_size == 0)) { return FWK_E_PARAM; + } pd->allowed_state_mask_table = pd_config->allowed_state_mask_table; pd->allowed_state_mask_table_size = pd_config->allowed_state_mask_table_size; - for (state = 0; state < pd->allowed_state_mask_table_size; state++) + for (state = 0; state < pd->allowed_state_mask_table_size; state++) { pd->valid_state_mask |= pd->allowed_state_mask_table[state]; + } if ((pd_config->composite_state_mask_table != NULL) && (pd_config->composite_state_mask_table_size > 0)) { @@ -1734,8 +1802,9 @@ static int pd_power_domain_init(fwk_id_t pd_id, unsigned int unused, << MOD_PD_CS_LEVEL_SHIFT; pd->cs_support = true; - } else + } else { pd->cs_support = false; + } pd->id = pd_id; pd->config = pd_config; @@ -1748,8 +1817,9 @@ static int pd_post_init(fwk_id_t module_id) int status; status = connect_pd_tree(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -1762,26 +1832,29 @@ static int pd_bind(fwk_id_t id, unsigned int round) struct mod_pd_driver_api *driver_api = NULL; /* Nothing to do but during the first round of calls */ - if (round != 0) + if (round != 0) { return FWK_SUCCESS; + } - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(id)]; config = pd->config; status = fwk_module_bind(config->driver_id, config->api_id, &driver_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } pd->driver_id = config->driver_id; - if ((driver_api->set_state == NULL) || - (driver_api->get_state == NULL) || + if ((driver_api->set_state == NULL) || (driver_api->get_state == NULL) || (driver_api->reset == NULL) || ((config->attributes.pd_type == MOD_PD_TYPE_CORE) && - (driver_api->prepare_core_for_system_suspend == NULL))) + (driver_api->prepare_core_for_system_suspend == NULL))) { return FWK_E_PARAM; + } pd->driver_api = driver_api; @@ -1796,8 +1869,9 @@ static int pd_start(fwk_id_t id) unsigned int state; /* Nothing to do for elements */ - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { return FWK_SUCCESS; + } for (index = mod_pd_ctx.pd_count - 1; index >= 0; index--) { pd = &mod_pd_ctx.pd_ctx_table[index]; @@ -1812,8 +1886,9 @@ static int pd_start(fwk_id_t id) * this case. */ if ((pd->parent != NULL) && - (pd->parent->requested_state == MOD_PD_STATE_OFF)) + (pd->parent->requested_state == MOD_PD_STATE_OFF)) { continue; + } /* Get the current power state of the power domain from its driver. */ status = pd->driver_api->get_state(pd->driver_id, &state); @@ -1827,8 +1902,9 @@ static int pd_start(fwk_id_t id) } else { pd->requested_state = pd->state_requested_to_driver = state; - if (state == MOD_PD_STATE_OFF) + if (state == MOD_PD_STATE_OFF) { continue; + } report_power_state_transition(pd, state); } @@ -1845,14 +1921,16 @@ static int pd_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, switch (fwk_id_get_api_idx(api_id)) { case MOD_PD_API_IDX_PUBLIC: - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_MODULE)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_MODULE)) { return FWK_E_ACCESS; + } *api = &pd_public_api; break; case MOD_PD_API_IDX_RESTRICTED: - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_MODULE)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_MODULE)) { return FWK_E_ACCESS; + } if (mod_pd_ctx.config->authorized_id_table_size == 0) { *api = &pd_restricted_api; return FWK_SUCCESS; @@ -1870,11 +1948,13 @@ static int pd_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, return FWK_E_ACCESS; case MOD_PD_API_IDX_DRIVER_INPUT: - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_ACCESS; + } pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(target_id)]; - if (!fwk_id_is_equal(source_id, pd->driver_id)) + if (!fwk_id_is_equal(source_id, pd->driver_id)) { return FWK_E_ACCESS; + } *api = &pd_driver_input_api; break; @@ -1890,8 +1970,9 @@ static int pd_process_event(const struct fwk_event *event, { struct pd_ctx *pd = NULL; - if (fwk_id_is_type(event->target_id, FWK_ID_TYPE_ELEMENT)) + if (fwk_id_is_type(event->target_id, FWK_ID_TYPE_ELEMENT)) { pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(event->target_id)]; + } switch (fwk_id_get_event_idx(event->id)) { case MOD_PD_PUBLIC_EVENT_IDX_SET_STATE: @@ -1976,8 +2057,10 @@ static int process_power_state_pre_transition_notification_response( } pd->power_state_pre_transition_notification_ctx.pending_responses--; - if (pd->power_state_pre_transition_notification_ctx.pending_responses != 0) + if (pd->power_state_pre_transition_notification_ctx.pending_responses != + 0) { return FWK_SUCCESS; + } if (pd->power_state_pre_transition_notification_ctx.valid == true) { /* @@ -1987,8 +2070,9 @@ static int process_power_state_pre_transition_notification_response( * transition, proceed with it. */ if (pd->power_state_pre_transition_notification_ctx.response_status == - FWK_SUCCESS) + FWK_SUCCESS) { initiate_power_state_transition(pd); + } } else { /* * All the notification responses have been received but the @@ -1996,11 +2080,13 @@ static int process_power_state_pre_transition_notification_response( * processings for the new requested state. */ if ((pd->requested_state == pd->state_requested_to_driver) || - (!is_allowed_by_parent_and_children(pd, pd->requested_state))) + (!is_allowed_by_parent_and_children(pd, pd->requested_state))) { return FWK_SUCCESS; + } - if (!initiate_power_state_pre_transition_notification(pd)) + if (!initiate_power_state_pre_transition_notification(pd)) { initiate_power_state_transition(pd); + } } return FWK_SUCCESS; @@ -2017,8 +2103,9 @@ static int process_power_state_transition_notification_response( } pd->power_state_transition_notification_ctx.pending_responses--; - if (pd->power_state_transition_notification_ctx.pending_responses != 0) + if (pd->power_state_transition_notification_ctx.pending_responses != 0) { return FWK_SUCCESS; + } if (pd->power_state_transition_notification_ctx.state == pd->current_state) { @@ -2032,10 +2119,11 @@ static int process_power_state_transition_notification_response( /* * Complete the report state change now that we have all notifications */ - if (is_deeper_state(pd->current_state, previous_state)) + if (is_deeper_state(pd->current_state, previous_state)) { process_power_state_transition_report_deeper_state(pd); - else if (is_shallower_state(pd->current_state, previous_state)) + } else if (is_shallower_state(pd->current_state, previous_state)) { process_power_state_transition_report_shallower_state(pd); + } return FWK_SUCCESS; } @@ -2070,8 +2158,9 @@ static int pd_process_notification(const struct fwk_event *event, return FWK_E_SUPPORT; } - if (fwk_id_is_equal(event->id, mod_pd_notification_id_pre_shutdown)) + if (fwk_id_is_equal(event->id, mod_pd_notification_id_pre_shutdown)) { return process_pre_shutdown_notification_response(); + } if (!fwk_module_is_valid_element_id(event->target_id)) { fwk_unexpected(); @@ -2080,9 +2169,10 @@ static int pd_process_notification(const struct fwk_event *event, pd = &mod_pd_ctx.pd_ctx_table[fwk_id_get_element_idx(event->target_id)]; - if (fwk_id_is_equal(event->id, - mod_pd_notification_id_power_state_transition)) + if (fwk_id_is_equal( + event->id, mod_pd_notification_id_power_state_transition)) { return process_power_state_transition_notification_response(pd); + } return process_power_state_pre_transition_notification_response(pd, (struct mod_pd_power_state_pre_transition_notification_resp_params *) diff --git a/module/power_domain/src/power_domain_utils.c b/module/power_domain/src/power_domain_utils.c index d867e7d5664557465043dd16cdec909010e81e9e..b920d7c39dca4e18a3a07dfb1558e900ede5f27b 100644 --- a/module/power_domain/src/power_domain_utils.c +++ b/module/power_domain/src/power_domain_utils.c @@ -46,8 +46,9 @@ static int create_core_cluster_pd_element_table( pd_config_table = fwk_mm_calloc( core_count + cluster_count, sizeof(struct mod_power_domain_element_config)); - if (pd_config_table == NULL) + if (pd_config_table == NULL) { return FWK_E_NOMEM; + } for (cluster_idx = 0; cluster_idx < cluster_count; cluster_idx++) { for (core_idx = 0; core_idx < cores_per_clusters; core_idx++) { @@ -105,15 +106,17 @@ const struct fwk_element *create_power_domain_element_table( int status; if ((core_count % cluster_count != 0) || (core_count > MAX_CORES_COUNT) || - (static_table_size > MAX_STATIC_ELEMENTS_COUNT)) + (static_table_size > MAX_STATIC_ELEMENTS_COUNT)) { return NULL; + } element_table = fwk_mm_calloc( core_count + cluster_count + static_table_size + 1, /* Terminator */ sizeof(struct fwk_element)); - if (element_table == NULL) + if (element_table == NULL) { return element_table; + } status = create_core_cluster_pd_element_table( element_table, @@ -126,8 +129,9 @@ const struct fwk_element *create_power_domain_element_table( cluster_state_table, cluster_state_table_size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return NULL; + } memcpy( element_table + (core_count + cluster_count), diff --git a/module/psu/src/mod_psu.c b/module/psu/src/mod_psu.c index 205aed96f8eead531127fcc662fbdd761bce6b7c..eb854048157a84ffeddd8df7bd31be771f3c30fd 100644 --- a/module/psu/src/mod_psu.c +++ b/module/psu/src/mod_psu.c @@ -58,14 +58,17 @@ static int mod_psu_get_cfg_ctx( const struct mod_psu_element_cfg **cfg, struct mod_psu_element_ctx **ctx) { - if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_PSU) + if (fwk_id_get_module_idx(element_id) != FWK_MODULE_IDX_PSU) { return FWK_E_PARAM; + } - if (ctx != NULL) + if (ctx != NULL) { *ctx = mod_psu_get_element_ctx(element_id); + } - if (cfg != NULL) + if (cfg != NULL) { *cfg = fwk_module_get_data(element_id); + } return FWK_SUCCESS; } @@ -78,8 +81,9 @@ static int mod_psu_get_enabled(fwk_id_t element_id, bool *enabled) struct mod_psu_element_ctx *ctx; status = mod_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (ctx->op.state != MOD_PSU_STATE_IDLE) { status = FWK_E_BUSY; @@ -101,10 +105,12 @@ static int mod_psu_get_enabled(fwk_id_t element_id, bool *enabled) ctx->op.state = MOD_PSU_STATE_BUSY; status = FWK_PENDING; - } else + } else { status = FWK_E_STATE; - } else if (status != FWK_SUCCESS) + } + } else if (status != FWK_SUCCESS) { status = FWK_E_HANDLER; + } exit: return status; @@ -118,8 +124,9 @@ static int mod_psu_set_enabled(fwk_id_t element_id, bool enabled) struct mod_psu_element_ctx *ctx; status = mod_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (ctx->op.state != MOD_PSU_STATE_IDLE) { status = FWK_E_BUSY; @@ -141,10 +148,12 @@ static int mod_psu_set_enabled(fwk_id_t element_id, bool enabled) ctx->op.state = MOD_PSU_STATE_BUSY; status = FWK_PENDING; - } else + } else { status = FWK_E_STATE; - } else if (status != FWK_SUCCESS) + } + } else if (status != FWK_SUCCESS) { status = FWK_E_HANDLER; + } exit: return status; @@ -158,8 +167,9 @@ static int mod_psu_get_voltage(fwk_id_t element_id, uint32_t *voltage) struct mod_psu_element_ctx *ctx; status = mod_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (ctx->op.state != MOD_PSU_STATE_IDLE) { status = FWK_E_BUSY; @@ -181,10 +191,12 @@ static int mod_psu_get_voltage(fwk_id_t element_id, uint32_t *voltage) ctx->op.state = MOD_PSU_STATE_BUSY; status = FWK_PENDING; - } else + } else { status = FWK_E_STATE; - } else if (status != FWK_SUCCESS) + } + } else if (status != FWK_SUCCESS) { status = FWK_E_HANDLER; + } exit: return status; @@ -198,8 +210,9 @@ static int mod_psu_set_voltage(fwk_id_t element_id, uint32_t voltage) struct mod_psu_element_ctx *ctx; status = mod_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (ctx->op.state != MOD_PSU_STATE_IDLE) { status = FWK_E_BUSY; @@ -221,10 +234,12 @@ static int mod_psu_set_voltage(fwk_id_t element_id, uint32_t voltage) ctx->op.state = MOD_PSU_STATE_BUSY; status = FWK_PENDING; - } else + } else { status = FWK_E_STATE; - } else if (status != FWK_SUCCESS) + } + } else if (status != FWK_SUCCESS) { status = FWK_E_HANDLER; + } exit: return status; @@ -249,8 +264,9 @@ static void mod_psu_respond( struct fwk_event event; status = mod_psu_get_cfg_ctx(element_id, &cfg, &ctx); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return; + } event = (struct fwk_event){ .id = mod_psu_impl_event_id_response, @@ -262,8 +278,9 @@ static void mod_psu_respond( memcpy(event.params, &response, sizeof(response)); status = fwk_thread_put_event(&event); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { ctx->op.state = MOD_PSU_STATE_IDLE; + } } static const struct mod_psu_driver_response_api mod_psu_driver_response_api = { @@ -310,15 +327,17 @@ static int mod_psu_bind_element(fwk_id_t element_id, unsigned int round) const struct mod_psu_element_ctx *ctx; const struct mod_psu_element_cfg *cfg; - if (round > 0) + if (round > 0) { goto exit; + } ctx = mod_psu_get_element_ctx(element_id); cfg = fwk_module_get_data(element_id); status = fwk_module_bind(cfg->driver_id, cfg->driver_api_id, &ctx->driver); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if ((ctx->driver->set_enabled == NULL) || (ctx->driver->get_enabled == NULL) || @@ -333,8 +352,9 @@ exit: static int mod_psu_bind(fwk_id_t id, unsigned int round) { - if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return mod_psu_bind_element(id, round); + } return FWK_SUCCESS; } @@ -345,8 +365,9 @@ static int mod_psu_process_bind_request( fwk_id_t api_id, const void **api) { - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_PARAM; + } switch (fwk_id_get_api_idx(api_id)) { case MOD_PSU_API_IDX_DEVICE: @@ -383,8 +404,9 @@ static int mod_psu_process_event( resp_params->status = mod_psu_get_cfg_ctx(event->target_id, &cfg, &ctx); - if (resp_params->status != FWK_SUCCESS) + if (resp_params->status != FWK_SUCCESS) { goto exit; + } switch (fwk_id_get_event_idx(event->id)) { case MOD_PSU_EVENT_IDX_GET_ENABLED: @@ -404,8 +426,9 @@ static int mod_psu_process_event( event->target_id, ctx->op.cookie, &hal_event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } *hal_params = (struct mod_psu_response){ .status = params->status, diff --git a/module/reg_sensor/src/mod_reg_sensor.c b/module/reg_sensor/src/mod_reg_sensor.c index 5f45a0b1527794ac59af31df5a04fd2bacd72d4a..02a0c96288f3ef793fdd3dd5231b92de722cfdec 100644 --- a/module/reg_sensor/src/mod_reg_sensor.c +++ b/module/reg_sensor/src/mod_reg_sensor.c @@ -45,8 +45,9 @@ static int get_info(fwk_id_t id, struct mod_sensor_info *info) config = config_table[fwk_id_get_element_idx(id)]; fwk_assert(config != NULL); - if (info == NULL) + if (info == NULL) { return FWK_E_PARAM; + } *info = *(config->info); @@ -77,8 +78,9 @@ static int reg_sensor_element_init(fwk_id_t element_id, struct mod_reg_sensor_dev_config *config = (struct mod_reg_sensor_dev_config *)data; - if (config->reg == 0) + if (config->reg == 0) { return FWK_E_DATA; + } config_table[fwk_id_get_element_idx(element_id)] = config; diff --git a/module/scmi/src/mod_scmi.c b/module/scmi/src/mod_scmi.c index 3c186367fe3a82aa7fd2d004a72fae7714daae30..e6386cbc7c09832487e5fe1383766e4c526357c5 100644 --- a/module/scmi/src/mod_scmi.c +++ b/module/scmi/src/mod_scmi.c @@ -303,8 +303,9 @@ static const struct mod_scmi_from_transport_api mod_scmi_from_transport_api = { static int get_agent_count(int *agent_count) { - if (agent_count == NULL) + if (agent_count == NULL) { return FWK_E_PARAM; + } /* Include the platform in the count */ *agent_count = scmi_ctx.config->agent_count + 1; @@ -317,8 +318,9 @@ static int get_agent_id(fwk_id_t service_id, unsigned int *agent_id) { struct scmi_service_ctx *ctx; - if (agent_id == NULL) + if (agent_id == NULL) { return FWK_E_PARAM; + } ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(service_id)]; @@ -332,8 +334,9 @@ static int get_agent_type(uint32_t scmi_agent_id, { if ((agent_type == NULL) || (scmi_agent_id > scmi_ctx.config->agent_count) || - (scmi_agent_id == MOD_SCMI_PLATFORM_ID)) + (scmi_agent_id == MOD_SCMI_PLATFORM_ID)) { return FWK_E_PARAM; + } *agent_type = scmi_ctx.config->agent_table[scmi_agent_id].type; @@ -344,8 +347,9 @@ static int get_max_payload_size(fwk_id_t service_id, size_t *size) { struct scmi_service_ctx *ctx; - if (size == NULL) + if (size == NULL) { return FWK_E_PARAM; + } ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(service_id)]; @@ -428,20 +432,24 @@ static void scmi_notify(fwk_id_t id, int protocol_id, int message_id, * the agent used to request notificatiosn on. This ID is * linked to a P2A channel by the scmi_p2a_id. */ - if (fwk_id_is_equal(id, FWK_ID_NONE)) + if (fwk_id_is_equal(id, FWK_ID_NONE)) { return; + } ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(id)]; - if (ctx == NULL) + if (ctx == NULL) { return; + } /* ctx is the original A2P service channel */ - if (fwk_id_is_equal(ctx->config->scmi_p2a_id, FWK_ID_NONE)) + if (fwk_id_is_equal(ctx->config->scmi_p2a_id, FWK_ID_NONE)) { return; + } /* Get the P2A service channel for A2P ctx */ p2a_ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx( ctx->config->scmi_p2a_id)]; - if ((p2a_ctx == NULL) || (p2a_ctx->transmit == NULL)) + if ((p2a_ctx == NULL) || (p2a_ctx->transmit == NULL)) { return; /* No notification service configured */ + } message_header = scmi_message_header(message_id, MOD_SCMI_MESSAGE_TYPE_NOTIFICATION, @@ -705,8 +713,9 @@ static int scmi_base_protocol_attributes_handler(fwk_id_t service_id, #endif status = get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #ifdef BUILD_HAS_MOD_RESOURCE_PERMS for (index = 0, protocol_count = 0, global_protocol_count = 0; @@ -714,8 +723,9 @@ static int scmi_base_protocol_attributes_handler(fwk_id_t service_id, (global_protocol_count < scmi_ctx.protocol_count); index++) { if ((scmi_ctx.scmi_protocol_id_to_idx[index] == 0) || - (index == MOD_SCMI_PROTOCOL_ID_BASE)) + (index == MOD_SCMI_PROTOCOL_ID_BASE)) { continue; + } protocol_id = index; @@ -725,15 +735,17 @@ static int scmi_base_protocol_attributes_handler(fwk_id_t service_id, perms = scmi_ctx.res_perms_api->agent_has_protocol_permission( agent_id, protocol_id); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { protocol_count++; + } global_protocol_count++; } #else status = get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* * PSCI agents are only allowed access to certain protocols defined @@ -744,8 +756,9 @@ static int scmi_base_protocol_attributes_handler(fwk_id_t service_id, scmi_ctx.protocol_count > scmi_ctx.config->dis_protocol_count_psci); protocol_count = scmi_ctx.protocol_count - scmi_ctx.config->dis_protocol_count_psci; - } else + } else { protocol_count = scmi_ctx.protocol_count; + } #endif struct scmi_protocol_attributes_p2a return_values = { @@ -776,8 +789,9 @@ static int scmi_base_protocol_message_attributes_handler(fwk_id_t service_id, message_id = parameters->message_id; if ((message_id < FWK_ARRAY_SIZE(base_handler_table)) && - (base_handler_table[message_id] != NULL)) + (base_handler_table[message_id] != NULL)) { return_values.status = SCMI_SUCCESS; + } /* For this protocol, all commands have an attributes value of 0, which * has already been set by the initialization of "return_values". @@ -800,10 +814,11 @@ static int scmi_base_discover_vendor_handler(fwk_id_t service_id, .status = SCMI_SUCCESS, }; - if (scmi_ctx.config->vendor_identifier != NULL) + if (scmi_ctx.config->vendor_identifier != NULL) { strncpy(return_values.vendor_identifier, scmi_ctx.config->vendor_identifier, sizeof(return_values.vendor_identifier) - 1); + } respond(service_id, &return_values, sizeof(return_values)); @@ -820,10 +835,11 @@ static int scmi_base_discover_sub_vendor_handler(fwk_id_t service_id, .status = SCMI_SUCCESS, }; - if (scmi_ctx.config->sub_vendor_identifier != NULL) + if (scmi_ctx.config->sub_vendor_identifier != NULL) { strncpy(return_values.sub_vendor_identifier, scmi_ctx.config->sub_vendor_identifier, sizeof(return_values.sub_vendor_identifier) - 1); + } respond(service_id, &return_values, sizeof(return_values)); @@ -876,18 +892,21 @@ static int scmi_base_discover_list_protocols_handler(fwk_id_t service_id, unsigned int agent_id; status = get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } #ifndef BUILD_HAS_MOD_RESOURCE_PERMS status = get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } #endif status = get_max_payload_size(service_id, &max_payload_size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } if (max_payload_size < (sizeof(struct scmi_base_discover_list_protocols_p2a) @@ -917,10 +936,11 @@ static int scmi_base_discover_list_protocols_handler(fwk_id_t service_id, protocol_count_max = (protocol_count_psci < (skip + entry_count)) ? protocol_count_psci : (skip + entry_count); - } else + } else { protocol_count_max = (scmi_ctx.protocol_count < (skip + entry_count)) ? scmi_ctx.protocol_count : (skip + entry_count); + } #endif for (index = 0, @@ -930,8 +950,9 @@ static int scmi_base_discover_list_protocols_handler(fwk_id_t service_id, (protocol_count < protocol_count_max); index++) { if ((scmi_ctx.scmi_protocol_id_to_idx[index] == 0) || - (index == MOD_SCMI_PROTOCOL_ID_BASE)) + (index == MOD_SCMI_PROTOCOL_ID_BASE)) { continue; + } protocol_id = index; @@ -970,28 +991,32 @@ static int scmi_base_discover_list_protocols_handler(fwk_id_t service_id, scmi_ctx.config->dis_protocol_count_psci; dis_protocol_list_psci_index++) { if (protocol_id == - scmi_ctx.config - ->dis_protocol_list_psci[dis_protocol_list_psci_index]) + scmi_ctx.config->dis_protocol_list_psci + [dis_protocol_list_psci_index]) { break; + } } /* * don't include the protocol in case it is in the disabled list */ if (dis_protocol_list_psci_index != - scmi_ctx.config->dis_protocol_count_psci) + scmi_ctx.config->dis_protocol_count_psci) { continue; + } } #endif protocol_count++; - if (protocol_count <= skip) + if (protocol_count <= skip) { continue; + } status = write_payload(service_id, payload_size, &protocol_id, sizeof(protocol_id)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } payload_size += sizeof(protocol_id); avail_protocol_count++; } @@ -1006,8 +1031,9 @@ static int scmi_base_discover_list_protocols_handler(fwk_id_t service_id, status = write_payload(service_id, 0, &return_values, sizeof(return_values)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } payload_size = FWK_ALIGN_NEXT(payload_size, sizeof(uint32_t)); @@ -1044,11 +1070,13 @@ static int scmi_base_discover_agent_handler(fwk_id_t service_id, #if (SCMI_PROTOCOL_VERSION_BASE >= UINT32_C(0x20000)) if ((parameters->agent_id > scmi_ctx.config->agent_count) && - (parameters->agent_id != 0xFFFFFFFF)) + (parameters->agent_id != 0xFFFFFFFF)) { goto exit; + } #else - if (parameters->agent_id > scmi_ctx.config->agent_count) + if (parameters->agent_id > scmi_ctx.config->agent_count) { goto exit; + } #endif return_values.status = SCMI_SUCCESS; @@ -1078,8 +1106,9 @@ static int scmi_base_discover_agent_handler(fwk_id_t service_id, */ status = get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_ACCESS; + } return_values.agent_id = (uint32_t)agent_id; @@ -1258,8 +1287,9 @@ static int scmi_base_reset_agent_config( parameters = (const struct scmi_base_reset_agent_config_a2p *)payload; - if (parameters->agent_id > scmi_ctx.config->agent_count) + if (parameters->agent_id > scmi_ctx.config->agent_count) { goto exit; + } if (parameters->agent_id == MOD_SCMI_PLATFORM_ID) { return_values.status = SCMI_SUCCESS; @@ -1313,11 +1343,13 @@ static int scmi_base_permissions_handler( int status; status = get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_ACCESS; + } - if (message_id < 3) + if (message_id < 3) { return FWK_SUCCESS; + } /* * Check that the agent has permissions to access the message. @@ -1325,10 +1357,11 @@ static int scmi_base_permissions_handler( perms = scmi_ctx.res_perms_api->agent_has_message_permission( agent_id, MOD_SCMI_PROTOCOL_ID_BASE, message_id); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; - else + } else { return FWK_E_ACCESS; + } } #endif @@ -1380,12 +1413,14 @@ static int scmi_init(fwk_id_t module_id, unsigned int service_count, unsigned int agent_idx; const struct mod_scmi_agent *agent; - if (config == NULL) + if (config == NULL) { return FWK_E_PARAM; + } if ((config->agent_count == 0) || - (config->agent_count > MOD_SCMI_AGENT_ID_MAX)) + (config->agent_count > MOD_SCMI_AGENT_ID_MAX)) { return FWK_E_PARAM; + } /* * Loop over the agent descriptors. The MOD_SCMI_PLATFORM_ID(0) entry of @@ -1395,8 +1430,9 @@ static int scmi_init(fwk_id_t module_id, unsigned int service_count, agent_idx <= config->agent_count; agent_idx++) { agent = &config->agent_table[agent_idx]; - if (agent->type >= SCMI_AGENT_TYPE_COUNT) + if (agent->type >= SCMI_AGENT_TYPE_COUNT) { return FWK_E_PARAM; + } } scmi_ctx.protocol_table = fwk_mm_calloc( @@ -1424,8 +1460,9 @@ static int scmi_service_init(fwk_id_t service_id, unsigned int unused, struct scmi_service_ctx *ctx; if ((config->scmi_agent_id == MOD_SCMI_PLATFORM_ID) || - (config->scmi_agent_id > scmi_ctx.config->agent_count)) + (config->scmi_agent_id > scmi_ctx.config->agent_count)) { return FWK_E_PARAM; + } ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(service_id)]; ctx->config = config; @@ -1448,21 +1485,24 @@ static int scmi_bind(fwk_id_t id, unsigned int round) uint8_t scmi_protocol_id; if (round == 0) { - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(id)]; status = fwk_module_bind(ctx->config->transport_id, ctx->config->transport_api_id, &transport_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if ((transport_api->get_secure == NULL) || (transport_api->get_max_payload_size == NULL) || (transport_api->get_message_header == NULL) || (transport_api->get_payload == NULL) || - (transport_api->write_payload == NULL)) + (transport_api->write_payload == NULL)) { return FWK_E_DATA; + } ctx->transport_api = transport_api; ctx->transport_id = ctx->config->transport_id; @@ -1472,8 +1512,9 @@ static int scmi_bind(fwk_id_t id, unsigned int round) return FWK_SUCCESS; } - if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return FWK_SUCCESS; + } for (protocol_idx = 0; protocol_idx < scmi_ctx.protocol_count; protocol_idx++) { @@ -1482,19 +1523,23 @@ static int scmi_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(protocol->id, FWK_ID_API(fwk_id_get_module_idx(protocol->id), 0), &protocol_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if ((protocol_api->get_scmi_protocol_id == NULL) || - (protocol_api->message_handler == NULL)) + (protocol_api->message_handler == NULL)) { return FWK_E_DATA; + } status = protocol_api->get_scmi_protocol_id(protocol->id, &scmi_protocol_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (scmi_ctx.scmi_protocol_id_to_idx[scmi_protocol_id] != 0) + if (scmi_ctx.scmi_protocol_id_to_idx[scmi_protocol_id] != 0) { return FWK_E_STATE; + } scmi_ctx.scmi_protocol_id_to_idx[scmi_protocol_id] = protocol_idx + PROTOCOL_TABLE_RESERVED_ENTRIES_COUNT; @@ -1506,8 +1551,9 @@ static int scmi_bind(fwk_id_t id, unsigned int round) FWK_ID_MODULE(FWK_MODULE_IDX_RESOURCE_PERMS), FWK_ID_API(FWK_MODULE_IDX_RESOURCE_PERMS, MOD_RES_PERM_RESOURCE_PERMS), &scmi_ctx.res_perms_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #endif return FWK_SUCCESS; @@ -1523,11 +1569,13 @@ static int scmi_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, switch (api_idx) { case MOD_SCMI_API_IDX_PROTOCOL: - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_MODULE)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_MODULE)) { return FWK_E_SUPPORT; + } - if (scmi_ctx.protocol_count >= scmi_ctx.config->protocol_count_max) + if (scmi_ctx.protocol_count >= scmi_ctx.config->protocol_count_max) { return FWK_E_NOMEM; + } scmi_ctx.protocol_table[PROTOCOL_TABLE_RESERVED_ENTRIES_COUNT + scmi_ctx.protocol_count++].id = source_id; @@ -1535,12 +1583,14 @@ static int scmi_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, break; case MOD_SCMI_API_IDX_TRANSPORT: - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_SUPPORT; + } ctx = &scmi_ctx.service_ctx_table[fwk_id_get_element_idx(target_id)]; - if (!fwk_id_is_equal(source_id, ctx->transport_id)) + if (!fwk_id_is_equal(source_id, ctx->transport_id)) { return FWK_E_ACCESS; + } *api = &mod_scmi_from_transport_api; break; @@ -1737,8 +1787,9 @@ static int scmi_process_notification(const struct fwk_event *event, fwk_assert(fwk_id_is_type(event->target_id, FWK_ID_TYPE_ELEMENT)); config = fwk_module_get_data(event->target_id); - if (config == NULL) + if (config == NULL) { return FWK_E_PARAM; + } fwk_assert(fwk_id_is_equal(event->id, config->transport_notification_init_id)); diff --git a/module/scmi_apcore/src/mod_scmi_apcore.c b/module/scmi_apcore/src/mod_scmi_apcore.c index e4ee8610921144949ef9f7a0e1f9e4b5f225b158..7d23c081d13333348c8c2b09928a5ea4d6d610b5 100644 --- a/module/scmi_apcore/src/mod_scmi_apcore.c +++ b/module/scmi_apcore/src/mod_scmi_apcore.c @@ -144,9 +144,10 @@ static int scmi_apcore_protocol_attributes_handler(fwk_id_t service_id, }; if (scmi_apcore_ctx.config->reset_register_width == - MOD_SCMI_APCORE_REG_WIDTH_64) + MOD_SCMI_APCORE_REG_WIDTH_64) { return_values.attributes |= MOD_SCMI_APCORE_PROTOCOL_ATTRIBUTES_64BIT_MASK; + } scmi_apcore_ctx.scmi_api->respond( service_id, @@ -175,8 +176,9 @@ static int scmi_apcore_protocol_message_attributes_handler(fwk_id_t service_id, message_id = parameters->message_id; if ((message_id >= FWK_ARRAY_SIZE(handler_table)) || - (handler_table[message_id] == NULL)) + (handler_table[message_id] == NULL)) { return_values.status = SCMI_NOT_FOUND; + } response_size = (return_values.status == SCMI_SUCCESS) ? sizeof(return_values) : sizeof(return_values.status); @@ -204,12 +206,14 @@ static int scmi_apcore_reset_address_set_handler(fwk_id_t service_id, parameters = (const struct scmi_apcore_reset_address_set_a2p *)payload; status = scmi_apcore_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_apcore_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* Only the PSCI agent may set the reset address */ if (agent_type != SCMI_AGENT_TYPE_PSCI) { @@ -248,14 +252,16 @@ static int scmi_apcore_reset_address_set_handler(fwk_id_t service_id, status = set_reset_address( parameters->reset_address_low, parameters->reset_address_high); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } return_values.status = SCMI_SUCCESS; /* Lock the configuration if requested */ - if (parameters->attributes & MOD_SCMI_APCORE_RESET_ADDRESS_SET_LOCK_MASK) + if (parameters->attributes & MOD_SCMI_APCORE_RESET_ADDRESS_SET_LOCK_MASK) { scmi_apcore_ctx.locked = true; + } exit: scmi_apcore_ctx.scmi_api->respond( @@ -279,12 +285,14 @@ static int scmi_apcore_reset_address_get_handler(fwk_id_t service_id, }; status = scmi_apcore_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_apcore_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* Only the PSCI agent may get the current reset address */ if (agent_type != SCMI_AGENT_TYPE_PSCI) { @@ -377,14 +385,18 @@ static int scmi_apcore_init(fwk_id_t module_id, unsigned int element_count, const struct mod_scmi_apcore_config *config = (const struct mod_scmi_apcore_config *)data; - if (config == NULL) + if (config == NULL) { return FWK_E_PARAM; - if (config->reset_register_group_table == NULL) + } + if (config->reset_register_group_table == NULL) { return FWK_E_PARAM; - if (config->reset_register_group_count == 0) + } + if (config->reset_register_group_count == 0) { return FWK_E_PARAM; - if (config->reset_register_width >= MOD_SCMI_APCORE_REG_WIDTH_COUNT) + } + if (config->reset_register_width >= MOD_SCMI_APCORE_REG_WIDTH_COUNT) { return FWK_E_PARAM; + } scmi_apcore_ctx.config = config; @@ -393,8 +405,9 @@ static int scmi_apcore_init(fwk_id_t module_id, unsigned int element_count, static int scmi_apcore_bind(fwk_id_t id, unsigned int round) { - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } /* Bind to the SCMI module, storing an API pointer for later use. */ return fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), @@ -406,8 +419,9 @@ static int scmi_apcore_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, fwk_id_t api_id, const void **api) { /* Only accept binding requests from the SCMI module. */ - if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) + if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) { return FWK_E_ACCESS; + } *api = &scmi_apcore_mod_scmi_to_protocol_api; diff --git a/module/scmi_clock/src/mod_scmi_clock.c b/module/scmi_clock/src/mod_scmi_clock.c index 43eeee5b1d3768f742489fd48aef8c96ae08e3a2..61563c2d908a0b3d356c44677f75bd694d643717 100644 --- a/module/scmi_clock/src/mod_scmi_clock.c +++ b/module/scmi_clock/src/mod_scmi_clock.c @@ -164,15 +164,18 @@ static int get_agent_entry( int status; unsigned int agent_id; - if (agent == NULL) + if (agent == NULL) { return FWK_E_PARAM; + } status = scmi_clock_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (agent_id >= scmi_clock_ctx.config->agent_count) + if (agent_id >= scmi_clock_ctx.config->agent_count) { return FWK_E_PARAM; + } *agent = (struct mod_scmi_clock_agent *)&scmi_clock_ctx.agent_table[agent_id]; @@ -194,22 +197,26 @@ static int get_clock_device_entry( int status; const struct mod_scmi_clock_agent *agent_entry; - if (clock_device == NULL) + if (clock_device == NULL) { return FWK_E_PARAM; + } status = get_agent_entry(service_id, &agent_entry); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (clock_idx >= agent_entry->device_count) + if (clock_idx >= agent_entry->device_count) { return FWK_E_RANGE; + } *clock_device = &agent_entry->device_table[clock_idx]; fwk_assert(fwk_module_is_valid_element_id((*clock_device)->element_id)); - if (agent != NULL) + if (agent != NULL) { *agent = agent_entry; + } return FWK_SUCCESS; } @@ -230,15 +237,18 @@ static int get_agent_clock_state( int status; status = get_agent_entry(service_id, &agent_entry); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (clock_idx >= agent_entry->device_count) + if (clock_idx >= agent_entry->device_count) { return FWK_E_RANGE; + } status = scmi_clock_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } idx = (agent_id * scmi_clock_ctx.clock_devices) + clock_idx; @@ -263,15 +273,18 @@ static int set_agent_clock_state( int status; status = get_agent_entry(service_id, &agent_entry); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (clock_idx >= agent_entry->device_count) + if (clock_idx >= agent_entry->device_count) { return FWK_E_RANGE; + } status = scmi_clock_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } idx = (agent_id * scmi_clock_ctx.clock_devices) + clock_idx; @@ -394,11 +407,13 @@ static void request_response(int response_status, .status = SCMI_GENERIC_ERROR }; - if (response_status == FWK_E_SUPPORT) + if (response_status == FWK_E_SUPPORT) { return_values.status = SCMI_NOT_SUPPORTED; + } - if (response_status == FWK_E_RANGE) + if (response_status == FWK_E_RANGE) { return_values.status = SCMI_INVALID_PARAMETERS; + } scmi_clock_ctx.scmi_api->respond(service_id, &return_values, @@ -412,14 +427,15 @@ static void set_request_respond(fwk_id_t service_id, int status) { struct scmi_clock_generic_p2a return_values = { 0 }; - if (status == FWK_E_RANGE || status == FWK_E_PARAM) + if (status == FWK_E_RANGE || status == FWK_E_PARAM) { return_values.status = SCMI_INVALID_PARAMETERS; - else if (status == FWK_E_SUPPORT) + } else if (status == FWK_E_SUPPORT) { return_values.status = SCMI_NOT_SUPPORTED; - else if (status != FWK_SUCCESS) + } else if (status != FWK_SUCCESS) { return_values.status = SCMI_GENERIC_ERROR; - else + } else { return_values.status = SCMI_SUCCESS; + } scmi_clock_ctx.scmi_api->respond(service_id, &return_values, @@ -493,8 +509,9 @@ FWK_WEAK int mod_scmi_clock_config_set_policy( */ status = get_agent_clock_state( &clock_state, service_id, clock_dev_id, agent_clock_state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } switch (*state) { case MOD_CLOCK_STATE_RUNNING: @@ -519,10 +536,12 @@ FWK_WEAK int mod_scmi_clock_config_set_policy( * * This is the first agent to set the clock RUNNING. */ - if (clock_count[clock_dev_id] != 0) + if (clock_count[clock_dev_id] != 0) { status = FWK_E_STATE; - if (policy_commit == MOD_SCMI_CLOCK_POST_MESSAGE_HANDLER) + } + if (policy_commit == MOD_SCMI_CLOCK_POST_MESSAGE_HANDLER) { clock_count[clock_dev_id]++; + } break; case MOD_CLOCK_STATE_STOPPED: @@ -558,18 +577,21 @@ FWK_WEAK int mod_scmi_clock_config_set_policy( * * This is the last agent to set the clock STOPPED. */ - if (clock_count[clock_dev_id] != 1) + if (clock_count[clock_dev_id] != 1) { status = FWK_E_STATE; - if (policy_commit == MOD_SCMI_CLOCK_POST_MESSAGE_HANDLER) + } + if (policy_commit == MOD_SCMI_CLOCK_POST_MESSAGE_HANDLER) { clock_count[clock_dev_id]--; + } break; default: return FWK_E_PARAM; } - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { *policy_status = MOD_SCMI_CLOCK_EXECUTE_MESSAGE_HANDLER; + } return FWK_SUCCESS; } @@ -620,14 +642,16 @@ static int scmi_clock_permissions_handler( int status; status = scmi_clock_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_ACCESS; + } if (message_id < 3) { perms = scmi_clock_ctx.res_perms_api->agent_has_protocol_permission( agent_id, MOD_SCMI_PROTOCOL_ID_CLOCK); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; + } return FWK_E_ACCESS; } @@ -636,10 +660,11 @@ static int scmi_clock_permissions_handler( perms = scmi_clock_ctx.res_perms_api->agent_has_resource_permission( agent_id, MOD_SCMI_PROTOCOL_ID_CLOCK, message_id, clock_id); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; - else + } else { return FWK_E_ACCESS; + } } #endif @@ -660,8 +685,9 @@ static int create_event_request( struct event_request_params *params; enum mod_clock_state state = MOD_CLOCK_STATE_COUNT; - if (!clock_ops_is_available(clock_dev_idx)) + if (!clock_ops_is_available(clock_dev_idx)) { return FWK_E_BUSY; + } struct fwk_event event = { .target_id = fwk_module_id_scmi_clock, @@ -713,8 +739,9 @@ static int create_event_request( params->clock_dev_id = clock_id; status = fwk_thread_put_event(&event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } clock_ops_set_busy(clock_dev_idx, service_id, clock_idx, state, request); @@ -836,8 +863,9 @@ static int scmi_clock_attributes_handler(fwk_id_t service_id, goto exit; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } return FWK_SUCCESS; @@ -886,8 +914,9 @@ static int scmi_clock_rate_get_handler(fwk_id_t service_id, goto exit; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } return FWK_SUCCESS; @@ -946,8 +975,9 @@ static int scmi_clock_rate_set_handler(fwk_id_t service_id, } status = scmi_clock_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } rate = ((uint64_t)(parameters->rate[1]) << 32) | (uint64_t)parameters->rate[0]; @@ -993,8 +1023,9 @@ static int scmi_clock_rate_set_handler(fwk_id_t service_id, goto exit; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } return FWK_SUCCESS; @@ -1045,8 +1076,9 @@ static int scmi_clock_config_set_handler(fwk_id_t service_id, }; status = scmi_clock_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* * Note that data.state may be modified by the policy handler. @@ -1078,8 +1110,9 @@ static int scmi_clock_config_set_handler(fwk_id_t service_id, goto exit; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } return FWK_SUCCESS; @@ -1133,13 +1166,15 @@ static int scmi_clock_describe_rates_handler(fwk_id_t service_id, */ status = scmi_clock_ctx.scmi_api->get_max_payload_size( service_id, &max_payload_size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_clock_ctx.clock_api->get_info(clock_device->element_id, &info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (info.range.rate_type == MOD_CLOCK_RATE_TYPE_DISCRETE) { /* The clock has a discrete list of frequencies */ @@ -1187,16 +1222,18 @@ static int scmi_clock_describe_rates_handler(fwk_id_t service_id, clock_device->element_id, index + i, &rate); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } scmi_rate.low = (uint32_t)rate; scmi_rate.high = (uint32_t)(rate >> 32); status = scmi_clock_ctx.scmi_api->write_payload(service_id, payload_size, &scmi_rate, sizeof(scmi_rate)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } } } else { /* The clock has a linear stepping */ @@ -1225,8 +1262,9 @@ static int scmi_clock_describe_rates_handler(fwk_id_t service_id, status = scmi_clock_ctx.scmi_api->write_payload(service_id, payload_size, &clock_range, sizeof(clock_range)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } payload_size += sizeof(clock_range); } @@ -1310,16 +1348,18 @@ static int scmi_clock_init(fwk_id_t module_id, unsigned int element_count, const struct mod_scmi_clock_config *config = (const struct mod_scmi_clock_config *)data; - if ((config == NULL) || (config->agent_table == NULL)) + if ((config == NULL) || (config->agent_table == NULL)) { return FWK_E_PARAM; + } scmi_clock_ctx.config = config; scmi_clock_ctx.max_pending_transactions = config->max_pending_transactions; scmi_clock_ctx.agent_table = config->agent_table; clock_devices = fwk_module_get_element_count(fwk_module_id_clock); - if (clock_devices == FWK_E_PARAM) + if (clock_devices == FWK_E_PARAM) { return FWK_E_PANIC; + } scmi_clock_ctx.clock_devices = clock_devices; @@ -1329,8 +1369,9 @@ static int scmi_clock_init(fwk_id_t module_id, unsigned int element_count, sizeof(struct clock_operations)); /* Initialize table */ - for (unsigned int i = 0; i < (unsigned int)clock_devices; i++) + for (unsigned int i = 0; i < (unsigned int)clock_devices; i++) { scmi_clock_ctx.clock_ops[i].service_id = FWK_ID_NONE; + } return FWK_SUCCESS; } @@ -1339,22 +1380,25 @@ static int scmi_clock_bind(fwk_id_t id, unsigned int round) { int status; - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), FWK_ID_API(FWK_MODULE_IDX_SCMI, MOD_SCMI_API_IDX_PROTOCOL), &scmi_clock_ctx.scmi_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #ifdef BUILD_HAS_MOD_RESOURCE_PERMS status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_RESOURCE_PERMS), FWK_ID_API(FWK_MODULE_IDX_RESOURCE_PERMS, MOD_RES_PERM_RESOURCE_PERMS), &scmi_clock_ctx.res_perms_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #endif return fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_CLOCK), @@ -1364,8 +1408,9 @@ static int scmi_clock_bind(fwk_id_t id, unsigned int round) static int scmi_clock_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, fwk_id_t api_id, const void **api) { - if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) + if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) { return FWK_E_ACCESS; + } *api = &scmi_clock_mod_scmi_to_protocol_api; @@ -1443,11 +1488,13 @@ static int process_request_event(const struct fwk_event *event) return FWK_E_PARAM; } - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { clock_ops_set_available(clock_dev_idx); + } return status; } @@ -1464,9 +1511,9 @@ static int process_response_event(const struct fwk_event *event) clock_dev_idx = fwk_id_get_element_idx(event->source_id); service_id = clock_ops_get_service(clock_dev_idx); - if (params->status != FWK_SUCCESS) + if (params->status != FWK_SUCCESS) { request_response(params->status, service_id); - else { + } else { switch (fwk_id_get_event_idx(event->id)) { case MOD_CLOCK_EVENT_IDX_GET_STATE_REQUEST: clock_state = params->value.state; diff --git a/module/scmi_perf/src/mod_scmi_perf.c b/module/scmi_perf/src/mod_scmi_perf.c index bb986d7da949072e4cee6175928ba8250e053f48..04a9212ff616f3b7ba5885707a9b67a40a22b5a7 100644 --- a/module/scmi_perf/src/mod_scmi_perf.c +++ b/module/scmi_perf/src/mod_scmi_perf.c @@ -212,8 +212,9 @@ static int get_perf_domain_id(const uint32_t *payload, unsigned int *domain_id) const struct scmi_perf_limits_get_a2p *parameters = (const struct scmi_perf_limits_get_a2p *)payload; - if (parameters->domain_id >= scmi_perf_ctx.domain_count) + if (parameters->domain_id >= scmi_perf_ctx.domain_count) { return FWK_E_PARAM; + } *domain_id = parameters->domain_id; return FWK_SUCCESS; @@ -229,8 +230,9 @@ static int scmi_perf_permissions_handler( int status; status = scmi_perf_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_ACCESS; + } if (message_id < 3) { perms = scmi_perf_ctx.res_perms_api->agent_has_protocol_permission( @@ -241,16 +243,18 @@ static int scmi_perf_permissions_handler( } status = get_perf_domain_id(payload, &domain_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PARAM; + } perms = scmi_perf_ctx.res_perms_api->agent_has_resource_permission( agent_id, MOD_SCMI_PROTOCOL_ID_PERF, message_id, domain_id); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; - else + } else { return FWK_E_ACCESS; + } } #endif @@ -312,8 +316,9 @@ static int scmi_perf_protocol_message_attributes_handler(fwk_id_t service_id, return_values = (struct scmi_protocol_message_attributes_p2a) { .status = SCMI_SUCCESS, }; - } else + } else { return_values.status = SCMI_NOT_FOUND; + } return_values.attributes = 0; #ifdef BUILD_HAS_FAST_CHANNELS @@ -355,8 +360,9 @@ static int scmi_perf_domain_attributes_handler(fwk_id_t service_id, } status = scmi_perf_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } #ifndef BUILD_HAS_MOD_RESOURCE_PERMS permissions = ((uint32_t)MOD_SCMI_PERF_PERMS_SET_LIMITS) | @@ -374,8 +380,9 @@ static int scmi_perf_domain_attributes_handler(fwk_id_t service_id, domain_id = FWK_ID_ELEMENT(FWK_MODULE_IDX_DVFS, parameters->domain_id); status = scmi_perf_ctx.dvfs_api->get_sustained_opp(domain_id, &opp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } #ifdef BUILD_HAS_SCMI_NOTIFICATIONS notifications = true; @@ -439,13 +446,15 @@ static int scmi_perf_describe_levels_handler(fwk_id_t service_id, status = scmi_perf_ctx.scmi_api->get_max_payload_size(service_id, &max_payload_size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = (SCMI_PERF_LEVELS_MAX(max_payload_size) > 0) ? FWK_SUCCESS : FWK_E_SIZE; - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } parameters = (const struct scmi_perf_describe_levels_a2p *)payload; @@ -459,8 +468,9 @@ static int scmi_perf_describe_levels_handler(fwk_id_t service_id, /* Get the number of operating points for the domain */ domain_id = FWK_ID_ELEMENT(FWK_MODULE_IDX_DVFS, parameters->domain_id); status = scmi_perf_ctx.dvfs_api->get_opp_count(domain_id, &opp_count); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* Validate level index */ level_index = parameters->level_index; @@ -479,8 +489,9 @@ static int scmi_perf_describe_levels_handler(fwk_id_t service_id, level_index_max = (level_index + num_levels - 1); status = scmi_perf_ctx.dvfs_api->get_latency(domain_id, &latency); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* Copy DVFS data into returned data structure */ for (; level_index <= level_index_max; level_index++, @@ -488,20 +499,23 @@ static int scmi_perf_describe_levels_handler(fwk_id_t service_id, status = scmi_perf_ctx.dvfs_api->get_nth_opp( domain_id, level_index, &opp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } - if (opp.power != 0) + if (opp.power != 0) { perf_level.power_cost = opp.power; - else + } else { perf_level.power_cost = opp.voltage; + } perf_level.performance_level = opp.level; perf_level.attributes = latency; status = scmi_perf_ctx.scmi_api->write_payload(service_id, payload_size, &perf_level, sizeof(perf_level)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } } return_values = (struct scmi_perf_describe_levels_p2a) { @@ -546,8 +560,9 @@ static int scmi_perf_limits_set_handler(fwk_id_t service_id, } status = scmi_perf_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (parameters->range_min > parameters->range_max) { return_values.status = SCMI_INVALID_PARAMETERS; @@ -579,10 +594,11 @@ static int scmi_perf_limits_set_handler(fwk_id_t service_id, * Return immediately to the caller, fire-and-forget. */ - if ((status == FWK_SUCCESS) || (status == FWK_PENDING)) + if ((status == FWK_SUCCESS) || (status == FWK_PENDING)) { return_values.status = SCMI_SUCCESS; - else + } else { return_values.status = SCMI_OUT_OF_RANGE; + } exit: scmi_perf_ctx.scmi_api->respond(service_id, &return_values, @@ -673,8 +689,9 @@ static int scmi_perf_level_set_handler(fwk_id_t service_id, } status = scmi_perf_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* * Note that the policy handler may change the performance level @@ -698,10 +715,11 @@ static int scmi_perf_level_set_handler(fwk_id_t service_id, /* * Return immediately to the caller, fire-and-forget. */ - if ((status == FWK_SUCCESS) || (status == FWK_PENDING)) + if ((status == FWK_SUCCESS) || (status == FWK_PENDING)) { return_values.status = SCMI_SUCCESS; - else if (status == FWK_E_RANGE) + } else if (status == FWK_E_RANGE) { return_values.status = SCMI_OUT_OF_RANGE; + } exit: scmi_perf_ctx.scmi_api->respond(service_id, &return_values, @@ -1216,8 +1234,9 @@ static void scmi_perf_notify_level_updated( if (domain->fast_channels_addr_scp != 0x0) { get_level = (uint32_t *)((uintptr_t)domain->fast_channels_addr_scp [MOD_SCMI_PERF_FAST_CHANNEL_LEVEL_GET]); - if (get_level != 0x0) /* note: get_level may not be defined */ + if (get_level != 0x0) { /* note: get_level may not be defined */ *get_level = level; + } } #ifdef BUILD_HAS_SCMI_NOTIFICATIONS @@ -1250,13 +1269,15 @@ static int scmi_perf_init(fwk_id_t module_id, unsigned int element_count, const struct mod_scmi_perf_config *config = (const struct mod_scmi_perf_config *)data; - if ((config == NULL) || (config->domains == NULL)) + if ((config == NULL) || (config->domains == NULL)) { return FWK_E_PARAM; + } return_val = fwk_module_get_element_count( FWK_ID_MODULE(FWK_MODULE_IDX_DVFS)); - if (return_val <= 0) + if (return_val <= 0) { return FWK_E_SUPPORT; + } scmi_perf_ctx.perf_ops_table = fwk_mm_calloc(return_val, sizeof(struct perf_operations)); @@ -1273,9 +1294,9 @@ static int scmi_perf_init(fwk_id_t module_id, unsigned int element_count, #endif /* Initialize table */ - for (i = 0; i < return_val; i++) + for (i = 0; i < return_val; i++) { scmi_perf_ctx.perf_ops_table[i].service_id = FWK_ID_NONE; - + } return FWK_SUCCESS; } @@ -1306,14 +1327,16 @@ static int scmi_perf_bind(fwk_id_t id, unsigned int round) { int status; - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), FWK_ID_API(FWK_MODULE_IDX_SCMI, MOD_SCMI_API_IDX_PROTOCOL), &scmi_perf_ctx.scmi_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #ifdef BUILD_HAS_SCMI_NOTIFICATIONS status = fwk_module_bind( @@ -1596,13 +1619,15 @@ static int scmi_perf_process_event(const struct fwk_event *event, { /* Request events from SCMI */ if (fwk_id_get_module_idx(event->source_id) == - fwk_id_get_module_idx(fwk_module_id_scmi)) + fwk_id_get_module_idx(fwk_module_id_scmi)) { return process_request_event(event); + } /* Response events from DVFS */ if (fwk_id_get_module_idx(event->source_id) == - fwk_id_get_module_idx(fwk_module_id_dvfs)) + fwk_id_get_module_idx(fwk_module_id_dvfs)) { return process_response_event(event); + } return FWK_E_PARAM; } diff --git a/module/scmi_power_domain/src/mod_scmi_power_domain.c b/module/scmi_power_domain/src/mod_scmi_power_domain.c index 5ac1624e810a9b0d441a878bf93dbecab05654c4..d544730d9c927e207763d372fc6d195a3476fc9a 100644 --- a/module/scmi_power_domain/src/mod_scmi_power_domain.c +++ b/module/scmi_power_domain/src/mod_scmi_power_domain.c @@ -250,10 +250,11 @@ static int scmi_device_state_to_pd_state(uint32_t scmi_state, scmi_state_id = scmi_state & SCMI_PD_DEVICE_STATE_ID_MASK; if (scmi_state_id == SCMI_PD_DEVICE_STATE_ID) { - if (ctx_lost) + if (ctx_lost) { *pd_state = MOD_PD_STATE_OFF; - else + } else { *pd_state = MOD_PD_STATE_ON; + } } else { /* Implementation Defined state */ *pd_state = scmi_state; @@ -265,10 +266,11 @@ static int scmi_device_state_to_pd_state(uint32_t scmi_state, static int pd_state_to_scmi_device_state(unsigned int pd_state, uint32_t *scmi_state) { - if (pd_state == MOD_PD_STATE_OFF || pd_state == MOD_PD_STATE_ON) + if (pd_state == MOD_PD_STATE_OFF || pd_state == MOD_PD_STATE_ON) { *scmi_state = pd_state_to_scmi_dev_state[pd_state]; - else + } else { *scmi_state = pd_state; + } return FWK_SUCCESS; } @@ -331,16 +333,19 @@ static int scmi_pd_power_domain_attributes_handler(fwk_id_t service_id, } status = scmi_pd_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_pd_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_pd_ctx.pd_api->get_domain_type(pd_id, &pd_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } switch (pd_type) { case MOD_PD_TYPE_CORE: @@ -350,8 +355,9 @@ static int scmi_pd_power_domain_attributes_handler(fwk_id_t service_id, * that the command is not supported either synchronously nor * asynchronously. */ - if (agent_type == SCMI_AGENT_TYPE_PSCI) + if (agent_type == SCMI_AGENT_TYPE_PSCI) { return_values.attributes = SCMI_PD_POWER_STATE_SET_ASYNC; + } break; case MOD_PD_TYPE_CLUSTER: @@ -361,8 +367,9 @@ static int scmi_pd_power_domain_attributes_handler(fwk_id_t service_id, * that the command is not supported either synchronously nor * asynchronously. */ - if (agent_type == SCMI_AGENT_TYPE_PSCI) + if (agent_type == SCMI_AGENT_TYPE_PSCI) { return_values.attributes = SCMI_PD_POWER_STATE_SET_SYNC; + } break; case MOD_PD_TYPE_DEVICE_DEBUG: @@ -412,8 +419,9 @@ static int scmi_pd_protocol_message_attributes_handler( payload; if ((parameters->message_id < FWK_ARRAY_SIZE(handler_table)) && - (handler_table[parameters->message_id] != NULL)) + (handler_table[parameters->message_id] != NULL)) { return_values.status = SCMI_SUCCESS; + } scmi_pd_ctx.scmi_api->respond(service_id, &return_values, (return_values.status == SCMI_SUCCESS) ? @@ -486,12 +494,14 @@ static int scmi_pd_power_state_set_handler(fwk_id_t service_id, (uint32_t)0); status = scmi_pd_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_pd_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } domain_idx = parameters->domain_id; if (domain_idx > UINT16_MAX) { @@ -515,8 +525,9 @@ static int scmi_pd_power_state_set_handler(fwk_id_t service_id, } status = scmi_pd_ctx.pd_api->get_domain_type(pd_id, &pd_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (((pd_type == MOD_PD_TYPE_CORE) || (pd_type == MOD_PD_TYPE_CLUSTER)) && @@ -546,8 +557,9 @@ static int scmi_pd_power_state_set_handler(fwk_id_t service_id, * by the specification. */ status = scmi_power_scp_set_core_state(pd_id, power_state); - if (status == FWK_E_PARAM) + if (status == FWK_E_PARAM) { return_values.status = SCMI_INVALID_PARAMETERS; + } break; case MOD_PD_TYPE_CLUSTER: @@ -601,18 +613,20 @@ static int scmi_pd_power_state_set_handler(fwk_id_t service_id, ops_set_agent_id(pd_id, agent_id); status = fwk_thread_put_event(&event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } if (scmi_pd_ctx.debug_pd_state_notification_enabled == false) { status = fwk_notification_subscribe( mod_pd_notification_id_power_state_transition, pd_id, fwk_module_id_scmi_power_domain); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; - else + } else { scmi_pd_ctx.debug_pd_state_notification_enabled = true; + } } ops_set_busy(pd_id, service_id); @@ -670,8 +684,9 @@ static int scmi_pd_power_state_set_handler(fwk_id_t service_id, goto exit; } - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { return_values.status = SCMI_SUCCESS; + } exit: scmi_pd_ctx.scmi_api->respond(service_id, &return_values, @@ -714,8 +729,9 @@ static int scmi_pd_power_state_get_handler(fwk_id_t service_id, } status = scmi_pd_ctx.pd_api->get_domain_type(pd_id, &pd_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } switch (pd_type) { case MOD_PD_TYPE_CORE: @@ -735,8 +751,9 @@ static int scmi_pd_power_state_get_handler(fwk_id_t service_id, event_params->pd_id = pd_id; status = fwk_thread_put_event(&event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } ops_set_busy(pd_id, service_id); @@ -745,8 +762,9 @@ static int scmi_pd_power_state_get_handler(fwk_id_t service_id, case MOD_PD_TYPE_DEVICE: status = scmi_pd_ctx.pd_api->get_state(pd_id, &pd_power_state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = pd_state_to_scmi_device_state(pd_power_state, (uint32_t *) &power_state); @@ -940,8 +958,9 @@ static int scmi_pd_permissions_handler( if (message_id < 3) { perms = scmi_pd_ctx.res_perms_api->agent_has_protocol_permission( agent_id, MOD_SCMI_PROTOCOL_ID_POWER_DOMAIN); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; + } return FWK_E_ACCESS; } @@ -966,8 +985,9 @@ static int scmi_pd_permissions_handler( perms = scmi_pd_ctx.res_perms_api->agent_has_resource_permission( agent_id, MOD_SCMI_PROTOCOL_ID_POWER_DOMAIN, message_id, domain_id); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; + } *return_values = SCMI_DENIED; return FWK_E_ACCESS; @@ -1012,8 +1032,9 @@ static int scmi_pd_message_handler(fwk_id_t protocol_id, fwk_id_t service_id, #ifdef BUILD_HAS_MOD_RESOURCE_PERMS status = scmi_pd_permissions_handler( service_id, payload, payload_size, message_id, &return_value); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } #endif return handler_table[message_id](service_id, payload); @@ -1040,42 +1061,49 @@ static int scmi_pd_init(fwk_id_t module_id, unsigned int element_count, struct mod_scmi_pd_config *config = (struct mod_scmi_pd_config *)data; #endif - if (element_count != 0) + if (element_count != 0) { return FWK_E_SUPPORT; + } scmi_pd_ctx.domain_count = fwk_module_get_element_count( fwk_module_id_power_domain); - if (scmi_pd_ctx.domain_count <= 1) + if (scmi_pd_ctx.domain_count <= 1) { return FWK_E_SUPPORT; + } /* Do not expose SYSTEM domain (always the last one) to agents and ... */ scmi_pd_ctx.domain_count--; /* ... and expose no more than 0xFFFF number of domains. */ - if (scmi_pd_ctx.domain_count > UINT16_MAX) + if (scmi_pd_ctx.domain_count > UINT16_MAX) { scmi_pd_ctx.domain_count = UINT16_MAX; + } #ifdef BUILD_HAS_MOD_DEBUG - if (config == NULL) + if (config == NULL) { return FWK_E_PARAM; + } if (fwk_module_is_valid_element_id(config->debug_id) || fwk_module_is_valid_element_id(config->debug_pd_id)) { scmi_pd_ctx.debug_pd_id = config->debug_pd_id; scmi_pd_ctx.debug_id = config->debug_id; - } else + } else { return FWK_E_DATA; - #endif + } +#endif /* Allocate a table of scmi_pd operations */ scmi_pd_ctx.ops = fwk_mm_calloc(scmi_pd_ctx.domain_count, sizeof(struct scmi_pd_operations)); - if (scmi_pd_ctx.ops == NULL) + if (scmi_pd_ctx.ops == NULL) { return FWK_E_NOMEM; + } /* Initialize table */ - for (unsigned int i = 0; i < scmi_pd_ctx.domain_count; i++) + for (unsigned int i = 0; i < scmi_pd_ctx.domain_count; i++) { scmi_pd_ctx.ops[i].service_id = FWK_ID_NONE; + } return FWK_SUCCESS; } @@ -1107,14 +1135,16 @@ static int scmi_pd_bind(fwk_id_t id, unsigned int round) { int status; - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), FWK_ID_API(FWK_MODULE_IDX_SCMI, MOD_SCMI_API_IDX_PROTOCOL), &scmi_pd_ctx.scmi_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #ifdef BUILD_HAS_SCMI_NOTIFICATIONS status = fwk_module_bind( @@ -1129,17 +1159,19 @@ static int scmi_pd_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(scmi_pd_ctx.debug_id, FWK_ID_API(FWK_MODULE_IDX_DEBUG, MOD_DEBUG_API_IDX_HAL), &scmi_pd_ctx.debug_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - #endif + } +#endif #ifdef BUILD_HAS_MOD_RESOURCE_PERMS status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_RESOURCE_PERMS), FWK_ID_API(FWK_MODULE_IDX_RESOURCE_PERMS, MOD_RES_PERM_RESOURCE_PERMS), &scmi_pd_ctx.res_perms_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #endif return fwk_module_bind(fwk_module_id_power_domain, mod_pd_api_id_restricted, @@ -1149,8 +1181,9 @@ static int scmi_pd_bind(fwk_id_t id, unsigned int round) static int scmi_pd_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, fwk_id_t api_id, const void **api) { - if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) + if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) { return FWK_E_ACCESS; + } *api = &scmi_pd_mod_scmi_to_protocol_api; @@ -1187,8 +1220,9 @@ static int process_request_event(const struct fwk_event *event) status = scmi_pd_ctx.debug_api->get_enabled(scmi_pd_ctx.debug_id, &dbg_enabled, SCP_DEBUG_USER_AP); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } retval_get.status = SCMI_SUCCESS; retval_get.power_state = @@ -1205,8 +1239,9 @@ static int process_request_event(const struct fwk_event *event) params->pd_power_state == MOD_PD_STATE_ON, SCP_DEBUG_USER_AP); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { retval_set.status = SCMI_SUCCESS; + } break; @@ -1277,8 +1312,9 @@ static int scmi_pd_process_event(const struct fwk_event *event, module_idx = fwk_id_get_module_idx(event->source_id); - if (module_idx == fwk_id_get_module_idx(fwk_module_id_scmi)) + if (module_idx == fwk_id_get_module_idx(fwk_module_id_scmi)) { return process_request_event(event); + } if (module_idx == fwk_id_get_module_idx(fwk_module_id_debug)) { /* Responses from Debug module */ diff --git a/module/scmi_sensor/src/mod_scmi_sensor.c b/module/scmi_sensor/src/mod_scmi_sensor.c index a47d8ddc86326f32a45ec29ee1c2cdcc632f805b..b2c08ea84154ecaf48e07030d15e7e54df8ee032 100644 --- a/module/scmi_sensor/src/mod_scmi_sensor.c +++ b/module/scmi_sensor/src/mod_scmi_sensor.c @@ -208,8 +208,9 @@ static int scmi_sensor_protocol_msg_attributes_handler(fwk_id_t service_id, /* All commands have an attributes value of 0 */ .attributes = 0, }; - } else + } else { return_values.status = SCMI_NOT_FOUND; + } scmi_sensor_ctx.scmi_api->respond(service_id, &return_values, (return_values.status == SCMI_SUCCESS) ? @@ -238,8 +239,9 @@ static int scmi_sensor_protocol_desc_get_handler(fwk_id_t service_id, status = scmi_sensor_ctx.scmi_api->get_max_payload_size(service_id, &max_payload_size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (SCMI_SENSOR_DESCS_MAX(max_payload_size) == 0) { /* Can't even fit one sensor description in the payload */ @@ -347,8 +349,9 @@ static int scmi_sensor_protocol_desc_get_handler(fwk_id_t service_id, status = scmi_sensor_ctx.scmi_api->write_payload(service_id, 0, &return_values, sizeof(return_values)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return_values.status = SCMI_GENERIC_ERROR; + } goto exit; exit_unexpected: @@ -603,28 +606,32 @@ static int scmi_sensor_permissions_handler( int status; status = scmi_sensor_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_ACCESS; + } if (message_id < 3) { perms = scmi_sensor_ctx.res_perms_api->agent_has_protocol_permission( agent_id, MOD_SCMI_PROTOCOL_ID_SENSOR); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; + } return FWK_E_ACCESS; } sensor_id = get_sensor_id(payload); - if (sensor_id >= scmi_sensor_ctx.sensor_count) + if (sensor_id >= scmi_sensor_ctx.sensor_count) { return FWK_E_PARAM; + } perms = scmi_sensor_ctx.res_perms_api->agent_has_resource_permission( agent_id, MOD_SCMI_PROTOCOL_ID_SENSOR, message_id, sensor_id); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; - else + } else { return FWK_E_ACCESS; + } } #endif @@ -659,12 +666,13 @@ static int scmi_sensor_message_handler(fwk_id_t protocol_id, status = scmi_sensor_permissions_handler( service_id, payload, payload_size, message_id); if (status != FWK_SUCCESS) { - if (status == FWK_E_ACCESS) + if (status == FWK_E_ACCESS) { return_value = SCMI_DENIED; - else if (message_id == MOD_SCMI_SENSOR_DESCRIPTION_GET) + } else if (message_id == MOD_SCMI_SENSOR_DESCRIPTION_GET) { return_value = SCMI_INVALID_PARAMETERS; - else + } else { return_value = SCMI_NOT_FOUND; + } goto error; } #endif @@ -721,13 +729,15 @@ static int scmi_sensor_init(fwk_id_t module_id, scmi_sensor_ctx.sensor_count = fwk_module_get_element_count( FWK_ID_MODULE(FWK_MODULE_IDX_SENSOR)); - if (scmi_sensor_ctx.sensor_count == 0) + if (scmi_sensor_ctx.sensor_count == 0) { return FWK_E_SUPPORT; + } /* SCMI protocol uses a 16 bit number to store the number of sensors. * So expose no more than 0xFFFF number of sensors. */ - if (scmi_sensor_ctx.sensor_count > UINT16_MAX) + if (scmi_sensor_ctx.sensor_count > UINT16_MAX) { scmi_sensor_ctx.sensor_count = UINT16_MAX; + } /* Allocate a table for the sensors state */ scmi_sensor_ctx.sensor_ops_table = @@ -735,8 +745,9 @@ static int scmi_sensor_init(fwk_id_t module_id, sizeof(struct sensor_operations)); /* Initialize the service identifier for each sensor to 'available' */ - for (unsigned int i = 0; i < scmi_sensor_ctx.sensor_count; i++) + for (unsigned int i = 0; i < scmi_sensor_ctx.sensor_count; i++) { scmi_sensor_ctx.sensor_ops_table[i].service_id = FWK_ID_NONE; + } return FWK_SUCCESS; } @@ -767,8 +778,9 @@ static int scmi_sensor_bind(fwk_id_t id, unsigned int round) { int status; - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), FWK_ID_API(FWK_MODULE_IDX_SCMI, @@ -794,8 +806,9 @@ static int scmi_sensor_bind(fwk_id_t id, unsigned int round) FWK_ID_MODULE(FWK_MODULE_IDX_RESOURCE_PERMS), FWK_ID_API(FWK_MODULE_IDX_RESOURCE_PERMS, MOD_RES_PERM_RESOURCE_PERMS), &scmi_sensor_ctx.res_perms_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #endif #ifdef BUILD_HAS_SCMI_NOTIFICATIONS @@ -830,8 +843,9 @@ static int scmi_sensor_process_bind_request(fwk_id_t source_id, { switch (fwk_id_get_api_idx(api_id)) { case SCMI_SENSOR_API_IDX_REQUEST: - if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) + if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) { return FWK_E_ACCESS; + } *api = &scmi_sensor_mod_scmi_to_protocol_api; break; @@ -894,10 +908,11 @@ static int scmi_sensor_process_event(const struct fwk_event *event, .sensor_value_high = (uint32_t)(params->value >> 32), }; - if (params->status == FWK_SUCCESS) + if (params->status == FWK_SUCCESS) { return_values.status = SCMI_SUCCESS; - else + } else { return_values.status = SCMI_HARDWARE_ERROR; + } scmi_sensor_respond(&return_values, event->source_id); } diff --git a/module/scmi_system_power/src/mod_scmi_system_power.c b/module/scmi_system_power/src/mod_scmi_system_power.c index 712fb10f3cd78a6430ff235b673be15410d84525..7dbb1599fa896b44621b6af98f6ee37fd0956b47 100644 --- a/module/scmi_system_power/src/mod_scmi_system_power.c +++ b/module/scmi_system_power/src/mod_scmi_system_power.c @@ -107,8 +107,9 @@ static int system_state_get(enum scmi_system_state *system_state) status = scmi_sys_power_ctx.pd_api->get_state( scmi_sys_power_ctx.system_power_domain_id, &state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } switch (state) { case MOD_PD_STATE_OFF: @@ -281,12 +282,14 @@ static int scmi_sys_power_state_set_handler(fwk_id_t service_id, } status = scmi_sys_power_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_sys_power_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if ((agent_type != SCMI_AGENT_TYPE_PSCI) && (agent_type != SCMI_AGENT_TYPE_MANAGEMENT)) { @@ -328,8 +331,9 @@ static int scmi_sys_power_state_set_handler(fwk_id_t service_id, * the calling agent. This is a fire-and-forget situation. */ return FWK_SUCCESS; - } else + } else { goto exit; + } break; case SCMI_SYSTEM_STATE_SUSPEND: @@ -354,8 +358,9 @@ static int scmi_sys_power_state_set_handler(fwk_id_t service_id, } status = system_state_get((enum scmi_system_state *)&scmi_system_state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if ((scmi_system_state != SCMI_SYSTEM_STATE_SHUTDOWN) && (scmi_system_state != SCMI_SYSTEM_STATE_SUSPEND)) { @@ -367,8 +372,9 @@ static int scmi_sys_power_state_set_handler(fwk_id_t service_id, status = scmi_sys_power_ctx.pd_api->set_state( scmi_sys_power_ctx.config->wakeup_power_domain_id, scmi_sys_power_ctx.config->wakeup_composite_state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } break; default: @@ -414,23 +420,27 @@ static int scmi_sys_power_state_get_handler(fwk_id_t service_id, enum scmi_agent_type agent_type; status = scmi_sys_power_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_sys_power_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } return_values.status = SCMI_NOT_SUPPORTED; - if (scmi_sys_power_ctx.config->system_view == MOD_SCMI_SYSTEM_VIEW_FULL) + if (scmi_sys_power_ctx.config->system_view == MOD_SCMI_SYSTEM_VIEW_FULL) { goto exit; - else { - if (agent_type == SCMI_AGENT_TYPE_PSCI) + } else { + if (agent_type == SCMI_AGENT_TYPE_PSCI) { goto exit; + } status = system_state_get(&system_state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } return_values = (struct scmi_sys_power_state_get_p2a) { .status = SCMI_SUCCESS, @@ -512,23 +522,25 @@ FWK_WEAK int scmi_sys_power_state_set_policy( if (!scmi_sys_power_ctx.start_graceful_process) { /* Only shutdown command is enabled */ - if (*state != SCMI_SYSTEM_STATE_SHUTDOWN) + if (*state != SCMI_SYSTEM_STATE_SHUTDOWN) { return FWK_SUCCESS; + } /* Starting the graceful request process */ scmi_sys_power_ctx.start_graceful_process = true; #ifdef BUILD_HAS_SCMI_NOTIFICATIONS scmi_sys_power_state_notify(service_id, *state, false); #endif - if (scmi_sys_power_ctx.alarm_api) + if (scmi_sys_power_ctx.alarm_api) { scmi_sys_power_ctx.alarm_api->start( scmi_sys_power_ctx.config->alarm_id, scmi_sys_power_ctx.config->graceful_timeout, MOD_TIMER_ALARM_TYPE_ONCE, graceful_timer_callback, *state); - else + } else { graceful_timer_callback(*state); + } } } @@ -551,11 +563,13 @@ static int scmi_sys_power_permissions_handler( int status; status = scmi_sys_power_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_ACCESS; + } - if (message_id < 3) + if (message_id < 3) { return FWK_SUCCESS; + } /* * We check that the agent has permssions to access the command @@ -563,10 +577,11 @@ static int scmi_sys_power_permissions_handler( perms = scmi_sys_power_ctx.res_perms_api->agent_has_message_permission( agent_id, MOD_SCMI_PROTOCOL_ID_BASE, message_id); - if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) + if (perms == MOD_RES_PERMS_ACCESS_ALLOWED) { return FWK_SUCCESS; - else + } else { return FWK_E_ACCESS; + } } #endif @@ -673,35 +688,40 @@ static int scmi_sys_power_bind(fwk_id_t id, unsigned int round) int status; int pd_count; - if (round != 0) + if (round != 0) { return FWK_SUCCESS; + } /* Bind to SCMI module */ status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), FWK_ID_API(FWK_MODULE_IDX_SCMI, MOD_SCMI_API_IDX_PROTOCOL), &scmi_sys_power_ctx.scmi_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #ifdef BUILD_HAS_MOD_RESOURCE_PERMS status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_RESOURCE_PERMS), FWK_ID_API(FWK_MODULE_IDX_RESOURCE_PERMS, MOD_RES_PERM_RESOURCE_PERMS), &scmi_sys_power_ctx.res_perms_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } #endif /* Bind to POWER DOMAIN module */ status = fwk_module_bind(fwk_module_id_power_domain, mod_pd_api_id_restricted, &scmi_sys_power_ctx.pd_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } pd_count = fwk_module_get_element_count(fwk_module_id_power_domain); - if (pd_count <= 0) + if (pd_count <= 0) { return FWK_E_SUPPORT; + } scmi_sys_power_ctx.system_power_domain_id = FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, pd_count - 1); @@ -727,8 +747,9 @@ static int scmi_sys_power_bind(fwk_id_t id, unsigned int round) static int scmi_sys_power_process_bind_request(fwk_id_t source_id, fwk_id_t _target_id, fwk_id_t api_id, const void **api) { - if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) + if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) { return FWK_E_ACCESS; + } *api = &scmi_sys_power_mod_scmi_to_protocol; diff --git a/module/sds/src/mod_sds.c b/module/sds/src/mod_sds.c index 22cc99a34b1ab1961a4b4f4567007f5caca48e9a..db536bc61a4450134ca5b4fc633895e8906f83ec 100644 --- a/module/sds/src/mod_sds.c +++ b/module/sds/src/mod_sds.c @@ -129,25 +129,30 @@ static bool header_is_valid(const volatile struct region_descriptor *region, { const volatile char *region_tail, *struct_tail; - if (header->id == 0) + if (header->id == 0) { return false; /* Zero is not a valid identifier */ + } - if ((header->id >> MOD_SDS_ID_VERSION_MAJOR_POS) == 0) + if ((header->id >> MOD_SDS_ID_VERSION_MAJOR_POS) == 0) { return false; /* 0 is not a valid major version */ + } - if (header->size < MIN_ALIGNED_STRUCT_SIZE) + if (header->size < MIN_ALIGNED_STRUCT_SIZE) { return false; /* Padded structure size is less than the minimum */ + } region_tail = (const volatile char *)region + region->region_size; struct_tail = (const volatile char *)header + sizeof(struct structure_header) + header->size; - if (struct_tail > region_tail) + if (struct_tail > region_tail) { /* Structure exceeds the capacity of the SDS Memory Region */ return false; + } - if ((header->size % MIN_STRUCT_ALIGNMENT) != 0) + if ((header->size % MIN_STRUCT_ALIGNMENT) != 0) { return false; /* Structure does not meet alignment requirements */ + } return true; } @@ -155,11 +160,13 @@ static bool header_is_valid(const volatile struct region_descriptor *region, static bool validate_structure_access(uint32_t structure_size, uint32_t offset, size_t access_size) { - if ((offset >= structure_size) || (access_size > structure_size)) + if ((offset >= structure_size) || (access_size > structure_size)) { return FWK_E_PARAM; + } - if ((structure_size - offset) < access_size) + if ((structure_size - offset) < access_size) { return FWK_E_PARAM; + } return FWK_SUCCESS; } @@ -205,8 +212,9 @@ static int get_structure_info(uint32_t structure_id, for (struct_idx = 0; struct_idx < struct_count; struct_idx++) { current_header = (volatile struct structure_header *)( region_base + offset); - if (!header_is_valid(region_desc, current_header)) + if (!header_is_valid(region_desc, current_header)) { return FWK_E_DATA; + } if (current_header->id == structure_id) { if (structure_base != NULL) { @@ -220,8 +228,9 @@ static int get_structure_info(uint32_t structure_id, offset += current_header->size; offset += sizeof(struct structure_header); - if (offset >= region_size) + if (offset >= region_size) { return FWK_E_RANGE; + } } } @@ -287,8 +296,9 @@ static int struct_alloc(const struct mod_sds_structure_desc *struct_desc) *free_mem_size -= sizeof(*header); /* Zero the memory reserved for the structure, avoiding the header */ - for (unsigned int i = 0; i < padded_size; i++) + for (unsigned int i = 0; i < padded_size; i++) { (*free_mem_base)[i] = 0u; + } *free_mem_base += padded_size; *free_mem_size -= padded_size; @@ -325,11 +335,13 @@ static int reinitialize_memory_region( volatile struct region_descriptor *region_desc; region_desc = (volatile struct region_descriptor *)(region_config->base); - if (region_desc->signature != REGION_SIGNATURE) + if (region_desc->signature != REGION_SIGNATURE) { return FWK_E_DATA; + } - if (region_desc->version_major != SUPPORTED_VERSION_MAJOR) + if (region_desc->version_major != SUPPORTED_VERSION_MAJOR) { return FWK_E_DATA; + } mem_used = sizeof(struct region_descriptor); for (struct_idx = 0; struct_idx < region_desc->structure_count; @@ -337,17 +349,20 @@ static int reinitialize_memory_region( header = (volatile struct structure_header *)( (volatile char *)region_config->base + mem_used); - if (!header_is_valid(region_desc, header)) + if (!header_is_valid(region_desc, header)) { return FWK_E_DATA; /* Unexpected invalid header */ + } mem_used += header->size; mem_used += sizeof(struct structure_header); - if (mem_used > region_desc->region_size) + if (mem_used > region_desc->region_size) { return FWK_E_SIZE; + } } - if (mem_used > region_config->size) + if (mem_used > region_config->size) { return FWK_E_SIZE; + } /* * The SDS memory region size might differ between ROM and RAM images. In @@ -373,8 +388,9 @@ static int create_memory_region(const struct mod_sds_region_desc* region_config, { volatile struct region_descriptor *region_desc; - if (region_config->size < MIN_REGION_SIZE) + if (region_config->size < MIN_REGION_SIZE) { return FWK_E_NOMEM; + } region_desc = (volatile struct region_descriptor *)region_config->base; region_desc->signature = REGION_SIGNATURE; @@ -405,15 +421,18 @@ static int struct_write(uint32_t structure_id, unsigned int offset, /* Look up the Structure Header by its identifier */ status = get_structure_info(structure_id, &header, &structure_base); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = validate_structure_access(header.size, offset, size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - for (unsigned int i = 0; i < size; i++) + for (unsigned int i = 0; i < size; i++) { structure_base[offset + i] = ((const char*)data)[i]; + } return FWK_SUCCESS; } @@ -427,8 +446,9 @@ static int struct_finalize(uint32_t structure_id) /* Check that the structure being finalized exists */ status = get_structure_info(structure_id, &header, &structure_base); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Update the valid flag of the header within the SDS Memory Region */ header_mem = (volatile struct structure_header *)( @@ -445,20 +465,23 @@ static int struct_init(const struct mod_sds_structure_desc *struct_desc) /* If the structure does not already exist, allocate it. */ if (!structure_exists(struct_desc->id)) { status = struct_alloc(struct_desc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } if (struct_desc->payload != NULL) { status = struct_write(struct_desc->id, 0, struct_desc->payload, struct_desc->size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* Finalize the structure immediately if required */ - if (struct_desc->finalize) + if (struct_desc->finalize) { status = struct_finalize(struct_desc->id); + } return status; } @@ -489,8 +512,9 @@ static int init_sds(void) status = reinitialize_memory_region(region_config, region_idx); if (status != FWK_SUCCESS) { status = create_memory_region(region_config, region_idx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } } @@ -500,8 +524,9 @@ static int init_sds(void) fwk_id_build_element_id(fwk_module_id_sds, element_idx)); status = struct_init(struct_desc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return fwk_notification_notify(¬ification_event, ¬ification_count); @@ -514,11 +539,13 @@ static int init_sds(void) static int sds_struct_write(uint32_t structure_id, unsigned int offset, const void *data, size_t size) { - if (data == NULL) + if (data == NULL) { return FWK_E_PARAM; + } - if (size == 0) + if (size == 0) { return FWK_E_PARAM; + } return struct_write(structure_id, offset, data, size); } @@ -530,24 +557,28 @@ static int sds_struct_read(uint32_t structure_id, unsigned int offset, volatile char *structure_base; struct structure_header header; - - if (data == NULL) + if (data == NULL) { return FWK_E_PARAM; + } - if (size == 0) + if (size == 0) { return FWK_E_PARAM; + } /* Check if a structure with this ID exists */ status = get_structure_info(structure_id, &header, &structure_base); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = validate_structure_access(header.size, offset, size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - for (unsigned int i = 0; i < size; i++) + for (unsigned int i = 0; i < size; i++) { ((char*)data)[i] = structure_base[offset + i]; + } return FWK_SUCCESS; } @@ -574,8 +605,9 @@ static int sds_init(fwk_id_t module_id, unsigned int element_count, void *region_base; unsigned int region_idx; - if (data == NULL) + if (data == NULL) { return FWK_E_PANIC; + } config = (const struct mod_sds_config *)data; @@ -583,15 +615,18 @@ static int sds_init(fwk_id_t module_id, unsigned int element_count, for (region_idx = 0; region_idx < config->region_count; region_idx++) { region_base = config->regions[region_idx].base; - if (region_base == NULL) + if (region_base == NULL) { return FWK_E_PARAM; - if (((uintptr_t)region_base % MIN_STRUCT_ALIGNMENT) > 0) + } + if (((uintptr_t)region_base % MIN_STRUCT_ALIGNMENT) > 0) { return FWK_E_PARAM; + } } ctx.regions = fwk_mm_alloc(config->region_count, sizeof(ctx.regions[0])); - if (ctx.regions == NULL) + if (ctx.regions == NULL) { return FWK_E_NOMEM; + } return FWK_SUCCESS; } @@ -605,8 +640,9 @@ static int sds_element_init(fwk_id_t element_id, unsigned int unused, static int sds_process_bind_request(fwk_id_t requester_id, fwk_id_t id, fwk_id_t api_id, const void **api) { - if (!fwk_module_is_valid_module_id(requester_id)) + if (!fwk_module_is_valid_module_id(requester_id)) { return FWK_E_ACCESS; + } *api = &module_api; return FWK_SUCCESS; @@ -618,8 +654,9 @@ static int sds_start(fwk_id_t id) const struct mod_sds_config *config; #endif - if (!fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } #ifdef BUILD_HAS_MOD_CLOCK config = fwk_module_get_data(fwk_module_id_sds); @@ -647,8 +684,9 @@ static int sds_process_notification( fwk_assert(fwk_id_is_type(event->target_id, FWK_ID_TYPE_MODULE)); params = (struct clock_notification_params *)event->params; - if (params->new_state != MOD_CLOCK_STATE_RUNNING) + if (params->new_state != MOD_CLOCK_STATE_RUNNING) { return FWK_SUCCESS; + } return init_sds(); } diff --git a/module/sensor/src/mod_sensor.c b/module/sensor/src/mod_sensor.c index cb3976e7171782354254fb1aa62a29a86c1b94a3..a6f48e14292f70de3f4e4fe00cc403e3c81bea68 100644 --- a/module/sensor/src/mod_sensor.c +++ b/module/sensor/src/mod_sensor.c @@ -32,8 +32,9 @@ static int get_ctx_if_valid_call(fwk_id_t id, { fwk_assert(ctx != NULL); - if (!fwk_expect(data != NULL)) + if (!fwk_expect(data != NULL)) { return FWK_E_PARAM; + } *ctx = ctx_table + fwk_id_get_element_idx(id); @@ -107,12 +108,14 @@ static int get_value(fwk_id_t id, uint64_t *value) struct fwk_event req; status = get_ctx_if_valid_call(id, value, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Concurrent readings are not supported */ - if (ctx->read_busy) + if (ctx->read_busy) { return FWK_E_BUSY; + } status = ctx->driver_api->get_value(ctx->config->driver_id, value); if (status == FWK_PENDING) { @@ -132,8 +135,9 @@ static int get_value(fwk_id_t id, uint64_t *value) * an event. */ return FWK_PENDING; - } else + } else { return status; + } } else if (status == FWK_SUCCESS) { #ifdef BUILD_HAS_SCMI_SENSOR_EVENTS trip_point_process(id, *value); @@ -141,8 +145,9 @@ static int get_value(fwk_id_t id, uint64_t *value) return FWK_SUCCESS; } - else + else { return FWK_E_DEVICE; + } } static int get_info(fwk_id_t id, struct mod_sensor_scmi_info *info) @@ -151,12 +156,14 @@ static int get_info(fwk_id_t id, struct mod_sensor_scmi_info *info) struct sensor_dev_ctx *ctx; status = get_ctx_if_valid_call(id, info, &ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ctx->driver_api->get_info(ctx->config->driver_id, &info->hal_info); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_DEVICE; + } info->trip_point = ctx->config->trip_point; return FWK_SUCCESS; @@ -173,8 +180,9 @@ static int sensor_get_trip_point( ctx = ctx_table + fwk_id_get_element_idx(id); - if (trip_point_idx >= ctx->config->trip_point.count) + if (trip_point_idx >= ctx->config->trip_point.count) { return FWK_E_PARAM; + } *params = ctx->trip_point_ctx[trip_point_idx].params; @@ -188,13 +196,15 @@ static int sensor_set_trip_point( { struct sensor_dev_ctx *ctx; - if (params == NULL) + if (params == NULL) { return FWK_E_PARAM; + } ctx = ctx_table + fwk_id_get_element_idx(id); - if (trip_point_idx >= ctx->config->trip_point.count) + if (trip_point_idx >= ctx->config->trip_point.count) { return FWK_E_PARAM; + } ctx->trip_point_ctx[trip_point_idx].params = *params; @@ -222,8 +232,9 @@ static void reading_complete(fwk_id_t dev_id, struct mod_sensor_event_params *event_params = (struct mod_sensor_event_params *)event.params; - if (!fwk_expect(fwk_id_get_module_idx(dev_id) == FWK_MODULE_IDX_SENSOR)) + if (!fwk_expect(fwk_id_get_module_idx(dev_id) == FWK_MODULE_IDX_SENSOR)) { return; + } ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; @@ -239,8 +250,9 @@ static void reading_complete(fwk_id_t dev_id, #ifdef BUILD_HAS_SCMI_SENSOR_EVENTS trip_point_process(dev_id, response->value); #endif - } else + } else { event_params->status = FWK_E_DEVICE; + } status = fwk_thread_put_event(&event); fwk_assert(status == FWK_SUCCESS); @@ -284,8 +296,9 @@ static int sensor_dev_init(fwk_id_t element_id, if (config->trip_point.count > 0) { ctx->trip_point_ctx = fwk_mm_calloc( config->trip_point.count, sizeof(struct sensor_trip_point_ctx)); - } else + } else { ctx->trip_point_ctx = NULL; + } return FWK_SUCCESS; } @@ -302,12 +315,14 @@ static int sensor_bind(fwk_id_t id, unsigned int round) return FWK_SUCCESS; } if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { - if (sensor_mod_ctx.config == NULL) + if (sensor_mod_ctx.config == NULL) { return FWK_SUCCESS; + } if (fwk_id_is_equal( - sensor_mod_ctx.config->notification_id, FWK_ID_NONE)) + sensor_mod_ctx.config->notification_id, FWK_ID_NONE)) { return FWK_SUCCESS; + } return fwk_module_bind( sensor_mod_ctx.config->notification_id, @@ -319,12 +334,14 @@ static int sensor_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(ctx->config->driver_id, ctx->config->driver_api_id, &driver); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Validate driver API */ - if ((driver == NULL) || (driver->get_value == NULL)) + if ((driver == NULL) || (driver->get_value == NULL)) { return FWK_E_DATA; + } ctx->driver_api = driver; @@ -346,8 +363,9 @@ static int sensor_process_bind_request(fwk_id_t source_id, } if (fwk_id_is_equal(api_id, mod_sensor_api_id_driver_response)) { - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_PARAM; + } ctx = ctx_table + fwk_id_get_element_idx(target_id); driver_id = ctx->config->driver_id; @@ -361,8 +379,9 @@ static int sensor_process_bind_request(fwk_id_t source_id, *api = &sensor_driver_response_api; return FWK_SUCCESS; - } else + } else { return FWK_E_ACCESS; + } } return FWK_E_PARAM; @@ -379,8 +398,9 @@ static int sensor_process_event(const struct fwk_event *event, struct mod_sensor_event_params *resp_params = (struct mod_sensor_event_params *)(read_req_event.params); - if (!fwk_module_is_valid_element_id(event->target_id)) + if (!fwk_module_is_valid_element_id(event->target_id)) { return FWK_E_PARAM; + } ctx = ctx_table + fwk_id_get_element_idx(event->target_id); @@ -398,8 +418,9 @@ static int sensor_process_event(const struct fwk_event *event, status = fwk_thread_get_delayed_response(event->target_id, ctx->cookie, &read_req_event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } *resp_params = *event_params; return fwk_thread_put_event(&read_req_event); diff --git a/module/smt/src/mod_smt.c b/module/smt/src/mod_smt.c index 18712ede82ff1a2583be26129993e387a46eb51c..b8afd1b1b86c97750d09799f0ee7659646bc890d 100644 --- a/module/smt/src/mod_smt.c +++ b/module/smt/src/mod_smt.c @@ -124,8 +124,9 @@ static int smt_get_message_header(fwk_id_t channel_id, uint32_t *header) channel_ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)]; - if (!channel_ctx->locked) + if (!channel_ctx->locked) { return FWK_E_ACCESS; + } *header = channel_ctx->in->message_header; @@ -146,8 +147,9 @@ static int smt_get_payload(fwk_id_t channel_id, channel_ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)]; - if (!channel_ctx->locked) + if (!channel_ctx->locked) { return FWK_E_ACCESS; + } *payload = channel_ctx->in->payload; @@ -177,8 +179,9 @@ static int smt_write_payload(fwk_id_t channel_id, return FWK_E_PARAM; } - if (!channel_ctx->locked) + if (!channel_ctx->locked) { return FWK_E_ACCESS; + } memcpy(((uint8_t*)channel_ctx->out->payload) + offset, payload, size); @@ -218,8 +221,9 @@ static int smt_respond(fwk_id_t channel_id, const void *payload, size_t size) fwk_interrupt_global_enable(); - if (memory->flags & MOD_SMT_MAILBOX_FLAGS_IENABLED_MASK) + if (memory->flags & MOD_SMT_MAILBOX_FLAGS_IENABLED_MASK) { channel_ctx->driver_api->raise_interrupt(channel_ctx->driver_id); + } return FWK_SUCCESS; } @@ -231,8 +235,9 @@ static int smt_transmit(fwk_id_t channel_id, uint32_t message_header, struct smt_channel_ctx *channel_ctx; struct mod_smt_memory *memory; - if (payload == NULL) + if (payload == NULL) { return FWK_E_DATA; + } channel_ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(channel_id)]; @@ -245,8 +250,9 @@ static int smt_transmit(fwk_id_t channel_id, uint32_t message_header, * bit, and while it is probably safe to just overwrite the data * the agent could be in the process of reading. */ - if ((memory->status & MOD_SMT_MAILBOX_STATUS_FREE_MASK) == (uint32_t)0) + if ((memory->status & MOD_SMT_MAILBOX_STATUS_FREE_MASK) == (uint32_t)0) { return FWK_E_BUSY; + } memory->message_header = message_header; @@ -300,8 +306,9 @@ static int smt_slave_handler(struct smt_channel_ctx *channel_ctx) int status; /* Check if we are already processing */ - if (channel_ctx->locked) + if (channel_ctx->locked) { return FWK_E_STATE; + } memory = ((struct mod_smt_memory*)channel_ctx->config->mailbox_address); in = channel_ctx->in; @@ -340,12 +347,13 @@ static int smt_slave_handler(struct smt_channel_ctx *channel_ctx) out->status |= MOD_SMT_MAILBOX_STATUS_ERROR_MASK; - if (channel_ctx->is_scmi_channel) + if (channel_ctx->is_scmi_channel) { status = channel_ctx->smt_signal.scmi_api->signal_error( channel_ctx->service_id); - else + } else { status = channel_ctx->smt_signal.signal_api->signal_error( channel_ctx->service_id); + } return status; } @@ -355,15 +363,17 @@ static int smt_slave_handler(struct smt_channel_ctx *channel_ctx) memcpy(in->payload, memory->payload, payload_size); /* Let subscribed service handle the message */ - if (channel_ctx->is_scmi_channel) + if (channel_ctx->is_scmi_channel) { status = channel_ctx->smt_signal.scmi_api->signal_message( channel_ctx->service_id); - else + } else { status = channel_ctx->smt_signal.signal_api->signal_message( channel_ctx->service_id); + } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -449,15 +459,17 @@ static int smt_bind(fwk_id_t id, unsigned int round) struct smt_channel_ctx *channel_ctx; if (round == 0) { - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } channel_ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(id)]; status = fwk_module_bind(channel_ctx->config->driver_id, channel_ctx->config->driver_api_id, &channel_ctx->driver_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } channel_ctx->driver_id = channel_ctx->config->driver_id; } @@ -477,8 +489,9 @@ static int smt_bind(fwk_id_t id, unsigned int round) &channel_ctx->smt_signal.signal_api); channel_ctx->is_scmi_channel = false; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -553,8 +566,9 @@ static int smt_start(fwk_id_t id) { struct smt_channel_ctx *ctx; - if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return FWK_SUCCESS; + } ctx = &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(id)]; @@ -585,8 +599,9 @@ static int smt_process_notification( &smt_ctx.channel_ctx_table[fwk_id_get_element_idx(event->target_id)]; if (params->state != MOD_PD_STATE_ON) { - if (params->state == MOD_PD_STATE_OFF) + if (params->state == MOD_PD_STATE_OFF) { channel_ctx->smt_mailbox_ready = false; + } return FWK_SUCCESS; } @@ -609,8 +624,9 @@ static int smt_process_notification( status = fwk_notification_notify(&smt_channels_initialized_notification, ¬ifications_sent); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; diff --git a/module/system_power/src/mod_system_power.c b/module/system_power/src/mod_system_power.c index 8f3ff32170ced7aca8f00387676c91ce7a63c92b..7e3d4268d84ad113811d16722abf38ae37cead86 100644 --- a/module/system_power/src/mod_system_power.c +++ b/module/system_power/src/mod_system_power.c @@ -108,10 +108,11 @@ static void ext_ppus_shutdown(enum mod_pd_system_shutdown system_shutdown) api = system_power_ctx.ext_ppu_apis[i]; ppu_id = system_power_ctx.config->ext_ppus[i].ppu_id; - if (api->shutdown != NULL) + if (api->shutdown != NULL) { api->shutdown(ppu_id, system_shutdown); - else + } else { api->set_state(ppu_id, MOD_PD_STATE_OFF); + } } } @@ -129,8 +130,9 @@ static int set_system_power_state(unsigned int state) status = dev_ctx->sys_ppu_api->set_state(dev_ctx->config->sys_ppu_id, sys_state_table[state]); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -152,15 +154,16 @@ static int shutdown_system_power_ppus( api = dev_ctx->sys_ppu_api; ppu_id = dev_ctx->config->sys_ppu_id; - if (api->shutdown != NULL) + if (api->shutdown != NULL) { status = api->shutdown(ppu_id, system_shutdown); - else { + } else { state = dev_ctx->config->sys_state_table[MOD_PD_STATE_OFF]; status = api->set_state(ppu_id, state); } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -175,8 +178,9 @@ static int disable_all_irqs(void) if (system_power_ctx.driver_api->platform_interrupts != NULL) { status = system_power_ctx.driver_api->platform_interrupts( MOD_SYSTEM_POWER_PLATFORM_INTERRUPT_CMD_DISABLE); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { status = FWK_E_DEVICE; + } } return status; @@ -189,8 +193,9 @@ static int shutdown( int status; status = disable_all_irqs(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Shutdown external PPUs */ ext_ppus_shutdown(system_shutdown); @@ -199,8 +204,9 @@ static int shutdown( /* Shutdown system PPUs */ status = shutdown_system_power_ppus(system_shutdown); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -214,8 +220,9 @@ static int system_power_set_state(fwk_id_t pd_id, unsigned int state) int status; unsigned int soc_wakeup_irq; - if (!fwk_expect(state < MOD_SYSTEM_POWER_POWER_STATE_COUNT)) + if (!fwk_expect(state < MOD_SYSTEM_POWER_POWER_STATE_COUNT)) { return FWK_E_PARAM; + } soc_wakeup_irq = system_power_ctx.config->soc_wakeup_irq; @@ -224,12 +231,14 @@ static int system_power_set_state(fwk_id_t pd_id, unsigned int state) switch (state) { case MOD_PD_STATE_ON: status = disable_all_irqs(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = set_system_power_state(state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } ext_ppus_set_state(MOD_PD_STATE_ON); @@ -244,41 +253,47 @@ static int system_power_set_state(fwk_id_t pd_id, unsigned int state) status = system_power_ctx.driver_api->platform_interrupts( MOD_SYSTEM_POWER_PLATFORM_INTERRUPT_CMD_CLEAR_PENDING); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } } status = set_system_power_state(state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Store the identifier of the power domain of the last standing core */ status = system_power_ctx.mod_pd_driver_input_api-> get_last_core_pd_id(&system_power_ctx.last_core_pd_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } fwk_interrupt_enable(soc_wakeup_irq); if (system_power_ctx.driver_api->platform_interrupts != NULL) { status = system_power_ctx.driver_api->platform_interrupts( MOD_SYSTEM_POWER_PLATFORM_INTERRUPT_CMD_ENABLE); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } } break; case MOD_PD_STATE_OFF: status = disable_all_irqs(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } ext_ppus_set_state(MOD_PD_STATE_OFF); status = set_system_power_state(state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } break; @@ -307,8 +322,9 @@ static int system_power_shutdown(fwk_id_t pd_id, int status; status = shutdown(pd_id, system_shutdown); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return system_power_ctx.driver_api->system_shutdown(system_shutdown); } @@ -319,8 +335,9 @@ static void soc_wakeup_handler(void) uint32_t state = MOD_SYSTEM_POWER_SOC_WAKEUP_STATE; status = disable_all_irqs(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { fwk_trap(); + } status = system_power_ctx.mod_pd_restricted_api->set_state_async( system_power_ctx.last_core_pd_id, false, state); @@ -345,8 +362,9 @@ static int system_power_report_power_state_transition(fwk_id_t dev_id, sys_ppu_transition_count++; - if (sys_ppu_transition_count < system_power_ctx.dev_count) + if (sys_ppu_transition_count < system_power_ctx.dev_count) { return FWK_SUCCESS; + } system_power_ctx.state = system_power_ctx.requested_state; @@ -410,8 +428,9 @@ static int system_power_mod_element_init(fwk_id_t element_id, dev_ctx->config = data; /* Ensure a system state table is provided */ - if (dev_ctx->config->sys_state_table == NULL) + if (dev_ctx->config->sys_state_table == NULL) { return FWK_E_DATA; + } return FWK_SUCCESS; } @@ -424,8 +443,9 @@ static int system_power_bind(fwk_id_t id, unsigned int round) struct system_power_dev_ctx *dev_ctx; if (round == 1) { - if (!fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } /* * During the first round of binding, the power domain module should @@ -448,15 +468,17 @@ static int system_power_bind(fwk_id_t id, unsigned int round) config->ext_ppus[i].ppu_id, config->ext_ppus[i].api_id, &system_power_ctx.ext_ppu_apis[i]); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } status = fwk_module_bind(config->driver_id, config->driver_api_id, &system_power_ctx.driver_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_module_bind(fwk_module_id_power_domain, mod_pd_api_id_restricted, @@ -479,10 +501,11 @@ static int system_power_process_bind_request(fwk_id_t requester_id, struct system_power_dev_ctx *dev_ctx; if (fwk_id_is_equal(api_id, mod_system_power_api_id_pd_driver)) { - - if (!fwk_id_is_equal(fwk_id_build_module_id(requester_id), - fwk_module_id_power_domain)) + if (!fwk_id_is_equal( + fwk_id_build_module_id(requester_id), + fwk_module_id_power_domain)) { return FWK_E_ACCESS; + } *api = &system_power_power_domain_driver_api; system_power_ctx.mod_pd_system_id = requester_id; @@ -494,8 +517,9 @@ static int system_power_process_bind_request(fwk_id_t requester_id, * If requester_id refers to a system PPU configured by any one of * our elements, break when dev_idx reaches that element. */ - if (fwk_id_is_equal(requester_id, dev_ctx->config->sys_ppu_id)) + if (fwk_id_is_equal(requester_id, dev_ctx->config->sys_ppu_id)) { break; + } } if (dev_idx >= system_power_ctx.dev_count) { /* Requester_id does not refer to any configured system PPU */ @@ -515,8 +539,9 @@ static int system_power_start(fwk_id_t id) if (system_power_ctx.driver_api->platform_interrupts != NULL) { status = system_power_ctx.driver_api->platform_interrupts( MOD_SYSTEM_POWER_PLATFORM_INTERRUPT_CMD_INIT); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* Configure initial power state */ diff --git a/module/timer/src/mod_timer.c b/module/timer/src/mod_timer.c index ac8266e93aa56a5804de70c5e55a74f39f727d6d..00a1a18846e63d3babfbd9dd44bf3e16c628170e 100644 --- a/module/timer/src/mod_timer.c +++ b/module/timer/src/mod_timer.c @@ -86,8 +86,9 @@ static int _time_to_timestamp(struct dev_ctx *ctx, fwk_assert(timestamp != NULL); status = ctx->driver->get_frequency(ctx->driver_dev_id, &frequency); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } *timestamp = ((uint64_t)frequency * microseconds) / 1000000; @@ -105,12 +106,14 @@ static int _timestamp_from_now(struct dev_ctx *ctx, fwk_assert(timestamp != NULL); status = _time_to_timestamp(ctx, microseconds, timestamp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ctx->driver->get_counter(ctx->driver_dev_id, &counter); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } *timestamp += counter; @@ -128,14 +131,16 @@ static int _remaining(const struct dev_ctx *ctx, fwk_assert(remaining_ticks != NULL); status = ctx->driver->get_counter(ctx->driver_dev_id, &counter); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return status; + } /* If timestamp is in the past, remaining_ticks is set to zero. */ - if (timestamp < counter) + if (timestamp < counter) { *remaining_ticks = 0; - else + } else { *remaining_ticks = timestamp - counter; + } return FWK_SUCCESS; } @@ -194,8 +199,9 @@ static int get_frequency(fwk_id_t dev_id, uint32_t *frequency) ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; - if (frequency == NULL) + if (frequency == NULL) { return FWK_E_PARAM; + } return ctx->driver->get_frequency(ctx->driver_dev_id, frequency); } @@ -206,8 +212,9 @@ static int time_to_timestamp(fwk_id_t dev_id, { struct dev_ctx *ctx; - if (timestamp == NULL) + if (timestamp == NULL) { return FWK_E_PARAM; + } ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; @@ -220,8 +227,9 @@ static int get_counter(fwk_id_t dev_id, uint64_t *counter) ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; - if (counter == NULL) + if (counter == NULL) { return FWK_E_PARAM; + } /* Read counter */ return ctx->driver->get_counter(ctx->driver_dev_id, counter); @@ -236,13 +244,15 @@ static int delay(fwk_id_t dev_id, uint32_t microseconds) ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; status = _timestamp_from_now(ctx, microseconds, &counter_limit); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } do { status = ctx->driver->get_counter(ctx->driver_dev_id, &counter); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } while (counter < counter_limit); return FWK_SUCCESS; @@ -260,26 +270,29 @@ static int wait(fwk_id_t dev_id, ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; status = _timestamp_from_now(ctx, microseconds, &counter_limit); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } while (true) { - - if (cond(data)) + if (cond(data)) { return FWK_SUCCESS; + } status = ctx->driver->get_counter(ctx->driver_dev_id, &counter); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } /* * If the time to wait is over, check condition one last time. */ if (counter > counter_limit) { - if (cond(data)) + if (cond(data)) { return FWK_SUCCESS; - else + } else { return FWK_E_TIMEOUT; + } } } } @@ -292,8 +305,9 @@ static int remaining(fwk_id_t dev_id, ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; - if (remaining_ticks == NULL) + if (remaining_ticks == NULL) { return FWK_E_PARAM; + } return _remaining(ctx, timestamp, remaining_ticks); } @@ -307,11 +321,13 @@ static int get_next_alarm_remaining(fwk_id_t dev_id, const struct alarm_ctx *alarm_ctx; const struct fwk_dlist_node *alarm_ctx_node; - if (has_alarm == NULL) + if (has_alarm == NULL) { return FWK_E_PARAM; + } - if (remaining_ticks == NULL) + if (remaining_ticks == NULL) { return FWK_E_PARAM; + } ctx = &ctx_table[fwk_id_get_element_idx(dev_id)]; @@ -394,8 +410,9 @@ static int alarm_stop(fwk_id_t alarm_id) alarm->started = false; - if (!alarm->activated) + if (!alarm->activated) { return FWK_SUCCESS; + } /* * If the alarm is stopped while the interrupts are globally disabled, an @@ -441,8 +458,9 @@ static int alarm_start(fwk_id_t alarm_id, ctx = ctx_table + fwk_id_get_element_idx(alarm_id); alarm = &ctx->alarm_pool[fwk_id_get_sub_element_idx(alarm_id)]; - if (alarm->started) + if (alarm->started) { alarm_stop(alarm_id); + } alarm->started = true; @@ -458,8 +476,9 @@ static int alarm_start(fwk_id_t alarm_id, status = _timestamp_from_now(ctx, alarm->microseconds, &alarm->timestamp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Disable timer interrupts to work with the active queue */ ctx->driver->disable(ctx->driver_dev_id); @@ -542,8 +561,9 @@ static int timer_device_init(fwk_id_t element_id, unsigned int alarm_count, ctx = ctx_table + fwk_id_get_element_idx(element_id); ctx->config = data; - if (alarm_count > 0) + if (alarm_count > 0) { ctx->alarm_pool = fwk_mm_calloc(alarm_count, sizeof(struct alarm_ctx)); + } return FWK_SUCCESS; } @@ -556,11 +576,13 @@ static int timer_bind(fwk_id_t id, unsigned int round) unsigned int driver_module_idx; /* Nothing to do after the initial round. */ - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } ctx = ctx_table + fwk_id_get_element_idx(id); ctx->driver_dev_id = ctx->config->id; @@ -570,15 +592,15 @@ static int timer_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(ctx->driver_dev_id, FWK_ID_API(driver_module_idx, 0), &driver); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Check that the driver API is completely fulfilled */ - if (driver->enable == NULL || - driver->disable == NULL || - driver->get_counter == NULL || - driver->get_frequency == NULL) + if (driver->enable == NULL || driver->disable == NULL || + driver->get_counter == NULL || driver->get_frequency == NULL) { return FWK_E_DEVICE; + } ctx->driver = driver; @@ -628,8 +650,9 @@ static int timer_start(fwk_id_t id) { struct dev_ctx *ctx; - if (!fwk_module_is_valid_element_id(id)) + if (!fwk_module_is_valid_element_id(id)) { return FWK_SUCCESS; + } ctx = ctx_table + fwk_id_get_element_idx(id); diff --git a/product/juno/module/juno_adc/src/mod_juno_adc.c b/product/juno/module/juno_adc/src/mod_juno_adc.c index 9f6334f215a5d5d56d2207f1f03db5d90f956ab9..4d57a4a031497de3c76cd91be52912b11dd7fb0c 100644 --- a/product/juno/module/juno_adc/src/mod_juno_adc.c +++ b/product/juno/module/juno_adc/src/mod_juno_adc.c @@ -41,10 +41,11 @@ static int get_value(fwk_id_t id, uint64_t *value) adc_quantity = ((uint64_t)adc_value) * JUNO_ADC_AMPS_MULTIPLIER; - if ((dev_type == ADC_DEV_BIG) || (dev_type == ADC_DEV_GPU)) + if ((dev_type == ADC_DEV_BIG) || (dev_type == ADC_DEV_GPU)) { adc_quantity /= ADC_CURRENT_CONST1; - else + } else { adc_quantity /= ADC_CURRENT_CONST2; + } *value = adc_quantity; @@ -66,10 +67,11 @@ static int get_value(fwk_id_t id, uint64_t *value) adc_quantity = ((uint64_t)adc_value) * JUNO_ADC_WATTS_MULTIPLIER; - if ((dev_type == ADC_DEV_BIG) || (dev_type == ADC_DEV_GPU)) + if ((dev_type == ADC_DEV_BIG) || (dev_type == ADC_DEV_GPU)) { adc_quantity /= ADC_POWER_CONST1; - else + } else { adc_quantity /= ADC_POWER_CONST2; + } *value = adc_quantity; @@ -79,10 +81,11 @@ static int get_value(fwk_id_t id, uint64_t *value) adc_quantity = V2M_SYS_REGS->ADC_ENERGY[dev_type] * JUNO_ADC_JOULE_MULTIPLIER; - if ((dev_type == ADC_DEV_BIG) || (dev_type == ADC_DEV_GPU)) + if ((dev_type == ADC_DEV_BIG) || (dev_type == ADC_DEV_GPU)) { adc_quantity /= ADC_ENERGY_CONST1; - else + } else { adc_quantity /= ADC_ENERGY_CONST2; + } *value = adc_quantity; @@ -99,8 +102,9 @@ static int get_info(fwk_id_t id, struct mod_sensor_info *info) config = fwk_module_get_data(id); - if (!fwk_expect(config->info != NULL)) + if (!fwk_expect(config->info != NULL)) { return FWK_E_DATA; + } *info = *(config->info); @@ -119,8 +123,9 @@ static int juno_adc_init(fwk_id_t module_id, unsigned int element_count, const void *data) { - if (!fwk_expect(element_count > 0)) + if (!fwk_expect(element_count > 0)) { return FWK_E_DATA; + } return FWK_SUCCESS; } @@ -137,15 +142,18 @@ static int juno_adc_process_bind_request(fwk_id_t source_id, fwk_id_t api_id, const void **api) { - if (!fwk_module_is_valid_sub_element_id(target_id)) + if (!fwk_module_is_valid_sub_element_id(target_id)) { return FWK_E_ACCESS; + } if (fwk_id_get_module_idx(source_id) != - fwk_id_get_module_idx(fwk_module_id_sensor)) + fwk_id_get_module_idx(fwk_module_id_sensor)) { return FWK_E_ACCESS; + } - if (!fwk_id_is_equal(api_id, mod_juno_adc_api_id_driver)) + if (!fwk_id_is_equal(api_id, mod_juno_adc_api_id_driver)) { return FWK_E_ACCESS; + } *api = &adc_sensor_api; diff --git a/product/juno/module/juno_cdcel937/src/mod_juno_cdcel937.c b/product/juno/module/juno_cdcel937/src/mod_juno_cdcel937.c index 1ad4578ef90a1f41b6731ed5005e768fcbf83b15..025ef40f5a22e96ca902c5e88125a57f76efb9a5 100644 --- a/product/juno/module/juno_cdcel937/src/mod_juno_cdcel937.c +++ b/product/juno/module/juno_cdcel937/src/mod_juno_cdcel937.c @@ -103,11 +103,13 @@ static int set_block_access_length(struct juno_cdcel937_dev_ctx *ctx, int status; struct cfg_reg6 config6; - if (length == 0) + if (length == 0) { return FWK_E_RANGE; - if (length > 127) + } + if (length > 127) { /* 7 bit field limits maximum access length */ return FWK_E_RANGE; + } config6.reg[0] = 0; write_field(config6.reg, CFG_REG6_BCOUNT, (uint8_t)length); @@ -121,8 +123,9 @@ static int set_block_access_length(struct juno_cdcel937_dev_ctx *ctx, status = module_ctx.i2c_api->transmit_as_master(module_config->i2c_hal_id, ctx->config->slave_address, i2c_transmit, 2); - if (status != FWK_PENDING) + if (status != FWK_PENDING) { return FWK_E_DEVICE; + } return status; } @@ -133,8 +136,9 @@ static int write_configuration(struct juno_cdcel937_dev_ctx *ctx, { int status; - if (base > 0x40) + if (base > 0x40) { return FWK_E_RANGE; + } i2c_transmit[0] = (JUNO_CDCEL937_TRANSFER_MODE_BLOCK | (base & JUNO_CDCEL937_I2C_BYTE_OFFSET_MASK)); @@ -149,8 +153,9 @@ static int write_configuration(struct juno_cdcel937_dev_ctx *ctx, status = module_ctx.i2c_api->transmit_as_master(module_config->i2c_hal_id, ctx->config->slave_address, i2c_transmit, 10); - if (status != FWK_PENDING) + if (status != FWK_PENDING) { return FWK_E_DEVICE; + } return status; } @@ -162,8 +167,9 @@ static int read_configuration(struct juno_cdcel937_dev_ctx *ctx, int status; const uint8_t block_access_length = 8; - if (base > 0x40) + if (base > 0x40) { return FWK_E_RANGE; + } i2c_transmit[0] = (JUNO_CDCEL937_TRANSFER_MODE_BLOCK | (base & JUNO_CDCEL937_I2C_BYTE_OFFSET_MASK)); @@ -172,8 +178,9 @@ static int read_configuration(struct juno_cdcel937_dev_ctx *ctx, status = module_ctx.i2c_api->transmit_then_receive_as_master( module_config->i2c_hal_id, ctx->config->slave_address, i2c_transmit, config->reg, 1, block_access_length + 1); - if (status != FWK_PENDING) + if (status != FWK_PENDING) { return FWK_E_DEVICE; + } return status; } @@ -252,8 +259,9 @@ static int get_rounded_rate(struct juno_cdcel937_dev_ctx *ctx, uint64_t rounded_up_rate; uint64_t rounded_down_rate; - if (ctx->config->rate_type != MOD_CLOCK_RATE_TYPE_CONTINUOUS) + if (ctx->config->rate_type != MOD_CLOCK_RATE_TYPE_CONTINUOUS) { return FWK_E_SUPPORT; + } rounded_down_rate = FWK_ALIGN_PREVIOUS(rate, ctx->config->min_step); rounded_up_rate = FWK_ALIGN_NEXT(rate, ctx->config->min_step); @@ -265,12 +273,13 @@ static int get_rounded_rate(struct juno_cdcel937_dev_ctx *ctx, case MOD_CLOCK_ROUND_MODE_NEAREST: /* Select the rounded rate that is closest to the given rate */ - if ((*rounded_rate % ctx->config->min_step) == 0) + if ((*rounded_rate % ctx->config->min_step) == 0) { *rounded_rate = rate; - else if ((rate - rounded_down_rate) > (rounded_up_rate - rate)) + } else if ((rate - rounded_down_rate) > (rounded_up_rate - rate)) { *rounded_rate = rounded_up_rate; - else + } else { *rounded_rate = rounded_down_rate; + } break; case MOD_CLOCK_ROUND_MODE_DOWN: @@ -287,8 +296,9 @@ static int get_rounded_rate(struct juno_cdcel937_dev_ctx *ctx, } /* Control that the obtained rate uses the correct precision. */ - if ((*rounded_rate % ctx->config->min_step) != 0) + if ((*rounded_rate % ctx->config->min_step) != 0) { return FWK_E_RANGE; + } return FWK_SUCCESS; } @@ -300,23 +310,26 @@ static int set_rate_read_pll_config(struct juno_cdcel937_dev_ctx *ctx) enum juno_cdcel937_output_type type; status = output_type_from_output_id(ctx->config->output_id, &type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PARAM; + } - #if USE_OUTPUT_Y1 +#if USE_OUTPUT_Y1 if (type == JUNO_CDCEL937_OUTPUT_TYPE_Y1) return FWK_E_PARAM; #endif status = pll_base_from_output_id(ctx->config->output_id, &base_address); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PARAM; + } /* The first 4 bytes of the PLL config register are not needed */ base_address += 0x4; status = read_configuration(ctx, base_address, &ctx->pll_config); - if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) + if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) { return FWK_E_DEVICE; + } return status; } @@ -334,22 +347,25 @@ static int set_rate_write_pll_config(struct juno_cdcel937_dev_ctx *ctx) pll_config = ctx->pll_config; status = output_type_from_output_id(ctx->config->output_id, &type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PARAM; + } - if (ctx->config->lookup_table_count == 0) + if (ctx->config->lookup_table_count == 0) { status = get_preset_low_precision(ctx->rate, &preset); - else if (ctx->index < 0) + } else if (ctx->index < 0) { status = search_preset(ctx, ctx->rate, &preset); - else { - if ((unsigned int)ctx->index >= ctx->config->lookup_table_count) + } else { + if ((unsigned int)ctx->index >= ctx->config->lookup_table_count) { return FWK_E_PARAM; + } preset = ctx->config->lookup_table[ctx->index].preset; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PARAM; + } M = preset.M; N = preset.N; @@ -365,16 +381,17 @@ static int set_rate_write_pll_config(struct juno_cdcel937_dev_ctx *ctx) /* Calculate P, P = 4 - int(log2 N/M) */ V = N / M; - if (V < 2) + if (V < 2) { P = 4; - else if (V < 3) + } else if (V < 3) { P = 3; - else if (V < 6) + } else if (V < 6) { P = 2; - else if (V < 12) + } else if (V < 12) { P = 1; - else + } else { P = 0; + } /* Calculate N', N' = N * 2^P */ Nd = N * (1U << P); @@ -393,38 +410,42 @@ static int set_rate_write_pll_config(struct juno_cdcel937_dev_ctx *ctx) write_field(pll_config.reg, PLL_CFG_REG_Q_LOW, Q); write_field(pll_config.reg, PLL_CFG_REG_P, P); - if (type == JUNO_CDCEL937_OUTPUT_TYPE_LOW) + if (type == JUNO_CDCEL937_OUTPUT_TYPE_LOW) { /* Even outputs: Y2, Y4, Y6 */ write_field(pll_config.reg, PLL_CFG_REG_PDIV_X, pdiv); - else + } else { /* Odd outputs: Y3, Y5, Y7 */ write_field(pll_config.reg, PLL_CFG_REG_PDIV_Y, pdiv); + } /* VCO range may need updating when fVCO changes */ - if (fvco < 125) + if (fvco < 125) { write_field(pll_config.reg, PLL_CFG_REG_VCO_RANGE, JUNO_CDCEL937_VCO_RANGE_LOWEST); - else if (fvco < 150) + } else if (fvco < 150) { write_field(pll_config.reg, PLL_CFG_REG_VCO_RANGE, JUNO_CDCEL937_VCO_RANGE_LOW); - else if (fvco < 175) + } else if (fvco < 175) { write_field(pll_config.reg, PLL_CFG_REG_VCO_RANGE, JUNO_CDCEL937_VCO_RANGE_HIGH); - else + } else { write_field(pll_config.reg, PLL_CFG_REG_VCO_RANGE, JUNO_CDCEL937_VCO_RANGE_HIGHEST); + } status = pll_base_from_output_id(ctx->config->output_id, &base_address); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PARAM; + } /* The first 4 bytes of the PLL config register are not needed */ base_address += 0x4; /* Write back the modified structure */ status = write_configuration(ctx, base_address, &pll_config); - if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) + if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) { return FWK_E_DEVICE; + } return status; } @@ -437,20 +458,24 @@ static int create_set_rate_request(fwk_id_t clock_id, int status; struct fwk_event event; - if (rate < JUNO_CDCEL937_OUTPUT_MIN_FREQ) + if (rate < JUNO_CDCEL937_OUTPUT_MIN_FREQ) { return FWK_E_RANGE; - if (rate > JUNO_CDCEL937_OUTPUT_MAX_FREQ) + } + if (rate > JUNO_CDCEL937_OUTPUT_MAX_FREQ) { return FWK_E_RANGE; + } /* * If the clock rate has already the wanted value the setting process is * skipped. */ - if (ctx->rate_hz == rate) + if (ctx->rate_hz == rate) { return FWK_SUCCESS; + } - if (ctx->state != JUNO_CDCEL937_DEVICE_IDLE) + if (ctx->state != JUNO_CDCEL937_DEVICE_IDLE) { return FWK_E_BUSY; + } event = (struct fwk_event) { .target_id = clock_id, @@ -461,8 +486,9 @@ static int create_set_rate_request(fwk_id_t clock_id, ctx->index = index; status = fwk_thread_put_event(&event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } ctx->state = JUNO_CDCEL937_DEVICE_SET_RATE_SET_BLOCK_ACCESS_LENGTH; @@ -573,8 +599,9 @@ static int rate_set_block_access_length(struct juno_cdcel937_dev_ctx *ctx) const uint8_t block_access_length = 8; status = set_block_access_length(ctx, block_access_length); - if (status != FWK_PENDING) + if (status != FWK_PENDING) { return FWK_E_DEVICE; + } return status; } @@ -585,14 +612,16 @@ static int get_rate_read_pll_config(struct juno_cdcel937_dev_ctx *ctx) uint8_t base_address; status = pll_base_from_output_id(ctx->config->output_id, &base_address); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* The first 4 bytes of the PLL config register are not needed */ base_address += 0x4; status = read_configuration(ctx, base_address, &ctx->pll_config); - if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) + if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) { return FWK_E_DEVICE; + } return status; } @@ -604,8 +633,9 @@ static int get_rate_calc(struct juno_cdcel937_dev_ctx *ctx) enum juno_cdcel937_output_type type; status = output_type_from_output_id(ctx->config->output_id, &type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (type == JUNO_CDCEL937_OUTPUT_TYPE_LOW) { /* Even outputs: Y2, Y4, Y6 */ @@ -649,8 +679,9 @@ static int create_get_rate_request(fwk_id_t clock_id, int status; struct fwk_event event; - if (ctx->state != JUNO_CDCEL937_DEVICE_IDLE) - return FWK_E_BUSY; + if (ctx->state != JUNO_CDCEL937_DEVICE_IDLE) { + return FWK_E_BUSY; + } event = (struct fwk_event) { .target_id = clock_id, @@ -658,8 +689,9 @@ static int create_get_rate_request(fwk_id_t clock_id, }; status = fwk_thread_put_event(&event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } ctx->state = JUNO_CDCEL937_DEVICE_GET_RATE_SET_BLOCK_ACCESS_LENGTH; @@ -681,8 +713,9 @@ static int juno_cdcel937_set_rate(fwk_id_t clock_id, if (ctx->config->rate_type == MOD_CLOCK_RATE_TYPE_CONTINUOUS) { status = get_rounded_rate(ctx, rate, round_mode, &rounded_rate); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* @@ -702,8 +735,9 @@ static int juno_cdcel937_get_rate(fwk_id_t clock_id, if (ctx->rate_set == false) { status = create_get_rate_request(clock_id, ctx); - if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) + if ((status != FWK_PENDING) && (status != FWK_SUCCESS)) { return FWK_E_DEVICE; + } return status; } @@ -720,8 +754,9 @@ static int juno_cdcel937_get_rate_from_index(fwk_id_t clock_id, ctx = &ctx_table[fwk_id_get_element_idx(clock_id)]; - if (rate_index >= ctx->config->lookup_table_count) + if (rate_index >= ctx->config->lookup_table_count) { return FWK_E_PARAM; + } *rate = ctx->config->lookup_table[rate_index].rate_hz; @@ -731,8 +766,9 @@ static int juno_cdcel937_get_rate_from_index(fwk_id_t clock_id, static int juno_cdcel937_set_state(fwk_id_t clock_id, enum mod_clock_state state) { - if (state != MOD_CLOCK_STATE_RUNNING) + if (state != MOD_CLOCK_STATE_RUNNING) { return FWK_E_SUPPORT; + } /* * The clock is always on, only allow state to be set RUNNING @@ -788,8 +824,9 @@ static int juno_cdcel937_set_rate_from_index(fwk_id_t clock_id, ctx = &ctx_table[fwk_id_get_element_idx(clock_id)]; - if ((index < 0) || (unsigned int)index >= ctx->config->lookup_table_count) + if ((index < 0) || (unsigned int)index >= ctx->config->lookup_table_count) { return FWK_E_PARAM; + } rate = ctx->config->lookup_table[index].rate_hz; @@ -856,16 +893,18 @@ static int juno_cdcel937_bind(fwk_id_t id, unsigned int round) /* * Only bind in first round of calls */ - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { /* Bind to I2C HAL */ status = fwk_module_bind(module_config->i2c_hal_id, mod_i2c_api_id_i2c, &module_ctx.i2c_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -876,8 +915,9 @@ static int juno_cdcel937_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(ctx->config->clock_hal_id, ctx->config->clock_api_id, &ctx->driver_response_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -887,12 +927,13 @@ static int juno_cdcel937_process_bind_request(fwk_id_t source_id, fwk_id_t api_id, const void **api) { - if (fwk_id_is_equal(api_id, mod_juno_cdcel937_api_id_clock_driver)) + if (fwk_id_is_equal(api_id, mod_juno_cdcel937_api_id_clock_driver)) { *api = &clock_driver_api; - else if (fwk_id_is_equal(api_id, mod_juno_cdcel937_api_id_hdlcd_driver)) + } else if (fwk_id_is_equal(api_id, mod_juno_cdcel937_api_id_hdlcd_driver)) { *api = &hdlcd_driver_api; - else + } else { return FWK_E_ACCESS; + } return FWK_SUCCESS; } @@ -965,10 +1006,11 @@ static int juno_cdcel937_process_event(const struct fwk_event *event, case JUNO_CDCEL937_DEVICE_GET_RATE_SET_BLOCK_ACCESS_LENGTH: status = output_type_from_output_id(ctx->config->output_id, &type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } - #if USE_OUTPUT_Y1 +#if USE_OUTPUT_Y1 if (type == JUNO_CDCEL937_OUTPUT_TYPE_Y1) { status = get_rate_y1_set_block_access_length(ctx); if (status == FWK_PENDING) { diff --git a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c index cb24dddbefd343af43207b99d7df1de08387fb07..8b6b7cadd0219afebb2035b07b78a2ab9cc30ee5 100644 --- a/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c +++ b/product/juno/module/juno_ddr_phy400/src/mod_juno_ddr_phy400.c @@ -40,15 +40,17 @@ static int juno_ddr_phy400_config_ddr(fwk_id_t element_id) const struct mod_juno_ddr_phy400_element_config *element_config; element_config = fwk_module_get_data(element_id); - if (element_config == NULL) + if (element_config == NULL) { return FWK_E_DATA; + } phy_ptm = (struct mod_juno_ddr_phy400_ptm_reg *)element_config->ddr_phy_ptm; phy_c3a = (struct mod_juno_ddr_phy400_c3a_reg *)element_config->ddr_phy_c3a; phy_bl0 = (struct mod_juno_ddr_phy400_bl_reg *)element_config->ddr_phy_bl0; - if ((phy_ptm == NULL) || (phy_c3a == NULL) || (phy_bl0 == NULL)) + if ((phy_ptm == NULL) || (phy_c3a == NULL) || (phy_bl0 == NULL)) { return FWK_E_DATA; + } /* All writes to BL0 are copied to BL1-3 */ phy_ptm->BL_APB_CTRL = 0x00000001; @@ -168,8 +170,9 @@ static int juno_ddr_phy400_config_idle(fwk_id_t element_id) module_config = fwk_module_get_data(fwk_module_id_juno_ddr_phy400); element_config = fwk_module_get_data(element_id); - if (element_config == NULL) + if (element_config == NULL) { return FWK_E_DATA; + } phy_ptm = (struct mod_juno_ddr_phy400_ptm_reg *)element_config->ddr_phy_ptm; @@ -224,20 +227,23 @@ static int juno_ddr_phy400_bind(fwk_id_t id, unsigned int round) const struct mod_juno_ddr_phy400_config *module_config; /* Skip the second round */ - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } /* Nothing to be done for element-level binding */ - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { return FWK_SUCCESS; + } module_config = fwk_module_get_data(fwk_module_id_juno_ddr_phy400); fwk_assert(module_config != NULL); status = fwk_module_bind(module_config->timer_id, MOD_TIMER_API_ID_TIMER, &timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -248,8 +254,9 @@ static int juno_ddr_phy400_process_bind_request(fwk_id_t requester_id, const void **api) { /* Binding to elements is not permitted. */ - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { return FWK_E_ACCESS; + } *api = &ddr_phy400_api; diff --git a/product/juno/module/juno_debug/src/mod_juno_debug.c b/product/juno/module/juno_debug/src/mod_juno_debug.c index 9c4a78a937ba67f4fb201985038958c696690af3..80ea0d2ae78a257e92b6dba207440d590958903d 100644 --- a/product/juno/module/juno_debug/src/mod_juno_debug.c +++ b/product/juno/module/juno_debug/src/mod_juno_debug.c @@ -181,8 +181,9 @@ static void juno_debug_cdbg_rst_req_isr(void) NULL); /* The condition wasn't met before the end of the timeout */ - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return; + } /* De-assert reset */ SCP_CONFIG->SYS_MANUAL_RESET.SET = SCP_CONFIG_SYS_MANUAL_RESET_DBGSYSRESET; @@ -203,32 +204,36 @@ static int apply_clock_settings(struct juno_css_debug_dev *juno_css_debug_dev) TIME_OUT_ATCLK_DIV_SET, atclk_clock_div_set_check, (void *)(&juno_css_debug_dev->div_atclk)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } juno_utils_atclk_clock_sel_set(source); status = timer_api->wait(module_config->timer_id, TIME_OUT_ATCLK_SEL_SET, atclk_clock_sel_set_check, (void *)&source); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } juno_utils_traceclk_clock_div_set(juno_css_debug_dev->div_traceclk); status = timer_api->wait(module_config->timer_id, TIME_OUT_TRACECLK_DIV_SET, traceclk_clock_div_set_check, (void *)&juno_css_debug_dev->div_traceclk); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } juno_utils_traceclk_clock_sel_set(source); status = timer_api->wait(module_config->timer_id, TIME_OUT_TRACECLK_SEL_SET, traceclk_clock_sel_set_check, (void *)&source); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } juno_utils_pclkdbg_clock_div_set(juno_css_debug_dev->div_pclk); return timer_api->wait(module_config->timer_id, @@ -242,8 +247,9 @@ static int turn_on_pd(fwk_id_t pd_id, enum juno_debug_state next_state) int status; status = dev_ctx.pd_api->set_state(pd_id, MOD_PD_STATE_ON); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { dev_ctx.state = next_state; + } return status; } @@ -253,8 +259,9 @@ static int enable_debug(fwk_id_t id, enum scp_debug_user user_id) int status; struct fwk_event req; - if (dev_ctx.state != IDLE) + if (dev_ctx.state != IDLE) { return FWK_E_BUSY; + } dev_ctx.user_id = user_id; @@ -265,8 +272,9 @@ static int enable_debug(fwk_id_t id, enum scp_debug_user user_id) }; status = fwk_thread_put_event(&req); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_PENDING; } @@ -275,8 +283,9 @@ static int enable_debug(fwk_id_t id, enum scp_debug_user user_id) * This request originated from an IRQ, therefore acknowledgment is * required and the ISR needs to be re-enabled. */ - if (user_id == SCP_DEBUG_USER_DAP) + if (user_id == SCP_DEBUG_USER_DAP) { set_ack_debug_pwrup_req(); + } return FWK_SUCCESS; } @@ -287,8 +296,9 @@ static int disable_debug(fwk_id_t id, enum scp_debug_user user_id) * This request originated from an IRQ, therefore acknowledgment is * required and the ISR needs to be re-enabled. */ - if (user_id == SCP_DEBUG_USER_DAP) + if (user_id == SCP_DEBUG_USER_DAP) { clear_ack_debug_pwrup_req(); + } return FWK_SUCCESS; } @@ -299,16 +309,18 @@ static int disable_debug(fwk_id_t id, enum scp_debug_user user_id) static int set_enabled(fwk_id_t id, bool enable, enum scp_debug_user user_id) { - if (dev_ctx.state != IDLE) + if (dev_ctx.state != IDLE) { return FWK_E_BUSY; + } return enable ? enable_debug(id, user_id) : disable_debug(id, user_id); } static int get_enabled(fwk_id_t id, bool *enabled, enum scp_debug_user user_id) { - if (dev_ctx.state != IDLE) + if (dev_ctx.state != IDLE) { return FWK_E_BUSY; + } *enabled = dev_ctx.pd_dbg_on; @@ -327,8 +339,9 @@ static int process_enable_request(fwk_id_t id) struct juno_css_debug_dev *juno_css_debug_dev; const struct mod_juno_debug_dev_config *config; - if (dev_ctx.state != IDLE) + if (dev_ctx.state != IDLE) { return FWK_E_BUSY; + } config = fwk_module_get_data(id); juno_css_debug_dev = config->clk_settings; @@ -336,8 +349,9 @@ static int process_enable_request(fwk_id_t id) /* Check if DBGSYS has already been powered-on */ status = dev_ctx.pd_api->get_state(config->pd_dbgsys_id, &power_state); if (status != FWK_SUCCESS) { - if (status == FWK_PENDING) + if (status == FWK_PENDING) { dev_ctx.state = GET_STATE; + } return status; } @@ -346,26 +360,30 @@ static int process_enable_request(fwk_id_t id) /* Turn on DBGSYS */ status = turn_on_pd(config->pd_dbgsys_id, SET_STATE_DBGSYS); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Turn on BIG_SSTOP */ status = turn_on_pd(config->pd_big_sstop_id, SET_STATE_BIG_SSTOP); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Turn on LITTLE_SSTOP */ status = turn_on_pd(config->pd_little_sstop_id, SET_STATE_LITTLE_SSTOP); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* * Apply clock settings */ status = apply_clock_settings(juno_css_debug_dev); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (juno_css_debug_dev->manual_reset_required) { SCP_CONFIG->SYS_MANUAL_RESET.SET = @@ -384,8 +402,9 @@ static int process_enable_request(fwk_id_t id) * This request originated from an IRQ, therefore acknowledge is * required and the ISR needs to be re-enabled. */ - if (dev_ctx.user_id == SCP_DEBUG_USER_DAP) + if (dev_ctx.user_id == SCP_DEBUG_USER_DAP) { set_ack_debug_pwrup_req(); + } return FWK_SUCCESS; } @@ -421,8 +440,9 @@ static int juno_debug_bind(fwk_id_t id, unsigned int round) const struct mod_juno_debug_config *module_config; /* Bind in the second round */ - if (round == 0) + if (round == 0) { return FWK_SUCCESS; + } if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { module_config = fwk_module_get_data(fwk_module_id_juno_debug); @@ -436,8 +456,9 @@ static int juno_debug_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(fwk_module_id_power_domain, mod_pd_api_id_restricted, &dev_ctx.pd_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_module_bind(dev_ctx.debug_hal_id, FWK_ID_API(FWK_MODULE_IDX_DEBUG, @@ -451,9 +472,9 @@ static int juno_debug_process_bind_request(fwk_id_t source_id, const void **api) { if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT) || - !fwk_id_is_equal(api_id, mod_juno_debug_api_id_driver) || - api == NULL) + !fwk_id_is_equal(api_id, mod_juno_debug_api_id_driver) || api == NULL) { return FWK_E_PARAM; + } *api = &juno_debug_drv_api; @@ -468,18 +489,21 @@ static int juno_debug_start(fwk_id_t id) status = fwk_interrupt_set_isr(CDBG_PWR_UP_REQ_IRQ, juno_debug_cdbg_pwr_up_req_isr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_set_isr(CSYS_PWR_UP_REQ_IRQ, juno_debug_csys_pwr_up_req_isr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_set_isr(CDBG_RST_REQ_IRQ, juno_debug_cdbg_rst_req_isr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } fwk_interrupt_clear_pending(CDBG_PWR_UP_REQ_IRQ); fwk_interrupt_clear_pending(CDBG_RST_REQ_IRQ); @@ -508,8 +532,9 @@ static int juno_debug_process_event(const struct fwk_event *event, if (fwk_id_is_equal(event->id, juno_debug_event_submit_request)) { status = process_enable_request(event->target_id); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } } else { @@ -541,8 +566,9 @@ static int juno_debug_process_event(const struct fwk_event *event, * acknowledgment is required and the ISR needs to be * re-enabled. */ - if (dev_ctx.user_id == SCP_DEBUG_USER_DAP) + if (dev_ctx.user_id == SCP_DEBUG_USER_DAP) { set_ack_debug_pwrup_req(); + } status = FWK_SUCCESS; break; @@ -553,33 +579,39 @@ static int juno_debug_process_event(const struct fwk_event *event, /* Turn on DBGSYS */ status = turn_on_pd(config->pd_dbgsys_id, SET_STATE_DBGSYS); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } /* FALLTHRU */ case SET_STATE_DBGSYS: /* Turn on BIG_SSTOP */ status = turn_on_pd(config->pd_big_sstop_id, SET_STATE_BIG_SSTOP); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } /* FALLTHRU */ case SET_STATE_BIG_SSTOP: /* Turn on LITTLE_SSTOP */ status = turn_on_pd(config->pd_little_sstop_id, SET_STATE_LITTLE_SSTOP); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } /* FALLTHRU */ case SET_STATE_LITTLE_SSTOP: @@ -587,8 +619,9 @@ static int juno_debug_process_event(const struct fwk_event *event, * Apply clock settings */ status = apply_clock_settings(juno_css_debug_dev); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } if (juno_css_debug_dev->manual_reset_required) { SCP_CONFIG->SYS_MANUAL_RESET.SET = @@ -608,8 +641,9 @@ static int juno_debug_process_event(const struct fwk_event *event, * acknowledgment is required and the ISR needs to be * re-enabled. */ - if (dev_ctx.user_id == SCP_DEBUG_USER_DAP) + if (dev_ctx.user_id == SCP_DEBUG_USER_DAP) { set_ack_debug_pwrup_req(); + } status = FWK_SUCCESS; diff --git a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c index a51694b86cc1ea5ce453b40ca1d69bc4cc40f201..2b98577e4cb3e1be5535506e91c5b955ab6f9150 100644 --- a/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c +++ b/product/juno/module/juno_dmc400/src/mod_juno_dmc400.c @@ -112,8 +112,9 @@ static void dmc_delay_cycles(uint32_t dmc_cycles) { unsigned int i; - for (i = 0; i < (dmc_cycles / ctx.dmc_refclk_ratio); i++) + for (i = 0; i < (dmc_cycles / ctx.dmc_refclk_ratio); i++) { __NOP(); + } } static void init_ddr_chip(struct mod_juno_dmc400_reg *dmc, uint32_t dev) @@ -190,12 +191,14 @@ static int ddr_phy_init(fwk_id_t id) dmc = (struct mod_juno_dmc400_reg *)element_config->dmc; status = ctx.ddr_phy_api->configure_ddr(element_config->ddr_phy_0_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ctx.ddr_phy_api->configure_ddr(element_config->ddr_phy_1_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Initialize PHYs */ dmc->USER_CONFIG0 |= DMC_USER_CONFIG_DFI_INIT_START; @@ -207,8 +210,9 @@ static int ddr_phy_init(fwk_id_t id) DMC400_PHY_INIT_WAIT_TIMEOUT_US, dmc_user_config_dfi_check, dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* Remove initialization request */ @@ -231,23 +235,27 @@ static int ddr_clk_init(fwk_id_t id) /* Clock divider */ status = ddr_clock_div_set(module_config->timer_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Clock source */ status = ddr_clock_sel_set(module_config->timer_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Clock enable */ status = ddr_clock_enable(module_config->timer_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Set DDR PHY PLLs after DMCCLK is stable */ status = ctx.ddr_phy_api->configure_clk(fwk_module_id_juno_ddr_phy400); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } ddr_remove_poreset(dmc); @@ -404,12 +412,14 @@ static int ddr_training(fwk_id_t id) status = ctx.timer_api->time_to_timestamp(module_config->timer_id, DMC400_TRAINING_TIMEOUT_US, &timeout); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ctx.timer_api->get_counter(module_config->timer_id, &counter); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } timeout += counter; @@ -434,10 +444,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M0_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } /* Channel 1, chip 0 */ @@ -448,10 +460,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M1_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } if (element_config->ddr_chip_count > 1) { @@ -463,10 +477,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M0_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } /* Channel 1, chip 1 */ @@ -477,10 +493,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M1_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } } @@ -496,10 +514,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M0_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } /* Channel 1, chip 0 */ @@ -510,10 +530,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M1_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } if (element_config->ddr_chip_count > 1) { @@ -525,10 +547,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M0_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } /* Channel 1, chip 1 */ @@ -539,10 +563,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M1_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } } @@ -558,10 +584,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M0_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } /* Channel 1, chip 0 */ @@ -572,10 +600,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M1_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } if (element_config->ddr_chip_count > 1) { @@ -587,10 +617,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M0_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } /* Channel 1, chip 1 */ @@ -601,10 +633,12 @@ static int ddr_training(fwk_id_t id) DMC_CHANNEL_STATUS_M1_IDLE) { status = ctx.timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; - if (remaining_ticks == 0) + } + if (remaining_ticks == 0) { goto timeout; + } } } @@ -635,12 +669,14 @@ static int ddr_retraining(fwk_id_t id) DMC400_CONFIG_WAIT_TIMEOUT_US, ddr_cmd_config_check, dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_training(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } dmc->MEMC_CMD = DMC400_CMD_GO; @@ -670,8 +706,9 @@ static int ddr_wake(fwk_id_t id) /* Disable PHY retention */ status = ctx.ddr_phy_api->configure_retention(fwk_module_id_juno_ddr_phy400, false); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } dmc_delay_cycles(64); @@ -685,8 +722,9 @@ static int ddr_wake(fwk_id_t id) DMC400_CONFIG_WAIT_TIMEOUT_US, ddr_cmd_config_check, dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } ddr_chip_count = element_config->ddr_chip_count; for (channel = 0; channel < DDR_CHANNEL_COUNT; channel++) { @@ -703,8 +741,9 @@ static int ddr_wake(fwk_id_t id) DMC400_CONFIG_WAIT_TIMEOUT_US, ddr_cmd_go_check, dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } dmc_delay_cycles(64); @@ -723,16 +762,19 @@ static int ddr_resume(const struct mod_juno_dmc400_element_config *config, dmc = (struct mod_juno_dmc400_reg *)config->dmc; status = ddr_clk_init(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_phy_init(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_dmc_init(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Sleep the DMC */ dmc->MEMC_CMD = DMC400_CMD_SLEEP; @@ -740,19 +782,22 @@ static int ddr_resume(const struct mod_juno_dmc400_element_config *config, DMC400_CONFIG_WAIT_TIMEOUT_US, ddr_cmd_sleep_check, dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_wake(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_unsubscribe( mod_pd_notification_id_power_state_transition, config->pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_notification_subscribe( mod_pd_notification_id_power_state_pre_transition, @@ -771,8 +816,9 @@ static int ddr_suspend(const struct mod_juno_dmc400_element_config *config, dmc = (struct mod_juno_dmc400_reg *)config->dmc; status = fwk_interrupt_disable(PHY_TRAINING_IRQ); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_STATE; + } /* Set low power mode */ dmc->MEMC_CMD = DMC400_CMD_SLEEP; @@ -785,25 +831,29 @@ static int ddr_suspend(const struct mod_juno_dmc400_element_config *config, /* Wait for the PHYs to be idle */ status = ctx.ddr_phy_api->configure_idle(config->ddr_phy_0_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ctx.ddr_phy_api->configure_idle(config->ddr_phy_1_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Enable PHY retention */ status = ctx.ddr_phy_api->configure_retention(fwk_module_id_juno_ddr_phy400, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_unsubscribe( mod_pd_notification_id_power_state_pre_transition, config->pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_notification_subscribe( mod_pd_notification_id_power_state_transition, @@ -868,26 +918,30 @@ static int juno_dmc400_bind(fwk_id_t id, unsigned int round) const struct mod_juno_dmc400_module_config *module_config; /* Nothing to do in the second round of calls */ - if (round >= 1) + if (round >= 1) { return FWK_SUCCESS; + } /* Nothing to do in case of elements */ - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { return FWK_SUCCESS; + } module_config = fwk_module_get_data(fwk_module_id_juno_dmc400); fwk_assert(module_config != NULL); status = fwk_module_bind(module_config->ddr_phy_module_id, module_config->ddr_phy_api_id, &ctx.ddr_phy_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(module_config->timer_id, FWK_ID_API(FWK_MODULE_IDX_TIMER, 0), &ctx.timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -899,8 +953,9 @@ static int juno_dmc400_start(fwk_id_t id) struct mod_juno_dmc400_reg *dmc; /* Nothing to start for the module */ - if (fwk_module_is_valid_module_id(id)) + if (fwk_module_is_valid_module_id(id)) { return FWK_SUCCESS; + } if (SCC->GPR0 & SCC_GPR0_DDR_DISABLE) { FWK_LOG_INFO("[DMC] GPR_0 disable flag set: skipping init"); @@ -911,8 +966,9 @@ static int juno_dmc400_start(fwk_id_t id) element_config = fwk_module_get_data(id); dmc = (struct mod_juno_dmc400_reg *)element_config->dmc; - if (!fwk_expect(dmc != NULL)) + if (!fwk_expect(dmc != NULL)) { return FWK_E_PARAM; + } fwk_assert(CLKDIV > 0); @@ -922,32 +978,38 @@ static int juno_dmc400_start(fwk_id_t id) FWK_LOG_INFO("[DMC] Initializing DMC-400 at 0x%x", (uintptr_t)dmc); status = ddr_clk_init(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_phy_init(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_dmc_init(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } fwk_interrupt_global_disable(); status = ddr_training(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } fwk_interrupt_global_enable(); status = fwk_interrupt_set_isr(PHY_TRAINING_IRQ, ddr_phy_irq_handler); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_STATE; + } status = fwk_interrupt_clear_pending(PHY_TRAINING_IRQ); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_STATE; + } fwk_interrupt_enable(PHY_TRAINING_IRQ); @@ -978,8 +1040,9 @@ static int juno_dmc400_process_notification(const struct fwk_event *event, struct mod_pd_power_state_pre_transition_notification_resp_params *pd_resp_params; - if (!fwk_module_is_valid_element_id(event->target_id)) + if (!fwk_module_is_valid_element_id(event->target_id)) { return FWK_E_PARAM; + } element_config = fwk_module_get_data(event->target_id); @@ -988,10 +1051,11 @@ static int juno_dmc400_process_notification(const struct fwk_event *event, pd_transition_params = (const struct mod_pd_power_state_transition_notification_params *) event->params; - if (pd_transition_params->state != MOD_PD_STATE_ON) + if (pd_transition_params->state != MOD_PD_STATE_ON) { return FWK_SUCCESS; - else + } else { return ddr_resume(element_config, event->target_id); + } } else if (fwk_id_is_equal(event->id, mod_pd_notification_id_power_state_pre_transition)) { pd_pre_transition_params = @@ -1009,18 +1073,20 @@ static int juno_dmc400_process_notification(const struct fwk_event *event, pd_resp_params->status = status; return status; - } - else + } else { return FWK_SUCCESS; - } else + } + } else { return FWK_E_HANDLER; + } } static int juno_dmc400_process_event(const struct fwk_event *event, struct fwk_event *resp) { - if (fwk_id_get_event_idx(event->id) >= JUNO_DMC400_EVENT_IDX_COUNT) + if (fwk_id_get_event_idx(event->id) >= JUNO_DMC400_EVENT_IDX_COUNT) { return FWK_E_PARAM; + } return ddr_retraining(event->target_id); } diff --git a/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c b/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c index 1858296c95b0177a0a47d30233811c36a2b72f67..b18e776d720ec6ba18a1be0b510bdb8b27152b64 100644 --- a/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c +++ b/product/juno/module/juno_hdlcd/src/mod_juno_hdlcd.c @@ -80,10 +80,11 @@ static int round_rate(struct juno_hdlcd_dev_ctx *ctx, case MOD_CLOCK_ROUND_MODE_NEAREST: /* Select the rounded rate that is closest to the given rate */ - if ((rate - round_down) > (round_up - rate)) + if ((rate - round_down) > (round_up - rate)) { *rounded_rate = round_up; - else + } else { *rounded_rate = round_down; + } break; case MOD_CLOCK_ROUND_MODE_DOWN: @@ -99,8 +100,9 @@ static int round_rate(struct juno_hdlcd_dev_ctx *ctx, } - if ((*rounded_rate % ctx->config->min_step) != 0) + if ((*rounded_rate % ctx->config->min_step) != 0) { return FWK_E_RANGE; + } return FWK_SUCCESS; } @@ -138,8 +140,9 @@ void juno_hdlcd_request_complete(fwk_id_t dev_id, ctx = ctx_table + fwk_id_get_element_idx(module_ctx.request_clock_id); - if (response_param->status == FWK_SUCCESS) + if (response_param->status == FWK_SUCCESS) { enable_pll(module_ctx.request_clock_id, ctx); + } ctx->driver_response_api->request_complete(ctx->config->clock_hal_id, response_param); @@ -165,20 +168,24 @@ static int juno_hdlcd_set_rate(fwk_id_t clock_id, uint64_t rate, ctx = ctx_table + fwk_id_get_element_idx(clock_id); /* Only the first 32-bits are taken */ - if (rate > UINT32_MAX) + if (rate > UINT32_MAX) { return FWK_E_RANGE; + } status = round_rate(ctx, round_mode, rate, &rounded_rate); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if ((rounded_rate < ctx->config->min_rate) || - (rounded_rate > ctx->config->max_rate)) + (rounded_rate > ctx->config->max_rate)) { return FWK_E_RANGE; + } if (platform == JUNO_IDX_PLATFORM_RTL) { - if (!fwk_id_is_equal(module_ctx.request_clock_id, FWK_ID_NONE)) + if (!fwk_id_is_equal(module_ctx.request_clock_id, FWK_ID_NONE)) { return FWK_E_BUSY; + } } /* @@ -226,8 +233,9 @@ static int juno_hdlcd_set_rate(fwk_id_t clock_id, uint64_t rate, /* Find entry on the look-up table */ ctx->index = (clock_rate - PXL_CLK_IN_RATE) / (500 * FWK_KHZ); if ((ctx->index < 0) || - ((unsigned int)ctx->index >= ctx->config->lookup_table_count)) + ((unsigned int)ctx->index >= ctx->config->lookup_table_count)) { return FWK_E_RANGE; + } FWK_LOG_INFO( "[HDLCD%u] Entry index:%d", @@ -246,8 +254,9 @@ static int juno_hdlcd_set_rate(fwk_id_t clock_id, uint64_t rate, FWK_LOG_ERR("[HDLCD] Failed to set board clock"); return FWK_E_DEVICE; } - if (status == FWK_PENDING) + if (status == FWK_PENDING) { module_ctx.request_clock_id = clock_id; + } return status; } @@ -264,10 +273,12 @@ static int juno_hdlcd_get_rate(fwk_id_t clock_id, uint64_t *rate) /* Find out the clock source in use */ if ((*ctx->config->scc_control & SCC_HDLCD_CONTROL_PXLCLK_SEL) == - SCC_HDLCD_CONTROL_PXLCLK_SEL_CLKIN) + SCC_HDLCD_CONTROL_PXLCLK_SEL_CLKIN) { *rate = PXL_CLK_IN_RATE; - else + + } else { *rate = module_ctx.current_pll_rate; + } /* All frequencies are double the target pixel clock frequency */ *rate /= 2; @@ -285,8 +296,9 @@ static int juno_hdlcd_get_rate_from_index(fwk_id_t clock_id, static int juno_hdlcd_set_state(fwk_id_t clock_id, enum mod_clock_state state) { - if (state != MOD_CLOCK_STATE_RUNNING) + if (state != MOD_CLOCK_STATE_RUNNING) { return FWK_E_SUPPORT; + } return FWK_SUCCESS; } @@ -346,10 +358,12 @@ static int juno_hdlcd_dev_init(fwk_id_t element_id, fwk_assert(config->min_rate != 0); fwk_assert(config->max_rate != 0); - if (min_rate == 0) + if (min_rate == 0) { min_rate = config->min_rate; - if (max_rate == 0) + } + if (max_rate == 0) { max_rate = config->max_rate; + } /* * All the HDLCD clocks should have the same max_rate and the same min_rate @@ -369,26 +383,30 @@ static int juno_hdlcd_bind(fwk_id_t id, unsigned int round) struct juno_hdlcd_dev_ctx *ctx; /* Only bind in first round of calls */ - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } ctx = ctx_table + fwk_id_get_element_idx(id); /* Bind to clock HAL */ status = fwk_module_bind(ctx->config->clock_hal_id, ctx->config->clock_api_id, &ctx->driver_response_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } /* Bind to the driver API */ if (platform == JUNO_IDX_PLATFORM_RTL) { status = fwk_module_bind(ctx->config->driver_id, ctx->config->driver_api_id, &ctx->driver_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } } return FWK_SUCCESS; @@ -399,13 +417,14 @@ static int juno_hdlcd_process_bind_request(fwk_id_t source_id, fwk_id_t api_id, const void **api) { - if (fwk_id_is_equal(api_id, mod_juno_hdlcd_api_id_clock_driver)) + if (fwk_id_is_equal(api_id, mod_juno_hdlcd_api_id_clock_driver)) { *api = &clock_driver_api; - else if (fwk_id_is_equal(api_id, - mod_juno_hdlcd_api_id_hdlcd_driver_response)) + } else if (fwk_id_is_equal( + api_id, mod_juno_hdlcd_api_id_hdlcd_driver_response)) { *api = &hdlcd_driver_response_api; - else + } else { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -417,12 +436,14 @@ static int juno_hdlcd_start(fwk_id_t id) unsigned int od; int status; - if (!fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (!fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } status = juno_id_get_platform(&platform); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Read current PLL frequency */ nf = ((SCC->PLL[PLL_IDX_HDLCD].REG0 & PLL_REG0_NF) >> PLL_REG0_NF_POS) + 1; diff --git a/product/juno/module/juno_ppu/src/mod_juno_ppu.c b/product/juno/module/juno_ppu/src/mod_juno_ppu.c index 1449c56603e03f07e719681b9f6af7d750e358ad..d93659e56b82801e7df3b4a3c04dfb43f96252fc 100644 --- a/product/juno/module/juno_ppu/src/mod_juno_ppu.c +++ b/product/juno/module/juno_ppu/src/mod_juno_ppu.c @@ -108,8 +108,9 @@ static int clear_pending_wakeup_irq( int status; status = fwk_interrupt_clear_pending(config->wakeup_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_interrupt_clear_pending(config->wakeup_fiq); } @@ -119,8 +120,9 @@ static int enable_wakeup_irq(const struct mod_juno_ppu_element_config *config) int status; status = fwk_interrupt_enable(config->wakeup_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_interrupt_enable(config->wakeup_fiq); } @@ -130,8 +132,9 @@ static int disable_wakeup_irq(const struct mod_juno_ppu_element_config *config) int status; status = fwk_interrupt_disable(config->wakeup_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_interrupt_disable(config->wakeup_fiq); } @@ -151,8 +154,9 @@ static void enable_scp_remap(void) static void power_state_systop_init(struct ppu_reg *reg) { /* Wait for SYSTOP to power up */ - while ((reg->POWER_STATUS & PPU_REG_PPR_PSR) != PPU_MODE_ON) + while ((reg->POWER_STATUS & PPU_REG_PPR_PSR) != PPU_MODE_ON) { continue; + } disable_scp_remap(); } @@ -194,16 +198,18 @@ static int ppu_set_state_and_wait(struct ppu_ctx *ppu_ctx, if (fwk_id_is_equal(dev_config->timer_id, FWK_ID_NONE)) { /* Wait for the PPU to set */ - while (!set_power_status_check(¶ms)) + while (!set_power_status_check(¶ms)) { continue; + } } else { /* Allow the new PPU policy to set within a pre-defined timeout */ status = ppu_ctx->timer_api->wait(dev_config->timer_id, PPU_SET_STATE_AND_WAIT_TIMEOUT_US, set_power_status_check, ¶ms); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -220,8 +226,9 @@ static int get_state(struct ppu_ctx *ppu_ctx, unsigned int *state) { enum ppu_mode mode = ppu_ctx->reg->POWER_STATUS & PPU_REG_PPR_PSR; - if (!check_mode(mode)) + if (!check_mode(mode)) { return FWK_E_DEVICE; + } *state = ppu_mode_to_pd_state[mode]; @@ -263,8 +270,9 @@ static int pd_set_state(fwk_id_t ppu_id, unsigned int state) get_ctx(ppu_id, &ppu_ctx); - if (!fwk_expect(state < MOD_PD_STATE_COUNT)) + if (!fwk_expect(state < MOD_PD_STATE_COUNT)) { return FWK_E_PARAM; + } mode = pd_state_to_ppu_mode[state]; @@ -272,8 +280,9 @@ static int pd_set_state(fwk_id_t ppu_id, unsigned int state) case MOD_PD_STATE_ON: case MOD_PD_STATE_OFF: status = ppu_set_state_and_wait(ppu_ctx, mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } break; default: @@ -282,8 +291,9 @@ static int pd_set_state(fwk_id_t ppu_id, unsigned int state) status = ppu_ctx->pd_api->report_power_state_transition(ppu_ctx->bound_id, state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } return FWK_SUCCESS; } @@ -292,8 +302,9 @@ static int pd_get_state(fwk_id_t ppu_id, unsigned int *state) { struct ppu_ctx *ppu_ctx; - if (!fwk_expect(state != NULL)) + if (!fwk_expect(state != NULL)) { return FWK_E_PARAM; + } get_ctx(ppu_id, &ppu_ctx); @@ -308,12 +319,14 @@ static int pd_reset(fwk_id_t ppu_id) get_ctx(ppu_id, &ppu_ctx); status = ppu_set_state_and_wait(ppu_ctx, PPU_MODE_WARM_RESET); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } status = ppu_set_state_and_wait(ppu_ctx, PPU_MODE_ON); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } return FWK_SUCCESS; } @@ -321,8 +334,9 @@ static int pd_reset(fwk_id_t ppu_id) static int pd_shutdown(fwk_id_t ppu_id, enum mod_pd_system_shutdown system_shutdown) { - if (system_shutdown == MOD_PD_SYSTEM_WARM_RESET) + if (system_shutdown == MOD_PD_SYSTEM_WARM_RESET) { return FWK_E_SUPPORT; + } return FWK_SUCCESS; } @@ -349,17 +363,20 @@ static int dbgsys_set_state(fwk_id_t ppu_id, unsigned int state) get_ctx(ppu_id, &ppu_ctx); - if (state != MOD_PD_STATE_ON) + if (state != MOD_PD_STATE_ON) { return FWK_E_PWRSTATE; + } status = ppu_set_state_and_wait(ppu_ctx, PPU_MODE_ON); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ppu_ctx->pd_api->report_power_state_transition(ppu_ctx->bound_id, state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } juno_ppu_ctx.dbgsys_state = MOD_PD_STATE_ON; @@ -385,8 +402,9 @@ static int css_set_state(fwk_id_t ppu_id, unsigned int state) get_ctx(ppu_id, &ppu_ctx); - if (!fwk_expect(state < MOD_SYSTEM_POWER_POWER_STATE_COUNT)) + if (!fwk_expect(state < MOD_SYSTEM_POWER_POWER_STATE_COUNT)) { return FWK_E_PARAM; + } mode = pd_state_to_ppu_mode[state]; @@ -401,8 +419,9 @@ static int css_set_state(fwk_id_t ppu_id, unsigned int state) /* Power up SYSTOP */ status = ppu_set_state_and_wait(ppu_ctx, mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } juno_ppu_ctx.css_state = state; @@ -424,8 +443,9 @@ static int css_set_state(fwk_id_t ppu_id, unsigned int state) enable_scp_remap(); status = ppu_set_state_and_wait(ppu_ctx, mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } juno_ppu_ctx.css_state = state; @@ -440,8 +460,9 @@ static int css_set_state(fwk_id_t ppu_id, unsigned int state) status = ppu_ctx->pd_api->report_power_state_transition(ppu_ctx->bound_id, state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } return FWK_SUCCESS; } @@ -476,23 +497,26 @@ static int cluster_set_state(fwk_id_t ppu_id, unsigned int state) get_ctx(ppu_id, &ppu_ctx); - if ((uintptr_t)ppu_ctx->reg == PPU_BIG_SSTOP_BASE) + if ((uintptr_t)ppu_ctx->reg == PPU_BIG_SSTOP_BASE) { snoop_ctrl = &SCP_CONFIG->BIG_SNOOP_CONTROL; - else if ((uintptr_t)ppu_ctx->reg == PPU_LITTLE_SSTOP_BASE) + } else if ((uintptr_t)ppu_ctx->reg == PPU_LITTLE_SSTOP_BASE) { snoop_ctrl = &SCP_CONFIG->LITTLE_SNOOP_CONTROL; - else + } else { return FWK_E_PARAM; + } - if (!fwk_expect(state < MOD_PD_STATE_COUNT)) + if (!fwk_expect(state < MOD_PD_STATE_COUNT)) { return FWK_E_PARAM; + } mode = pd_state_to_ppu_mode[state]; switch (state) { case MOD_PD_STATE_ON: status = ppu_set_state_and_wait(ppu_ctx, mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } juno_utils_open_snoop_gate_and_wait(snoop_ctrl); break; @@ -503,8 +527,9 @@ static int cluster_set_state(fwk_id_t ppu_id, unsigned int state) juno_utils_close_snoop_gate(snoop_ctrl); status = ppu_set_state_and_wait(ppu_ctx, mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } break; @@ -514,8 +539,9 @@ static int cluster_set_state(fwk_id_t ppu_id, unsigned int state) status = ppu_ctx->pd_api->report_power_state_transition(ppu_ctx->bound_id, state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } return FWK_SUCCESS; } @@ -525,11 +551,13 @@ static bool cluster_deny(fwk_id_t ppu_id, unsigned int state) fwk_assert(fwk_module_is_valid_element_id(ppu_id)); - if (!fwk_expect(state < MOD_PD_STATE_COUNT)) + if (!fwk_expect(state < MOD_PD_STATE_COUNT)) { return true; + } - if (state != MOD_PD_STATE_OFF) + if (state != MOD_PD_STATE_OFF) { return false; + } return (juno_ppu_ctx.dbgsys_state == MOD_PD_STATE_ON); } @@ -555,24 +583,28 @@ static int core_set_state(fwk_id_t ppu_id, unsigned int state) dev_config = ppu_ctx->config; - if (!fwk_expect(state < MOD_PD_STATE_COUNT)) + if (!fwk_expect(state < MOD_PD_STATE_COUNT)) { return FWK_E_PARAM; + } mode = pd_state_to_ppu_mode[state]; switch (state) { case MOD_PD_STATE_OFF: status = ppu_set_state_and_wait(ppu_ctx, mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = clear_pending_wakeup_irq(dev_config); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = disable_wakeup_irq(dev_config); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_disable(dev_config->warm_reset_irq); @@ -580,16 +612,19 @@ static int core_set_state(fwk_id_t ppu_id, unsigned int state) case MOD_PD_STATE_SLEEP: status = ppu_set_state_and_wait(ppu_ctx, mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = clear_pending_wakeup_irq(dev_config); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = enable_wakeup_irq(dev_config); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_disable(dev_config->warm_reset_irq); @@ -597,12 +632,14 @@ static int core_set_state(fwk_id_t ppu_id, unsigned int state) case MOD_PD_STATE_ON: status = fwk_interrupt_clear_pending(dev_config->warm_reset_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_enable(dev_config->warm_reset_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ppu_set_state_and_wait(ppu_ctx, mode); @@ -615,13 +652,15 @@ static int core_set_state(fwk_id_t ppu_id, unsigned int state) break; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ppu_ctx->pd_api->report_power_state_transition(ppu_ctx->bound_id, state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } return FWK_SUCCESS; } @@ -637,12 +676,14 @@ static int core_reset(fwk_id_t ppu_id) dev_config = ppu_ctx->config; status = ppu_set_state_and_wait(ppu_ctx, PPU_MODE_WARM_RESET); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } status = fwk_interrupt_clear_pending(dev_config->warm_reset_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return ppu_set_state_and_wait(ppu_ctx, PPU_MODE_ON); } @@ -659,16 +700,19 @@ static int core_prepare_core_for_system_suspend(fwk_id_t ppu_id) dev_config = ppu_ctx->config; status = disable_wakeup_irq(dev_config); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_disable(dev_config->warm_reset_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ppu_request_state(ppu_ctx, PPU_MODE_OFF); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } config = fwk_module_get_data(fwk_module_id_juno_ppu); fwk_assert(config != NULL); @@ -698,16 +742,18 @@ static int rom_set_state_and_wait(fwk_id_t ppu_id, unsigned int state) enum ppu_mode mode; struct ppu_ctx *ppu_ctx; - if (!fwk_expect(state < MOD_PD_STATE_COUNT)) + if (!fwk_expect(state < MOD_PD_STATE_COUNT)) { return FWK_E_PARAM; + } get_ctx(ppu_id, &ppu_ctx); mode = pd_state_to_ppu_mode[state]; status = ppu_set_state_and_wait(ppu_ctx, mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } return FWK_SUCCESS; } @@ -772,8 +818,9 @@ static int juno_ppu_module_init(fwk_id_t module_id, unsigned int element_count, const void *data) { - if (!fwk_expect(element_count > 0)) + if (!fwk_expect(element_count > 0)) { return FWK_E_PANIC; + } juno_ppu_ctx.ppu_ctx_table = fwk_mm_calloc(element_count, sizeof(struct ppu_ctx)); @@ -800,8 +847,9 @@ static int juno_ppu_element_init(fwk_id_t ppu_id, ppu_ctx = juno_ppu_ctx.ppu_ctx_table + fwk_id_get_element_idx(ppu_id); - if (dev_config->reg_base == 0) + if (dev_config->reg_base == 0) { return FWK_E_PANIC; + } ppu_ctx->config = dev_config; ppu_ctx->reg = (struct ppu_reg *)dev_config->reg_base; @@ -809,11 +857,14 @@ static int juno_ppu_element_init(fwk_id_t ppu_id, if (dev_config->pd_type == MOD_PD_TYPE_SYSTEM) { status = ppu_get_state(ppu_ctx->reg, &mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if ((dev_config->reg_base == PPU_SYSTOP_BASE) && (mode != PPU_MODE_ON)) + if ((dev_config->reg_base == PPU_SYSTOP_BASE) && + (mode != PPU_MODE_ON)) { power_state_systop_init(ppu_ctx->reg); + } } return FWK_SUCCESS; @@ -831,8 +882,9 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round) (void)status; /* Bind in the second round only */ - if (round == 0) + if (round == 0) { return FWK_SUCCESS; + } if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { #ifdef BUILD_HAS_MOD_TIMER @@ -842,9 +894,10 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round) config->timer_alarm_id, MOD_TIMER_API_ID_ALARM, &juno_ppu_ctx.alarm_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; - #endif + } +#endif return FWK_SUCCESS; } @@ -857,8 +910,9 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round) /* Bind to the timer */ status = fwk_module_bind(dev_config->timer_id, MOD_TIMER_API_ID_TIMER, &ppu_ctx->timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } } #endif @@ -870,8 +924,9 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round) /* Bind back to the PD module */ status = fwk_module_bind(ppu_ctx->bound_id, mod_pd_api_id_driver_input, &ppu_ctx->pd_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } break; #endif @@ -881,8 +936,9 @@ static int juno_ppu_bind(fwk_id_t id, unsigned int round) /* Bind back to the System Power module */ status = fwk_module_bind(ppu_ctx->bound_id, mod_system_power_api_id_pd_driver_input, &ppu_ctx->pd_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } break; #endif @@ -928,12 +984,13 @@ static int juno_ppu_process_bind_request(fwk_id_t requester_id, case MOD_PD_TYPE_SYSTEM: case MOD_PD_TYPE_DEVICE: case MOD_PD_TYPE_DEVICE_DEBUG: - if (fwk_id_get_element_idx(id) == JUNO_PPU_DEV_IDX_SYSTOP) + if (fwk_id_get_element_idx(id) == JUNO_PPU_DEV_IDX_SYSTOP) { *api = &css_pd_driver_api; - else if (fwk_id_get_element_idx(id) == JUNO_PPU_DEV_IDX_DBGSYS) + } else if (fwk_id_get_element_idx(id) == JUNO_PPU_DEV_IDX_DBGSYS) { *api = &dbgsys_pd_driver_api; - else + } else { *api = &pd_driver_api; + } break; @@ -963,15 +1020,17 @@ static int juno_ppu_start(fwk_id_t id) enum ppu_mode mode; const struct mod_juno_ppu_element_config *dev_config; - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { return FWK_SUCCESS; + } ppu_ctx = juno_ppu_ctx.ppu_ctx_table + fwk_id_get_element_idx(id); dev_config = ppu_ctx->config; - if (ppu_ctx->config->pd_type != MOD_PD_TYPE_CORE) + if (ppu_ctx->config->pd_type != MOD_PD_TYPE_CORE) { return FWK_SUCCESS; + } warm_reset_irq = ppu_ctx->config->warm_reset_irq; wakeup_irq = ppu_ctx->config->wakeup_irq; @@ -980,8 +1039,9 @@ static int juno_ppu_start(fwk_id_t id) /* * Perform ISR configuration only when interrupts ID is provided */ - if ((warm_reset_irq == 0) || (wakeup_irq == 0) || (wakeup_fiq == 0)) + if ((warm_reset_irq == 0) || (wakeup_irq == 0) || (wakeup_fiq == 0)) { return FWK_SUCCESS; + } /* * Warm reset interrupt request @@ -989,21 +1049,25 @@ static int juno_ppu_start(fwk_id_t id) status = fwk_interrupt_set_isr_param(warm_reset_irq, core_warm_reset_handler, (uintptr_t)ppu_ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } status = ppu_get_state(ppu_ctx->reg, &mode); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (mode == PPU_MODE_ON) { status = fwk_interrupt_clear_pending(dev_config->warm_reset_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_enable(dev_config->warm_reset_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } } /* @@ -1012,14 +1076,16 @@ static int juno_ppu_start(fwk_id_t id) status = fwk_interrupt_set_isr_param(wakeup_irq, core_wakeup_handler, (uintptr_t)ppu_ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } status = fwk_interrupt_set_isr_param(wakeup_fiq, core_wakeup_handler, (uintptr_t)ppu_ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } return FWK_SUCCESS; } diff --git a/product/juno/module/juno_pvt/src/mod_juno_pvt.c b/product/juno/module/juno_pvt/src/mod_juno_pvt.c index 68091b4bb907997eb1850ce11f88c2e86bf407f8..a8cad8164294182dd0829d905af662fb7cb81c89 100644 --- a/product/juno/module/juno_pvt/src/mod_juno_pvt.c +++ b/product/juno/module/juno_pvt/src/mod_juno_pvt.c @@ -167,8 +167,9 @@ static int process_pvt_calibration(struct pvt_sub_dev_ctx *sensor_ctx, int freq_b; int slope_m; - if ((cal_45C == 0) || (cal_85C == 0)) + if ((cal_45C == 0) || (cal_85C == 0)) { return FWK_E_PARAM; + } /* Convert into kHz */ freq_45 = cal_45C * 10; @@ -176,8 +177,9 @@ static int process_pvt_calibration(struct pvt_sub_dev_ctx *sensor_ctx, /* Find the slope */ slope_m = (freq_85 - freq_45) / (85 - 45); - if (!fwk_expect(slope_m != 0)) + if (!fwk_expect(slope_m != 0)) { return FWK_E_PARAM; + } /* Find the intercept of the line */ freq_b = freq_85 - (slope_m * 85); @@ -189,16 +191,19 @@ static int process_pvt_calibration(struct pvt_sub_dev_ctx *sensor_ctx, * freq_fs must always be bigger than or equal to REFCLK_KHZ or * sample_window calculation won't work. */ - if (freq_fs < REFCLK_KHZ) + if (freq_fs < REFCLK_KHZ) { return FWK_E_RANGE; + } - if (freq_fs == 0) + if (freq_fs == 0) { return FWK_E_PARAM; + } /* Calculate sample window to fit the full scale reading */ sample_window = (SAMPLE_WINDOW_MASK * REFCLK_KHZ) / freq_fs; - if (sample_window > SAMPLE_WINDOW_MASK) + if (sample_window > SAMPLE_WINDOW_MASK) { return FWK_E_PARAM; + } /* Store constants for run-time calculations */ sensor_ctx->slope_m = slope_m; @@ -226,8 +231,9 @@ static int process_osc_calibration(struct pvt_sub_dev_ctx *sensor_ctx, unsigned int sample_window; unsigned int slope_m; - if ((cal_810 == 0) || (cal_900 == 0)) + if ((cal_810 == 0) || (cal_900 == 0)) { return FWK_E_PARAM; + } /* Convert into kHz */ freq_810 = cal_810 * 20; @@ -246,16 +252,19 @@ static int process_osc_calibration(struct pvt_sub_dev_ctx *sensor_ctx, * freq_fs must be always bigger than or equal to REFCLK_KHZ or * sample_window calculation won't work. */ - if (freq_fs < REFCLK_KHZ) + if (freq_fs < REFCLK_KHZ) { return FWK_E_RANGE; + } - if (freq_fs == 0) + if (freq_fs == 0) { return FWK_E_PARAM; + } /* Calculate sample window to fit the full scale reading */ sample_window = (SAMPLE_WINDOW_MASK * REFCLK_KHZ) / freq_fs; - if (sample_window > SAMPLE_WINDOW_MASK) + if (sample_window > SAMPLE_WINDOW_MASK) { return FWK_E_PARAM; + } /* Store constants for the run-time calculations */ sensor_ctx->slope_m = slope_m; @@ -300,8 +309,9 @@ static void pvt_interrupt_handler(uintptr_t param) sensor_ctx->last_reading = osc_counter; - if (!fwk_expect(sensor_ctx->sample_window != 0)) + if (!fwk_expect(sensor_ctx->sample_window != 0)) { goto exit; + } freq_khz = (osc_counter * REFCLK_KHZ) / sensor_ctx->sample_window; @@ -311,10 +321,10 @@ static void pvt_interrupt_handler(uintptr_t param) sensor_ctx->slope_m; if (sensor_cfg->type == JUNO_PVT_TYPE_TEMP) { - if ((mod_ctx.board_rev == JUNO_IDX_REVISION_R1) || - (mod_ctx.board_rev == JUNO_IDX_REVISION_R2)) + (mod_ctx.board_rev == JUNO_IDX_REVISION_R2)) { sensor_value -= R1_TEMP_OFFSET; + } value = (uint64_t)sensor_value; status = FWK_SUCCESS; @@ -324,8 +334,9 @@ static void pvt_interrupt_handler(uintptr_t param) value = (uint64_t)sensor_value; status = FWK_SUCCESS; - } else + } else { status = FWK_E_PARAM; + } exit: event = (struct fwk_event) { @@ -372,8 +383,9 @@ static int get_info(fwk_id_t id, struct mod_sensor_info *info) struct mod_juno_pvt_dev_config *sensor_cfg; struct pvt_dev_ctx *group_ctx; - if (mod_ctx.driver_is_disabled) + if (mod_ctx.driver_is_disabled) { return FWK_E_DEVICE; + } group_ctx = &dev_ctx[fwk_id_get_element_idx(id)]; sensor_cfg = &group_ctx->sensor_cfg_table[fwk_id_get_sub_element_idx(id)]; @@ -392,14 +404,16 @@ static int get_value(fwk_id_t id, uint64_t *value) struct fwk_event read_req; int status; - if (mod_ctx.driver_is_disabled) + if (mod_ctx.driver_is_disabled) { return FWK_E_DEVICE; + } elt_idx = fwk_id_get_element_idx(id); group_ctx = &dev_ctx[elt_idx]; - if (!group_ctx->pd_state_on) + if (!group_ctx->pd_state_on) { return FWK_E_PWRSTATE; + } if (fwk_id_is_equal(group_ctx->sensor_read_id, FWK_ID_NONE)) { /* No other sensors within the group are being read, mark this one */ @@ -418,8 +432,9 @@ static int get_value(fwk_id_t id, uint64_t *value) status = FWK_E_BUSY; } - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { return FWK_PENDING; + } return status; } @@ -440,21 +455,25 @@ static int juno_pvt_init(fwk_id_t module_id, int status; enum juno_idx_platform plat; - if (element_count == 0) + if (element_count == 0) { return FWK_E_PARAM; + } dev_ctx = fwk_mm_calloc(element_count, sizeof(struct pvt_dev_ctx)); status = juno_id_get_platform(&plat); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (plat == JUNO_IDX_PLATFORM_FVP) + if (plat == JUNO_IDX_PLATFORM_FVP) { mod_ctx.driver_is_disabled = true; + } status = juno_id_get_revision(&mod_ctx.board_rev); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } mod_ctx.elem_count = element_count; @@ -467,12 +486,14 @@ static int juno_pvt_element_init(fwk_id_t element_id, { struct pvt_dev_ctx *group_ctx; - if (mod_ctx.driver_is_disabled) + if (mod_ctx.driver_is_disabled) { return FWK_SUCCESS; + } /* When no sub-elements are defined, the group is not defined */ - if (sub_element_count == 0) + if (sub_element_count == 0) { return FWK_SUCCESS; + } group_ctx = &dev_ctx[fwk_id_get_element_idx(element_id)]; @@ -493,23 +514,25 @@ static int juno_pvt_bind(fwk_id_t id, unsigned int round) struct pvt_sub_dev_ctx *sensor_ctx; /* Bind in the second round */ - if ((round == 0) || - mod_ctx.driver_is_disabled || - fwk_module_is_valid_module_id(id)) + if ((round == 0) || mod_ctx.driver_is_disabled || + fwk_module_is_valid_module_id(id)) { return FWK_SUCCESS; + } group_ctx = &dev_ctx[fwk_id_get_element_idx(id)]; sub_element_count = fwk_module_get_sub_element_count(id); - if (sub_element_count < 0) + if (sub_element_count < 0) { return FWK_E_DATA; + } /* * When no sub-elements are defined, there sensor group does not require * binding. */ - if (sub_element_count == 0) + if (sub_element_count == 0) { return FWK_SUCCESS; + } /* * Bind to sensor HAL module @@ -523,8 +546,9 @@ static int juno_pvt_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(sensor_ctx->sensor_hal_id, mod_sensor_api_id_driver_response, &group_ctx->driver_response_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -540,8 +564,9 @@ static int juno_pvt_process_bind_request(fwk_id_t source_id, if ((!fwk_module_is_valid_element_id(source_id)) || (!fwk_module_is_valid_sub_element_id(target_id)) || (fwk_id_get_module_idx(source_id) != FWK_MODULE_IDX_SENSOR) || - (mod_ctx.driver_is_disabled)) + (mod_ctx.driver_is_disabled)) { return FWK_E_ACCESS; + } group_ctx = &dev_ctx[fwk_id_get_element_idx(target_id)]; sensor_ctx = &group_ctx->sensor_ctx_table[ @@ -565,8 +590,9 @@ static int pvt_start(fwk_id_t id) uint16_t calibration_b; uint8_t sub_elem_ix; - if (mod_ctx.driver_is_disabled) + if (mod_ctx.driver_is_disabled) { return FWK_SUCCESS; + } if (fwk_module_is_valid_module_id(id)) { @@ -583,8 +609,9 @@ static int pvt_start(fwk_id_t id) status = fwk_notification_subscribe( mod_pd_notification_id_power_state_transition, dbgsys_pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -592,15 +619,17 @@ static int pvt_start(fwk_id_t id) group_ctx = &dev_ctx[fwk_id_get_element_idx(id)]; sub_element_count = fwk_module_get_sub_element_count(id); - if (sub_element_count < 0) + if (sub_element_count < 0) { return FWK_E_DATA; + } /* * When no sub-elements are defined, there are no sensors to be * calibrated. */ - if (sub_element_count == 0) + if (sub_element_count == 0) { return FWK_SUCCESS; + } sensor_cfg = group_ctx->sensor_cfg_table; @@ -635,8 +664,9 @@ static int pvt_start(fwk_id_t id) break; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } } sensor_cfg = group_ctx->sensor_cfg_table; @@ -645,15 +675,17 @@ static int pvt_start(fwk_id_t id) mod_pd_notification_id_power_state_pre_transition, sensor_cfg->group->pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_subscribe( mod_pd_notification_id_power_state_transition, sensor_cfg->group->pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; @@ -676,8 +708,9 @@ static int unsubscribe_cluster_notif(void) int status; for (unsigned int i = 0; i < mod_ctx.elem_count; i++) { - if ((i != JUNO_PVT_GROUP_BIG) && (i != JUNO_PVT_GROUP_LITTLE)) + if ((i != JUNO_PVT_GROUP_BIG) && (i != JUNO_PVT_GROUP_LITTLE)) { continue; + } group_ctx = &dev_ctx[i]; @@ -689,15 +722,17 @@ static int unsubscribe_cluster_notif(void) mod_pd_notification_id_power_state_pre_transition, sensor_cfg->group->pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_unsubscribe( mod_pd_notification_id_power_state_transition, sensor_cfg->group->pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } group_ctx->pd_state_on = true; } @@ -737,14 +772,16 @@ static int pvt_process_event(const struct fwk_event *event, group = sensor_cfg->group; if ((group->regs->GROUP_INFO & PVTGROUP_GROUP_INFO_LOC) != - PVTGROUP_GROUP_INFO_LOC_GROUP_LITE) + PVTGROUP_GROUP_INFO_LOC_GROUP_LITE) { return respond(group_ctx); + } sensor_count = (group->regs->GROUP_INFO & PVTGROUP_SENSOR_COUNT_MASK) >> 1; - if (sensor_count < group->sensor_count) + if (sensor_count < group->sensor_count) { return respond(group_ctx); + } /* * Configure the group before reading a sensor within it. @@ -757,18 +794,21 @@ static int pvt_process_event(const struct fwk_event *event, group->regs->SSI_RATE_DIV = 0; status = fwk_interrupt_clear_pending(group->irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return respond(group_ctx); + } status = fwk_interrupt_set_isr_param(group->irq, &pvt_interrupt_handler, (uintptr_t)group_ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return respond(group_ctx); + } status = fwk_interrupt_enable(group->irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return respond(group_ctx); + } /* Initiate measurement for group/sensor */ group->regs->SENSOR_ENABLE = (uint32_t)(1U << sensor_cfg->index); @@ -794,14 +834,16 @@ static int pvt_process_event(const struct fwk_event *event, status = fwk_thread_get_delayed_response(event->target_id, group_ctx->cookie, &resp_notif); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } pd_resp_params->status = FWK_SUCCESS; status = fwk_thread_put_event(&resp_notif); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } } return FWK_SUCCESS; @@ -829,8 +871,9 @@ static int pvt_process_notification(const struct fwk_event *event, (struct mod_pd_power_state_transition_notification_params *) event->params; - if (post_state_params->state == MOD_PD_STATE_ON) + if (post_state_params->state == MOD_PD_STATE_ON) { return unsubscribe_cluster_notif(); + } return FWK_SUCCESS; } @@ -842,8 +885,9 @@ static int pvt_process_notification(const struct fwk_event *event, pre_state_params = (struct mod_pd_power_state_pre_transition_notification_params *) event->params; - if (pre_state_params->target_state == MOD_PD_STATE_OFF) + if (pre_state_params->target_state == MOD_PD_STATE_OFF) { group_ctx->pd_state_on = false; + } if (!fwk_id_is_equal(group_ctx->sensor_read_id, FWK_ID_NONE)) { /* Read request ongoing, delay the response */ @@ -869,10 +913,12 @@ static int pvt_process_notification(const struct fwk_event *event, post_state_params = (struct mod_pd_power_state_transition_notification_params *) event->params; - if (post_state_params->state == MOD_PD_STATE_ON) + if (post_state_params->state == MOD_PD_STATE_ON) { group_ctx->pd_state_on = true; - } else + } + } else { return FWK_E_PARAM; + } return FWK_SUCCESS; } diff --git a/product/juno/module/juno_ram/src/mod_juno_ram.c b/product/juno/module/juno_ram/src/mod_juno_ram.c index 9af8eb3f15d4a851f61bb079968618989087d0ba..b33cfe5e8f25d028b1df846439a85b8662d54984 100644 --- a/product/juno/module/juno_ram/src/mod_juno_ram.c +++ b/product/juno/module/juno_ram/src/mod_juno_ram.c @@ -77,11 +77,13 @@ static int pcie_add_translation_table_entry( * If 'size' is not a power of two, get the smallest power of two greater * than 'size'. */ - if ((size & (size - 1)) != 0) + if ((size & (size - 1)) != 0) { log2_upper_bound++; + } - if (!fwk_expect((log2_upper_bound >= 12) && (log2_upper_bound <= 64))) + if (!fwk_expect((log2_upper_bound >= 12) && (log2_upper_bound <= 64))) { return FWK_E_PANIC; + } entry->SRC_ADDR_LO = (uint32_t)source_addr | (((log2_upper_bound - 1) << 1) | PCIE_ATR_IMPL); @@ -170,8 +172,9 @@ static int pcie_configure(void) enum juno_idx_revision revision_id = JUNO_IDX_REVISION_COUNT; status = juno_id_get_revision(&revision_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } if ((revision_id != JUNO_IDX_REVISION_R0) && ((SCC->GPR0 & SCC_GPR0_PCIE_AP_MANAGED) == 0)) { @@ -204,8 +207,9 @@ static int pcie_configure(void) GICV2M_MSI_BASE, GICV2M_MSI_SIZE, PCIE_TRSL_PARAM_AXIDEVICE); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* PCIE Window 0 - Translation: System memory support */ status = pcie_add_translation_table_entry( @@ -214,8 +218,9 @@ static int pcie_configure(void) JUNO_SYSTEM_MEMORY_BASE, JUNO_SYSTEM_MEMORY_SIZE, PCIE_TRSL_PARAM_AXIMEMORY); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = pcie_add_translation_table_entry( &PCIE_ROOT->ATR_PCIE_WIN0[2], @@ -223,8 +228,9 @@ static int pcie_configure(void) JUNO_EXTRA_SYSTEM_MEMORY_BASE, JUNO_EXTRA_SYSTEM_MEMORY_SIZE, PCIE_TRSL_PARAM_AXIMEMORY); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* AXI4 Slave - Translation: PCI ECAM support */ status = pcie_add_translation_table_entry( @@ -233,8 +239,9 @@ static int pcie_configure(void) PCI_ECAM_BASE, PCI_ECAM_SIZE, PCIE_TRSL_PARAM_PCIE_CONF); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* AXI4 Slave - Translation: PCI IO support */ status = pcie_add_translation_table_entry( @@ -243,8 +250,9 @@ static int pcie_configure(void) PCI_IO_BASE, PCI_IO_SIZE, PCIE_TRSL_PARAM_PCIE_IO); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* AXI4 Slave - Translation: PCI MEM32 support */ status = pcie_add_translation_table_entry( @@ -253,8 +261,9 @@ static int pcie_configure(void) PCI_MEM32_BASE, PCI_MEM32_SIZE, PCIE_TRSL_PARAM_PCIE_MEMORY); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* AXI4 Slave - Translation: PCI MEM64 support */ status = pcie_add_translation_table_entry( @@ -263,8 +272,9 @@ static int pcie_configure(void) PCI_MEM64_BASE, PCI_MEM64_SIZE, PCIE_TRSL_PARAM_PCIE_MEMORY); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Add credits */ PCIE_ROOT->CS.PCIE_VC_CRED_0 = 0x00F0B818; @@ -280,8 +290,9 @@ static int pcie_configure(void) TIMEOUT_RESET_PCIE_US, pcie_check_reset_completed, NULL); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } /* Wait for the link to be up */ status = ctx.timer_api->wait( @@ -289,8 +300,9 @@ static int pcie_configure(void) TIMEOUT_RESET_PCIE_US, pcie_check_link_up, NULL); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } /* Set up interrupt mask - Application Processor */ PCIE_ROOT->IE.IMASK_LOCAL = (PCIE_INT_LINES | PCIE_INT_MSI); @@ -303,11 +315,13 @@ static int initialize_peripherals(void) { int status = FWK_SUCCESS; - if (ctx.periph_initialized) + if (ctx.periph_initialized) { return status; + } - if (ctx.platform == JUNO_IDX_PLATFORM_RTL) + if (ctx.platform == JUNO_IDX_PLATFORM_RTL) { status = pcie_configure(); + } smc_configure(); @@ -333,8 +347,9 @@ static int juno_ram_init( static int juno_ram_bind(fwk_id_t id, unsigned int round) { - if (round != 0) + if (round != 0) { return FWK_SUCCESS; + } return fwk_module_bind(ctx.config->timer_id, MOD_TIMER_API_ID_TIMER, &ctx.timer_api); @@ -356,8 +371,9 @@ static int juno_ram_start(fwk_id_t id) fwk_assert(fwk_module_is_valid_module_id(id)); status = juno_id_get_platform(&ctx.platform); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } if (ctx.platform == JUNO_IDX_PLATFORM_RTL) { nic400_configure(); @@ -372,8 +388,9 @@ static int juno_ram_start(fwk_id_t id) mod_pd_notification_id_power_state_transition, pd_source_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return initialize_peripherals(); } @@ -395,11 +412,13 @@ static int juno_ram_process_notification( (pd_params->state == MOD_SYSTEM_POWER_POWER_STATE_SLEEP0)) { /* PD-sensitive peripherals will require re-init */ ctx.periph_initialized = false; - } else if (pd_params->state == MOD_PD_STATE_ON) + } else if (pd_params->state == MOD_PD_STATE_ON) { status = initialize_peripherals(); + } - } else + } else { status = FWK_E_PARAM; + } return status; } diff --git a/product/juno/module/juno_reset_domain/src/mod_juno_reset_domain.c b/product/juno/module/juno_reset_domain/src/mod_juno_reset_domain.c index 58c2a9457e2ab47cba488d949e52adb414d9cdbb..28c97780d4eff5a16c1ac15c5d34528f03b2bca4 100644 --- a/product/juno/module/juno_reset_domain/src/mod_juno_reset_domain.c +++ b/product/juno/module/juno_reset_domain/src/mod_juno_reset_domain.c @@ -53,8 +53,9 @@ static int handle_uart_reset_set_state(struct juno_reset_dev_ctx *dev_ctx) struct mod_juno_reset_uart_config* uart_config = (struct mod_juno_reset_uart_config*)dev_ctx->config; - if (dev_ctx->reset_state == DEVICE_STATE_RESET) + if (dev_ctx->reset_state == DEVICE_STATE_RESET) { return FWK_E_STATE; + } /* Reset UART device */ dev_ctx->reset_state = DEVICE_STATE_RESET; @@ -87,26 +88,28 @@ static int juno_set_reset_state(fwk_id_t dev_id, uintptr_t cookie) { int status; - struct juno_reset_dev_ctx* dev_ctx; - struct mod_reset_domain_autoreset_event_params* params; + struct juno_reset_dev_ctx *dev_ctx; + struct mod_reset_domain_autoreset_event_params *params; struct fwk_event autoreset_event = { .id = mod_reset_domain_autoreset_event_id, .target_id = fwk_module_id_reset_domain, }; unsigned int domain_idx = fwk_id_get_element_idx(dev_id); - if (domain_idx >= JUNO_RESET_DOMAIN_IDX_COUNT) + if (domain_idx >= JUNO_RESET_DOMAIN_IDX_COUNT) { return FWK_E_PARAM; + } dev_ctx = &module_juno_reset_ctx.dev_ctx_table[domain_idx]; if (domain_idx == JUNO_RESET_DOMAIN_IDX_UART) { status = handle_uart_reset_set_state(dev_ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - params = (struct mod_reset_domain_autoreset_event_params*) - autoreset_event.params; + params = (struct mod_reset_domain_autoreset_event_params *) + autoreset_event.params; params->dev_id = dev_id; params->reset_state = reset_state; params->cookie = cookie; @@ -165,8 +168,9 @@ static int juno_reset_domain_process_bind_request(fwk_id_t source_id, if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT) || !fwk_id_is_equal(api_id, mod_juno_reset_domain_api_id_driver) || - api == NULL) + api == NULL) { return FWK_E_PARAM; + } *api = &juno_reset_domain_drv_api; diff --git a/product/juno/module/juno_rom/src/juno_debug_rom.c b/product/juno/module/juno_rom/src/juno_debug_rom.c index dd5f25d9248a70acd5815be3d810856de1fa8dde..b377e0fc042137c9822bf91563e034e883e3e927 100644 --- a/product/juno/module/juno_rom/src/juno_debug_rom.c +++ b/product/juno/module/juno_rom/src/juno_debug_rom.c @@ -54,34 +54,41 @@ static void juno_debug_rom_set_clocks(void) * Setup ATCLK */ juno_utils_atclk_clock_div_set(JUNO_DEBUG_ROM_DIVIDER_ATCLK); - while (!juno_utils_atclk_clock_div_set_check(JUNO_DEBUG_ROM_DIVIDER_ATCLK)) + while ( + !juno_utils_atclk_clock_div_set_check(JUNO_DEBUG_ROM_DIVIDER_ATCLK)) { continue; + } juno_utils_atclk_clock_sel_set(SCP_CONFIG_STDCLK_CONTROL_CLKSEL_SYSINCLK); while (!juno_utils_atclk_clock_sel_set_check( - SCP_CONFIG_STDCLK_CONTROL_CLKSEL_SYSINCLK)) + SCP_CONFIG_STDCLK_CONTROL_CLKSEL_SYSINCLK)) { continue; + } /* * Setup TRACECLKIN */ juno_utils_traceclk_clock_div_set(JUNO_DEBUG_ROM_DIVIDER_TRACECLK); while (!juno_utils_traceclk_clock_div_set_check( - JUNO_DEBUG_ROM_DIVIDER_TRACECLK)) + JUNO_DEBUG_ROM_DIVIDER_TRACECLK)) { continue; + } juno_utils_traceclk_clock_sel_set( SCP_CONFIG_STDCLK_CONTROL_CLKSEL_SYSINCLK); while (!juno_utils_traceclk_clock_sel_set_check( - SCP_CONFIG_STDCLK_CONTROL_CLKSEL_SYSINCLK)) + SCP_CONFIG_STDCLK_CONTROL_CLKSEL_SYSINCLK)) { continue; + } /* * Setup PCLKDBG */ juno_utils_pclkdbg_clock_div_set(JUNO_DEBUG_ROM_DIVIDER_PCLK); - while (!juno_utils_pclkdbg_clock_div_set_check(JUNO_DEBUG_ROM_DIVIDER_PCLK)) + while ( + !juno_utils_pclkdbg_clock_div_set_check(JUNO_DEBUG_ROM_DIVIDER_PCLK)) { continue; + } } /* @@ -175,8 +182,9 @@ static void juno_debug_cdbg_rst_req_isr(void) /* Wait for CoreSight to de-assert request */ while ((SCP_CONFIG->DEBUG_STATUS & SCP_CONFIG_DEBUG_STATUS_CDBGRSTREQ) == - SCP_CONFIG_DEBUG_STATUS_CDBGRSTREQ) + SCP_CONFIG_DEBUG_STATUS_CDBGRSTREQ) { continue; + } /* De-assert reset */ SCP_CONFIG->SYS_MANUAL_RESET.SET = SCP_CONFIG_SYS_MANUAL_RESET_DBGSYSRESET; @@ -211,18 +219,21 @@ int juno_debug_rom_init(const struct mod_juno_ppu_rom_api *rom_ppu_api) status = fwk_interrupt_set_isr(CDBG_PWR_UP_REQ_IRQ, juno_debug_cdbg_pwr_up_req_isr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_set_isr(CSYS_PWR_UP_REQ_IRQ, juno_debug_csys_pwr_up_req_isr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_set_isr(CDBG_RST_REQ_IRQ, juno_debug_cdbg_rst_req_isr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } fwk_interrupt_enable(CDBG_PWR_UP_REQ_IRQ); fwk_interrupt_enable(CDBG_RST_REQ_IRQ); diff --git a/product/juno/module/juno_rom/src/mod_juno_rom.c b/product/juno/module/juno_rom/src/mod_juno_rom.c index 92cb53765546798804ae93635c4f1aa523c32fa3..0fd4c259a6d86f01f140091ffc1a637b14242604 100644 --- a/product/juno/module/juno_rom/src/mod_juno_rom.c +++ b/product/juno/module/juno_rom/src/mod_juno_rom.c @@ -91,23 +91,27 @@ static int power_cluster_and_cores_from_boot_map( fwk_assert(core_ppu_table != NULL); - if (boot_map == 0) + if (boot_map == 0) { return FWK_SUCCESS; + } /* Turn on the cluster */ status = ctx.ppu_api->set_state_and_wait(cluster_ppu, MOD_PD_STATE_ON); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } /* Assign the specified snoop for this cluster */ if (fwk_id_get_element_idx(cluster_ppu) == - fwk_id_get_element_idx(little_cluster_ppu)) + fwk_id_get_element_idx(little_cluster_ppu)) { snoop_ctrl = &SCP_CONFIG->LITTLE_SNOOP_CONTROL; - else if (fwk_id_get_element_idx(cluster_ppu) == - fwk_id_get_element_idx(big_cluster_ppu)) + } else if ( + fwk_id_get_element_idx(cluster_ppu) == + fwk_id_get_element_idx(big_cluster_ppu)) { snoop_ctrl = &SCP_CONFIG->BIG_SNOOP_CONTROL; - else + } else { return FWK_E_PANIC; + } juno_utils_open_snoop_gate_and_wait(snoop_ctrl); @@ -121,8 +125,9 @@ static int power_cluster_and_cores_from_boot_map( core_ppu_table[i], MOD_PD_STATE_ON); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } } } @@ -152,8 +157,9 @@ static void css_clock_cluster_div_set(volatile uint32_t *clk, *clk = (*clk & ~(div_set_mask)) | div_set; if (wait) { - while ((*clk & div_check_mask) != div_check) + while ((*clk & div_check_mask) != div_check) { continue; + } } } @@ -165,8 +171,9 @@ static void css_clock_cluster_sel_set(volatile uint32_t *clk, if (wait) { while ((*clk & CLUSTERCLK_CONTROL_CRNTCLK) != - (source << CRNT_CLK_DIV_POS)) + (source << CRNT_CLK_DIV_POS)) { continue; + } } } @@ -231,8 +238,9 @@ static int juno_rom_init( unsigned int element_count, const void *data) { - if (!fwk_expect(data != NULL)) + if (!fwk_expect(data != NULL)) { return FWK_E_PARAM; + } /* Enable all clocks */ SCP_CONFIG->CLOCK_ENABLE_SET = SCP_CONFIG_CLOCK_ENABLE_ALL; @@ -248,20 +256,23 @@ static int juno_rom_bind(fwk_id_t id, unsigned int round) { int status; - if (round != 0) + if (round != 0) { return FWK_SUCCESS; + } status = fwk_module_bind(fwk_module_id_juno_ppu, mod_juno_ppu_api_id_rom, &ctx.ppu_api); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } status = fwk_module_bind( fwk_module_id_bootloader, FWK_ID_API(FWK_MODULE_IDX_BOOTLOADER, 0), &ctx.bootloader_api); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } return FWK_SUCCESS; } @@ -276,14 +287,15 @@ static int juno_rom_start(fwk_id_t id) .id = mod_juno_rom_event_id_run, }; - #ifndef BUILD_MODE_DEBUG +#ifndef BUILD_MODE_DEBUG juno_wdog_rom_halt_on_debug_config(); juno_wdog_rom_enable(); - #endif +#endif status = juno_debug_rom_init(ctx.ppu_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_thread_put_event(&event); } @@ -332,8 +344,9 @@ static int juno_rom_process_event( } /* Set NIC400 ThinLinks interface state */ - if (SCC->NIC400_TLX & SCC_TLX_MST_ENABLE) + if (SCC->NIC400_TLX & SCC_TLX_MST_ENABLE) { NIC400->REMAP |= NIC400_REMAP_TLX_EN; + } /* Set alternative AP ROM address (if applicable) */ if (SCC->APP_ALT_BOOT != (uint32_t)0) { @@ -358,21 +371,22 @@ static int juno_rom_process_event( memset((void *)ctx.config->ap_context_base, 0, ctx.config->ap_context_size); /* Send SYSTOP ON notification */ - systop_on_event = (struct fwk_event) { - .response_requested = true, - .id = mod_juno_rom_notification_id_systop, - .source_id = FWK_ID_NONE - }; + systop_on_event = + (struct fwk_event){ .response_requested = true, + .id = mod_juno_rom_notification_id_systop, + .source_id = FWK_ID_NONE }; notification_params = (void *)systop_on_event.params; notification_params->state = MOD_PD_STATE_ON; status = fwk_notification_notify(&systop_on_event, &ctx.notification_count); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } - if (ctx.notification_count == 0) + if (ctx.notification_count == 0) { return deferred_setup(); + } return FWK_SUCCESS; } @@ -385,12 +399,14 @@ static int juno_rom_process_notification( fwk_assert(event->is_response == true); /* At least one notification response must be outstanding */ - if (!fwk_expect(ctx.notification_count > 0)) + if (!fwk_expect(ctx.notification_count > 0)) { return FWK_E_PANIC; + } /* Complete remaining setup now that all subscribers have responded */ - if ((--ctx.notification_count) == 0) + if ((--ctx.notification_count) == 0) { return deferred_setup(); + } return FWK_SUCCESS; } diff --git a/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c b/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c index 817d975b9cf0db9b14720ca50b3cd88843dba284..9afe700197a6e772d7a1f6c657677e2197277ef0 100644 --- a/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c +++ b/product/juno/module/juno_soc_clock/src/mod_juno_soc_clock.c @@ -77,12 +77,14 @@ static void pll_init(void) SCP_CONFIG_SCP_STATUS_BIGINPLLLOCK; /* Release All system PLLs from reset */ - for (pll_idx = 0; pll_idx < PLL_IDX_COUNT; pll_idx++) + for (pll_idx = 0; pll_idx < PLL_IDX_COUNT; pll_idx++) { SCC->PLL[pll_idx].REG0 &= ~PLL_REG0_PLL_RESET; + } /* Wait for PLLs to lock */ - while ((SCP_CONFIG->SCP_STATUS & pll_mask) != pll_mask) + while ((SCP_CONFIG->SCP_STATUS & pll_mask) != pll_mask) { continue; + } } static void set_div(volatile uint32_t * const control_reg, uint32_t divider) @@ -115,8 +117,9 @@ static int juno_soc_clock_init(fwk_id_t module_id, unsigned int clock_count, enum juno_idx_revision revision; status = juno_id_get_revision(&revision); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return status; + } pll_init(); @@ -158,8 +161,9 @@ static int juno_soc_clock_init(fwk_id_t module_id, unsigned int clock_count, CLOCK_RATE_SYSCLK / TRACECLKIN_CONTROL_CLOCK); set_div(&SCP_CONFIG->PCLKDBG_CONTROL, 1); - if (revision != JUNO_IDX_REVISION_R0) + if (revision != JUNO_IDX_REVISION_R0) { set_div(&SCC->SAXICLK, CLOCK_RATE_SYSCLK / SAXICLK_CLOCK); + } set_source(&SCC->SAXICLK, CLKSEL_SYSCLK); set_div(&SCC->FAXICLK, CLOCK_RATE_SYSCLK / FAXICLK_CLOCK); diff --git a/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.c b/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.c index 88e5ab07b07d30e7bb1dbbbb9d9dc67702a8cf0d..7da4ed1de2deefb3dd2309e7b0d3b183a4fe6669 100644 --- a/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.c +++ b/product/juno/module/juno_soc_clock_ram/src/juno_soc_clock_ram_pll.c @@ -42,12 +42,14 @@ void juno_soc_clock_ram_pll_init(void) SCP_CONFIG_SCP_STATUS_BIGINPLLLOCK; /* Release all system PLLs from reset */ - for (pll_idx = 0; pll_idx < PLL_IDX_COUNT; pll_idx++) + for (pll_idx = 0; pll_idx < PLL_IDX_COUNT; pll_idx++) { SCC->PLL[pll_idx].REG0 &= ~PLL_REG0_PLL_RESET; + } /* Wait for PLLs to lock */ - while ((SCP_CONFIG->SCP_STATUS & pll_mask) != pll_mask) + while ((SCP_CONFIG->SCP_STATUS & pll_mask) != pll_mask) { continue; + } } int juno_soc_clock_ram_pll_set(struct pll_reg *pll, @@ -75,8 +77,9 @@ int juno_soc_clock_ram_pll_set(struct pll_reg *pll, pll->REG0 &= ~PLL_REG0_PLL_RESET; /* Wait for the PLL to lock */ - while ((pll->REG1 & PLL_REG1_LOCK_STATUS) == (uint32_t)0) + while ((pll->REG1 & PLL_REG1_LOCK_STATUS) == (uint32_t)0) { continue; + } return FWK_SUCCESS; } @@ -88,8 +91,9 @@ int juno_soc_clock_ram_pll_get(struct pll_reg *pll, uint32_t refclk_hz, unsigned int ref_div; unsigned int output_div; - if ((pll == NULL) || (freq_hz == NULL)) + if ((pll == NULL) || (freq_hz == NULL)) { return FWK_E_PARAM; + } feedback_div = ((pll->REG0 & PLL_REG0_NF) >> PLL_REG0_NF_POS) + 1; ref_div = ((pll->REG1 & PLL_REG1_NR) >> PLL_REG1_NR_POS) + 1; diff --git a/product/juno/module/juno_soc_clock_ram/src/mod_juno_soc_clock_ram.c b/product/juno/module/juno_soc_clock_ram/src/mod_juno_soc_clock_ram.c index f449a861cae69394ff0c16df912b689fdf3cbf7a..081e4c0f4a5cbddebfc9657d708be996568b7655 100644 --- a/product/juno/module/juno_soc_clock_ram/src/mod_juno_soc_clock_ram.c +++ b/product/juno/module/juno_soc_clock_ram/src/mod_juno_soc_clock_ram.c @@ -361,8 +361,9 @@ static int juno_soc_clock_set_rate(fwk_id_t clock_id, ctx = &ctx_table[fwk_id_get_element_idx(clock_id)]; - if (ctx->state == MOD_CLOCK_STATE_STOPPED) + if (ctx->state == MOD_CLOCK_STATE_STOPPED) { return FWK_E_STATE; + } /* * Look up the divider and source settings. We do not perform any rounding @@ -370,12 +371,14 @@ static int juno_soc_clock_set_rate(fwk_id_t clock_id, * be refused with an FWK_E_PARAM error code. */ status = get_rate_entry(ctx, rate, &rate_entry); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PARAM; + } status = set_rate(ctx, rate_entry); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } ctx->current_rate_index = rate_entry - ctx->config->rate_table; @@ -391,10 +394,11 @@ static int juno_soc_clock_get_rate(fwk_id_t clock_id, ctx = &ctx_table[fwk_id_get_element_idx(clock_id)]; - if (!ctx->rate_initialized) + if (!ctx->rate_initialized) { *rate = 0; - else + } else { *rate = ctx->config->rate_table[ctx->current_rate_index].rate; + } return FWK_SUCCESS; } @@ -407,8 +411,9 @@ static int juno_soc_clock_get_rate_from_index(fwk_id_t clock_id, ctx = &ctx_table[fwk_id_get_element_idx(clock_id)]; - if (rate_index >= ctx->config->rate_count) + if (rate_index >= ctx->config->rate_count) { return FWK_E_PARAM; + } *rate = ctx->config->rate_table[rate_index].rate; @@ -423,8 +428,9 @@ static int juno_soc_clock_set_state(fwk_id_t clock_id, ctx = &ctx_table[fwk_id_get_element_idx(clock_id)]; - if (ctx->state == state) + if (ctx->state == state) { return FWK_SUCCESS; + } if (state == MOD_CLOCK_STATE_RUNNING) { /* @@ -434,8 +440,9 @@ static int juno_soc_clock_set_state(fwk_id_t clock_id, if (ctx->rate_initialized) { status = set_rate(ctx, &ctx->config->rate_table[ctx->current_rate_index]); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } } } else { cluster_clock_sel_set(ctx->config->clock_control, @@ -535,8 +542,9 @@ static int juno_soc_clock_element_init(fwk_id_t element_id, rate = config->rate_table[rate_index].rate; /* The rate entries must be in ascending order */ - if (rate < last_rate) + if (rate < last_rate) { return FWK_E_DATA; + } last_rate = rate; } @@ -554,17 +562,20 @@ static int juno_soc_clock_bind(fwk_id_t id, unsigned int round) /* * Only bind in first round of calls */ - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } - if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return FWK_SUCCESS; + } /* Bind to the timer component */ status = fwk_module_bind(juno_soc_clock_timer_id, MOD_TIMER_API_ID_TIMER, &module_ctx.timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -573,8 +584,9 @@ static int juno_soc_clock_start(fwk_id_t id) { int status; - if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return FWK_SUCCESS; + } /* HW Errata: Overwrite default clock */ clock_div_set(&SCC->PCIEACLK, SYSINCLK / PCIEACLK_DEFAULT_FREQ); @@ -597,8 +609,9 @@ static int juno_soc_clock_start(fwk_id_t id) module_ctx.config->systop_pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Subscribe to the debug power domain transition */ return fwk_notification_subscribe( @@ -657,10 +670,11 @@ static int process_systop_notification(const struct fwk_event *event, static int juno_soc_clock_process_notification(const struct fwk_event *event, struct fwk_event *resp_event) { - if (fwk_id_is_equal(event->source_id, module_ctx.config->debug_pd_id)) + if (fwk_id_is_equal(event->source_id, module_ctx.config->debug_pd_id)) { return process_debug_notification(event, resp_event); - else + } else { return process_systop_notification(event, resp_event); + } } const struct fwk_module module_juno_soc_clock_ram = { diff --git a/product/juno/module/juno_system/src/mod_juno_system.c b/product/juno/module/juno_system/src/mod_juno_system.c index eb1666fdd80e3ce90fd6150bba81539d8c6117ba..0edba15777fa591063b7f3ef58cd7f097aa16675 100644 --- a/product/juno/module/juno_system/src/mod_juno_system.c +++ b/product/juno/module/juno_system/src/mod_juno_system.c @@ -159,8 +159,9 @@ static int juno_system_module_init(fwk_id_t module_id, fwk_assert(element_count == 0); status = juno_id_get_platform(&juno_system_ctx.platform_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } return FWK_SUCCESS; } @@ -169,29 +170,30 @@ static int juno_system_bind(fwk_id_t id, unsigned int round) { int status; - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } status = fwk_module_bind(fwk_module_id_sds, FWK_ID_API(FWK_MODULE_IDX_SDS, 0), &juno_system_ctx.sds_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } - if (juno_system_ctx.platform_id != JUNO_IDX_PLATFORM_RTL) + if (juno_system_ctx.platform_id != JUNO_IDX_PLATFORM_RTL) { return FWK_SUCCESS; - else { - - status = fwk_module_bind( - gpu_psu_id, - psu_api_id, - &juno_system_ctx.psu_ctx.api); - if (status != FWK_SUCCESS) - return FWK_E_PANIC; + } else { + status = fwk_module_bind( + gpu_psu_id, psu_api_id, &juno_system_ctx.psu_ctx.api); + if (status != FWK_SUCCESS) { + return FWK_E_PANIC; + } - return fwk_module_bind(fwk_module_id_juno_xrp7724, - mod_juno_xrp7724_api_id_system_mode, - &juno_system_ctx.juno_xrp7724_api); + return fwk_module_bind( + fwk_module_id_juno_xrp7724, + mod_juno_xrp7724_api_id_system_mode, + &juno_system_ctx.juno_xrp7724_api); } } @@ -217,15 +219,17 @@ static int juno_system_start(fwk_id_t id) mod_pd_notification_id_power_state_pre_transition, gpu_pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_subscribe( mod_pd_notification_id_power_state_transition, gpu_pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* * Subscribe to these SCMI channels in order to know when they have all @@ -239,8 +243,9 @@ static int juno_system_start(fwk_id_t id) fwk_id_build_element_id(fwk_module_id_scmi, scmi_notification_table[i]), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* @@ -272,13 +277,14 @@ static int juno_system_process_notification(const struct fwk_event *event, goto exit; } - if (fwk_id_is_equal(event->id, mod_scmi_notification_id_initialized)) + if (fwk_id_is_equal(event->id, mod_scmi_notification_id_initialized)) { scmi_notification_count++; - else if (fwk_id_is_equal(event->id, mod_sds_notification_id_initialized)) + } else if (fwk_id_is_equal( + event->id, mod_sds_notification_id_initialized)) { sds_notification_received = true; - else if (fwk_id_is_equal( - event->id, - mod_pd_notification_id_power_state_pre_transition)) { + } else if (fwk_id_is_equal( + event->id, + mod_pd_notification_id_power_state_pre_transition)) { state_pre_params = (struct mod_pd_power_state_pre_transition_notification_params *) event->params; @@ -287,10 +293,12 @@ static int juno_system_process_notification(const struct fwk_event *event, resp_event->params; if (fwk_id_is_equal(event->source_id, gpu_pd_id)) { - if (state_pre_params->target_state == MOD_PD_STATE_ON) + if (state_pre_params->target_state == MOD_PD_STATE_ON) { status = process_gpu_power_state(event, resp_event, true); - } else + } + } else { status = FWK_E_PARAM; + } pd_resp_params->status = status; } else if (fwk_id_is_equal( @@ -299,10 +307,12 @@ static int juno_system_process_notification(const struct fwk_event *event, event->params; if (fwk_id_is_equal(event->source_id, gpu_pd_id)) { - if (params->state == MOD_PD_STATE_OFF) + if (params->state == MOD_PD_STATE_OFF) { status = process_gpu_power_state(event, resp_event, false); - } else + } + } else { status = FWK_E_PARAM; + } } else { status = FWK_E_PARAM; @@ -335,8 +345,9 @@ static int juno_system_process_event( /* Response event from the PSU module */ psu_params = (struct mod_psu_driver_response *)event->params; - if (!juno_system_ctx.psu_ctx.response_delayed) + if (!juno_system_ctx.psu_ctx.response_delayed) { return psu_params->status; + } juno_system_ctx.psu_ctx.response_delayed = false; @@ -349,8 +360,9 @@ static int juno_system_process_event( */ status = fwk_thread_get_delayed_response( fwk_module_id_juno_system, juno_system_ctx.psu_ctx.cookie, &resp); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } pd_resp_params->status = psu_params->status; return fwk_thread_put_event(&resp); diff --git a/product/juno/module/juno_thermal/src/mod_juno_thermal.c b/product/juno/module/juno_thermal/src/mod_juno_thermal.c index 7b9b3eca7d3f65e56f6380c4a819f0c940229f86..dd4ffd51f364150f30f2472e51c22fdb831164ea 100644 --- a/product/juno/module/juno_thermal/src/mod_juno_thermal.c +++ b/product/juno/module/juno_thermal/src/mod_juno_thermal.c @@ -95,17 +95,20 @@ static int juno_thermal_init( fwk_assert(element_count == 1); status = juno_id_get_platform(&platform_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } is_platform_fvp = (platform_id == JUNO_IDX_PLATFORM_FVP); - if (is_platform_fvp) + if (is_platform_fvp) { return FWK_SUCCESS; + } ctx_table = fwk_mm_calloc(element_count, sizeof(struct thermal_dev_ctx)); - if (ctx_table == NULL) + if (ctx_table == NULL) { return FWK_E_NOMEM; + } return FWK_SUCCESS; } @@ -118,8 +121,9 @@ static int juno_thermal_element_init( struct thermal_dev_ctx *ctx; fwk_id_t sensor_id; - if (is_platform_fvp) + if (is_platform_fvp) { return FWK_SUCCESS; + } ctx = &ctx_table[fwk_id_get_element_idx(element_id)]; ctx->config = (struct mod_juno_thermal_element_config *)data; @@ -127,10 +131,11 @@ static int juno_thermal_element_init( sensor_id = ctx->config->sensor_id; /* Validate identifiers */ - if (fwk_id_get_module_idx(sensor_id) != FWK_MODULE_IDX_SENSOR) + if (fwk_id_get_module_idx(sensor_id) != FWK_MODULE_IDX_SENSOR) { return FWK_E_DATA; - else + } else { return FWK_SUCCESS; + } } static int juno_thermal_bind(fwk_id_t id, unsigned int round) @@ -138,8 +143,9 @@ static int juno_thermal_bind(fwk_id_t id, unsigned int round) int status; struct thermal_dev_ctx *ctx; - if ((round > 0) || is_platform_fvp) + if ((round > 0) || is_platform_fvp) { return FWK_SUCCESS; + } if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { /* Bind to power domain - only binding to module is allowed */ @@ -153,15 +159,17 @@ static int juno_thermal_bind(fwk_id_t id, unsigned int round) ctx->config->alarm_id, MOD_TIMER_API_ID_ALARM, &ctx->alarm_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } status = fwk_module_bind( ctx->config->sensor_id, mod_sensor_api_id_sensor, &ctx->sensor_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } return FWK_SUCCESS; } @@ -172,8 +180,9 @@ static int juno_thermal_start(fwk_id_t id) struct thermal_dev_ctx *ctx; /* Nothing to start for module */ - if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE) || is_platform_fvp) + if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE) || is_platform_fvp) { return FWK_SUCCESS; + } ctx = &ctx_table[fwk_id_get_element_idx(id)]; @@ -181,8 +190,9 @@ static int juno_thermal_start(fwk_id_t id) mod_pd_notification_id_power_state_pre_transition, systop_pd_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ctx->alarm_api->start( ctx->config->alarm_id, @@ -222,22 +232,25 @@ static int juno_thermal_process_event( status = check_threshold_breach( value, ctx->config->thermal_threshold_mdc); - } else if (status == FWK_PENDING) + } else if (status == FWK_PENDING) { return FWK_SUCCESS; + } /* Response event from sensor HAL */ } else if (fwk_id_is_equal(event->id, mod_sensor_event_id_read_request)) { struct mod_sensor_event_params *params = (struct mod_sensor_event_params *)event->params; - if (params->status != FWK_SUCCESS) + if (params->status != FWK_SUCCESS) { return params->status; + } status = check_threshold_breach( params->value, ctx->config->thermal_threshold_mdc); - } else + } else { return FWK_E_PARAM; + } return status; } @@ -292,8 +305,9 @@ static int juno_thermal_process_notification( systop_pd_id, event->target_id); - } else + } else { status = FWK_SUCCESS; + } pd_resp_params->status = status; @@ -317,26 +331,30 @@ static int juno_thermal_process_notification( MOD_TIMER_ALARM_TYPE_PERIODIC, juno_thermal_alarm_callback, (uintptr_t)fwk_id_get_element_idx(event->target_id)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_unsubscribe( mod_pd_notification_id_power_state_transition, systop_pd_id, event->target_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_subscribe( mod_pd_notification_id_power_state_pre_transition, systop_pd_id, event->target_id); - } else + } else { status = FWK_SUCCESS; + } return status; - } else + } else { return FWK_E_PARAM; + } } const struct fwk_module module_juno_thermal = { diff --git a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c index c366757c16caa17dd13aaa62744aa52c62bc0b28..f67391a7fbc8d516078543ffcbd45c1ca6c242d8 100644 --- a/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c +++ b/product/juno/module/juno_xrp7724/src/mod_juno_xrp7724.c @@ -186,10 +186,11 @@ static int set_gpio(fwk_id_t id, struct juno_xrp7724_dev_ctx *ctx) status = module_ctx.i2c_api->transmit_as_master( module_ctx.config->i2c_hal_id, module_ctx.config->slave_address, ctx->transmit_data, GPIO_WRITE_TRANSMIT_LENGTH); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { status = FWK_SUCCESS; - else + } else { status = FWK_E_DEVICE; + } return status; } @@ -238,8 +239,9 @@ static int juno_xrp7724_shutdown(void) module_ctx.gpio_request = JUNO_XRP7724_GPIO_REQUEST_MODE_SHUTDOWN; status = fwk_thread_put_event(&event); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { return FWK_PENDING; + } return status; } @@ -265,8 +267,9 @@ static int juno_xrp7724_reset(void) module_ctx.gpio_request = JUNO_XRP7724_GPIO_REQUEST_ASSERT_COLD_RESET; status = fwk_thread_put_event(&event); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { return FWK_PENDING; + } return status; } @@ -284,8 +287,9 @@ static int juno_xrp7724_sensor_get_value(fwk_id_t id, uint64_t *value) int status; struct fwk_event event; - if (module_ctx.sensor_request != JUNO_XRP7724_SENSOR_REQUEST_IDLE) + if (module_ctx.sensor_request != JUNO_XRP7724_SENSOR_REQUEST_IDLE) { return FWK_E_BUSY; + } event = (struct fwk_event) { .target_id = id, @@ -338,8 +342,10 @@ static int juno_xrp7724_set_enabled(fwk_id_t id, bool enabled) * We only have a single I2C bus so only one I2C request is allowed * at any one time. */ - if (ctx->juno_xrp7724_dev_psu.psu_request != JUNO_XRP7724_PSU_REQUEST_IDLE) + if (ctx->juno_xrp7724_dev_psu.psu_request != + JUNO_XRP7724_PSU_REQUEST_IDLE) { return FWK_E_BUSY; + } event = (struct fwk_event) { .target_id = id, @@ -349,8 +355,9 @@ static int juno_xrp7724_set_enabled(fwk_id_t id, bool enabled) param->enabled = enabled; status = fwk_thread_put_event(&event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } ctx->juno_xrp7724_dev_psu.psu_request = JUNO_XRP7724_PSU_REQUEST_SET_ENABLED; @@ -362,8 +369,9 @@ static int juno_xrp7724_get_enabled(fwk_id_t id, bool *enabled) { const struct juno_xrp7724_dev_ctx *ctx; - if (enabled == NULL) + if (enabled == NULL) { return FWK_E_PARAM; + } ctx = &ctx_table[fwk_id_get_element_idx(id)]; fwk_assert(ctx->config->type == MOD_JUNO_XRP7724_ELEMENT_TYPE_PSU); @@ -386,14 +394,17 @@ static int juno_xrp7724_set_voltage(fwk_id_t id, uint32_t voltage) (struct psu_set_voltage_param *)event.params; /* Platform voltage cap */ - if (voltage > PSU_MAX_VOUT_MV) + if (voltage > PSU_MAX_VOUT_MV) { return FWK_E_RANGE; + } ctx = &ctx_table[fwk_id_get_element_idx(id)]; fwk_assert(ctx->config->type == MOD_JUNO_XRP7724_ELEMENT_TYPE_PSU); - if (ctx->juno_xrp7724_dev_psu.psu_request != JUNO_XRP7724_PSU_REQUEST_IDLE) + if (ctx->juno_xrp7724_dev_psu.psu_request != + JUNO_XRP7724_PSU_REQUEST_IDLE) { return FWK_E_BUSY; + } if (ctx->juno_xrp7724_dev_psu.current_voltage != 0 && ctx->juno_xrp7724_dev_psu.current_voltage == voltage) { @@ -413,8 +424,9 @@ static int juno_xrp7724_set_voltage(fwk_id_t id, uint32_t voltage) */ fine_adj = ((voltage - mvref) * 1000) / PSU_VOUT_STEP_FINE_UV; - if (fine_adj > PSU_MAX_FINE_ADJUST) + if (fine_adj > PSU_MAX_FINE_ADJUST) { fine_adj = PSU_MAX_FINE_ADJUST; + } set_value = (fine_adj << PSU_FINE_ADJUST_POS) | coarse_val; @@ -427,8 +439,9 @@ static int juno_xrp7724_set_voltage(fwk_id_t id, uint32_t voltage) param->voltage = voltage; status = fwk_thread_put_event(&event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } ctx->juno_xrp7724_dev_psu.psu_request = JUNO_XRP7724_PSU_REQUEST_SET_VOLTAGE; @@ -442,14 +455,17 @@ static int juno_xrp7724_get_voltage(fwk_id_t id, uint32_t *voltage) struct fwk_event event; struct juno_xrp7724_dev_ctx *ctx; - if (voltage == NULL) + if (voltage == NULL) { return FWK_E_PARAM; + } ctx = &ctx_table[fwk_id_get_element_idx(id)]; fwk_assert(ctx->config->type == MOD_JUNO_XRP7724_ELEMENT_TYPE_PSU); - if (ctx->juno_xrp7724_dev_psu.psu_request != JUNO_XRP7724_PSU_REQUEST_IDLE) + if (ctx->juno_xrp7724_dev_psu.psu_request != + JUNO_XRP7724_PSU_REQUEST_IDLE) { return FWK_E_BUSY; + } if (ctx->juno_xrp7724_dev_psu.current_voltage != 0) { *voltage = ctx->juno_xrp7724_dev_psu.current_voltage; @@ -462,8 +478,9 @@ static int juno_xrp7724_get_voltage(fwk_id_t id, uint32_t *voltage) }; status = fwk_thread_put_event(&event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } ctx->juno_xrp7724_dev_psu.psu_request = JUNO_XRP7724_PSU_REQUEST_READ_VOLTAGE; @@ -496,8 +513,9 @@ static int juno_xrp7724_init(fwk_id_t module_id, sizeof(struct juno_xrp7724_dev_ctx)); status = juno_id_get_platform(&platform_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return FWK_E_PANIC; + } if (platform_id == JUNO_IDX_PLATFORM_FVP) { /* XRP7724 hardware is only available in the board */ @@ -519,13 +537,15 @@ static int juno_xrp7724_element_init(fwk_id_t element_id, ctx->config = (struct mod_juno_xrp7724_dev_config *)data; if (ctx->config->type == MOD_JUNO_XRP7724_ELEMENT_TYPE_SENSOR) { - if (ctx->config->sensor_info == NULL) + if (ctx->config->sensor_info == NULL) { return FWK_E_DATA; + } } if (ctx->config->type == MOD_JUNO_XRP7724_ELEMENT_TYPE_PSU) { - if (ctx->config->psu_bus_idx >= PSU_CHANNEL_COUNT) + if (ctx->config->psu_bus_idx >= PSU_CHANNEL_COUNT) { return FWK_E_DATA; + } ctx->juno_xrp7724_dev_psu.is_psu_channel_enabled = true; ctx->juno_xrp7724_dev_psu.element_id = element_id; ctx->alarm_hal_id = ctx->config->alarm_hal_id; @@ -541,21 +561,24 @@ static int juno_xrp7724_bind(fwk_id_t id, unsigned int round) const struct juno_xrp7724_dev_ctx *ctx; /* Only bind in first round of calls and if the driver is available */ - if ((round > 0) || (module_ctx.driver_skipped)) + if ((round > 0) || (module_ctx.driver_skipped)) { return FWK_SUCCESS; + } if (fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { /* Bind to I2C HAL */ status = fwk_module_bind(config->i2c_hal_id, mod_i2c_api_id_i2c, &module_ctx.i2c_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } /* Bind to timer HAL */ status = fwk_module_bind(config->timer_hal_id, MOD_TIMER_API_ID_TIMER, &module_ctx.timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } return FWK_SUCCESS; } @@ -566,28 +589,31 @@ static int juno_xrp7724_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(ctx->config->driver_response_id, ctx->config->driver_response_api_id, &module_ctx.sensor_driver_response_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } } if (ctx->config->type == MOD_JUNO_XRP7724_ELEMENT_TYPE_PSU) { status = fwk_module_bind(ctx->config->driver_response_id, ctx->config->driver_response_api_id, &module_ctx.psu_driver_response_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } status = fwk_module_bind(ctx->config->psu_adc_id, mod_sensor_api_id_sensor, &module_ctx.adc_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; + } /* Bind to the alarm HAL */ status = fwk_module_bind( ctx->alarm_hal_id, MOD_TIMER_API_ID_ALARM, &ctx->alarm_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_HANDLER; - + } } return FWK_SUCCESS; @@ -598,14 +624,15 @@ static int juno_xrp7724_process_bind_request(fwk_id_t source_id, fwk_id_t api_id, const void **api) { - if (fwk_id_is_equal(api_id, mod_juno_xrp7724_api_id_system_mode)) + if (fwk_id_is_equal(api_id, mod_juno_xrp7724_api_id_system_mode)) { *api = &system_mode_api; - else if (fwk_id_is_equal(api_id, mod_juno_xrp7724_api_id_sensor)) + } else if (fwk_id_is_equal(api_id, mod_juno_xrp7724_api_id_sensor)) { *api = &sensor_driver_api; - else if (fwk_id_is_equal(api_id, mod_juno_xrp7724_api_id_psu)) + } else if (fwk_id_is_equal(api_id, mod_juno_xrp7724_api_id_psu)) { *api = &psu_driver_api; - else + } else { return FWK_E_PARAM; + } return FWK_SUCCESS; } @@ -642,8 +669,9 @@ static int juno_xrp7724_gpio_process_request(fwk_id_t id, int response_status) * The shutdown operation is aborted if the first command has not been * sent successfully. */ - if (response_status != FWK_SUCCESS) + if (response_status != FWK_SUCCESS) { break; + } /* * The shutdown assert command is delayed to ensure that the mode change @@ -653,8 +681,9 @@ static int juno_xrp7724_gpio_process_request(fwk_id_t id, int response_status) /* Send the assert command */ status = set_gpio(config->gpio_assert_id, ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } module_ctx.gpio_request = JUNO_XRP7724_GPIO_REQUEST_DONE; @@ -674,8 +703,9 @@ static int juno_xrp7724_gpio_process_request(fwk_id_t id, int response_status) return FWK_SUCCESS; case JUNO_XRP7724_GPIO_REQUEST_DONE: - if (response_status != FWK_SUCCESS) + if (response_status != FWK_SUCCESS) { break; + } /* * Allow some time to the hardware to apply the reset or shutdown @@ -699,8 +729,9 @@ static int juno_xrp7724_gpio_process_request(fwk_id_t id, int response_status) module_ctx.gpio_request = JUNO_XRP7724_GPIO_REQUEST_IDLE; status = fwk_thread_get_delayed_response(id, ctx->cookie, &resp_event); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } return fwk_thread_put_event(&resp_event); } @@ -728,8 +759,9 @@ static int juno_xrp7724_sensor_process_request(fwk_id_t id, int status) return FWK_SUCCESS; } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } /* FALLTHRU */ case JUNO_XRP7724_SENSOR_REQUEST_CONVERT_VALUE: @@ -784,11 +816,13 @@ static int juno_xrp7724_psu_process_request(fwk_id_t id, status = module_ctx.i2c_api->transmit_then_receive_as_master( module_config->i2c_hal_id, module_config->slave_address, ctx->transmit_data, ctx->receive_data, 1, PSU_READ_LENGTH); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } /* FALLTHRU */ @@ -822,18 +856,21 @@ static int juno_xrp7724_psu_process_request(fwk_id_t id, status = module_ctx.i2c_api->transmit_as_master( module_config->i2c_hal_id, module_config->slave_address, ctx->transmit_data, PSU_WRITE_LENGTH); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } /* FALLTHRU */ case JUNO_XRP7724_PSU_REQUEST_WAIT_FOR_VOLTAGE: /* Check I2C response status */ - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } /* * If the channel is currently enabled then the voltage will ramp to the @@ -847,8 +884,9 @@ static int juno_xrp7724_psu_process_request(fwk_id_t id, status = ctx->alarm_api->start(ctx->alarm_hal_id, PSU_RAMP_DELAY_SET_MS, MOD_TIMER_ALARM_TYPE_ONCE, alarm_callback, (uintptr_t)ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } ctx->juno_xrp7724_dev_psu.psu_request = JUNO_XRP7724_PSU_REQUEST_COMPARE_VOLTAGE; @@ -868,8 +906,9 @@ static int juno_xrp7724_psu_process_request(fwk_id_t id, case JUNO_XRP7724_PSU_REQUEST_COMPARE_VOLTAGE: status = module_ctx.adc_api->get_value(ctx->config->psu_adc_id, &adc_val); - if (status != FWK_SUCCESS) - break; + if (status != FWK_SUCCESS) { + break; + } if (((adc_val + PSU_TARGET_MARGIN_MV) < ctx->juno_xrp7724_dev_psu.psu_set_voltage) || @@ -899,11 +938,13 @@ static int juno_xrp7724_psu_process_request(fwk_id_t id, status = module_ctx.i2c_api->transmit_as_master( module_config->i2c_hal_id, module_config->slave_address, ctx->transmit_data, PSU_WRITE_LENGTH); - if (status == FWK_PENDING) + if (status == FWK_PENDING) { return FWK_SUCCESS; + } - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } /* FALLTHRU */ @@ -924,14 +965,16 @@ static int juno_xrp7724_psu_process_request(fwk_id_t id, status = ctx->alarm_api->start( ctx->alarm_hal_id, PSU_RAMP_DELAY_ENABLE_MS, MOD_TIMER_ALARM_TYPE_ONCE, alarm_callback, (uintptr_t)ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { break; + } ctx->juno_xrp7724_dev_psu.psu_request = JUNO_XRP7724_PSU_REQUEST_DONE_ENABLED; return FWK_SUCCESS; - } else + } else { status = FWK_SUCCESS; + } } break; @@ -971,8 +1014,9 @@ static int juno_xrp7724_process_event(const struct fwk_event *event, case MOD_JUNO_XRP7724_ELEMENT_TYPE_GPIO: status = juno_xrp7724_gpio_process_request(event->target_id, param->status); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } if (fwk_id_is_equal(event->id, juno_xrp7724_event_id_request)) { resp_event->is_delayed_response = true; diff --git a/product/juno/scp_ramfw/config_clock.c b/product/juno/scp_ramfw/config_clock.c index d16e2969d8015dfbd8e33b6aec32fbc256890c06..e9bec77ceee1e9081a8158757d6e66ac7a003262 100644 --- a/product/juno/scp_ramfw/config_clock.c +++ b/product/juno/scp_ramfw/config_clock.c @@ -112,8 +112,9 @@ static const struct fwk_element *clock_get_dev_desc_table(fwk_id_t module_id) struct mod_clock_dev_config *dev_cfg; status = juno_id_get_platform(&platform_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return NULL; + } /* * When running under an FVP the I2S clock does not fully function, diff --git a/product/juno/scp_ramfw/config_dvfs.c b/product/juno/scp_ramfw/config_dvfs.c index 3a64e5ac11cbd83dd0c0e7d2f5efd65c9cd103f0..be2443e7eec8e61d26e17b0e29d61080d6c42a5b 100644 --- a/product/juno/scp_ramfw/config_dvfs.c +++ b/product/juno/scp_ramfw/config_dvfs.c @@ -450,10 +450,12 @@ static const struct fwk_element *dvfs_get_element_table(fwk_id_t module_id) status = juno_id_get_revision(&revision); fwk_assert(status == FWK_SUCCESS); - if (revision == JUNO_IDX_REVISION_R0) + if (revision == JUNO_IDX_REVISION_R0) { return element_table_r0; - if (revision == JUNO_IDX_REVISION_R1) + } + if (revision == JUNO_IDX_REVISION_R1) { return element_table_r1; + } return element_table_r2; } diff --git a/product/juno/scp_ramfw/config_juno_cdcel937.c b/product/juno/scp_ramfw/config_juno_cdcel937.c index d2ab8d93b7a76a2f4a36292dfedb4dcd381a1224..f8f387e0d81f4a5336a7d78e92c750cc4d2b6ff4 100644 --- a/product/juno/scp_ramfw/config_juno_cdcel937.c +++ b/product/juno/scp_ramfw/config_juno_cdcel937.c @@ -185,8 +185,9 @@ static const struct fwk_element *juno_cdcel937_get_element_table( struct mod_juno_cdcel937_dev_config *config; status = juno_id_get_platform(&platform_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return NULL; + } /* If running under a FVP, direct interactions to the mocked elements */ if (platform_id == JUNO_IDX_PLATFORM_FVP) { @@ -203,10 +204,10 @@ static const struct fwk_element *juno_cdcel937_get_element_table( /* Add the lookup table to the HDLCD elements */ for (int i = 0; i < JUNO_CLOCK_CDCEL937_IDX_COUNT; i++) { - if (i == JUNO_CLOCK_CDCEL937_IDX_I2SCLK || - i == JUNO_CLOCK_CDCEL937_IDX_HDLCDPXL) + i == JUNO_CLOCK_CDCEL937_IDX_HDLCDPXL) { continue; + } config = (struct mod_juno_cdcel937_dev_config *) (juno_cdcel937_element_table[i].data); diff --git a/product/juno/scp_ramfw/config_juno_debug.c b/product/juno/scp_ramfw/config_juno_debug.c index b15c7a1911f91c290ab5890402a494d2e37a48d9..925ecd35e3076d03cd024fc3493d4620633870ab 100644 --- a/product/juno/scp_ramfw/config_juno_debug.c +++ b/product/juno/scp_ramfw/config_juno_debug.c @@ -50,8 +50,9 @@ static const struct fwk_element *get_juno_debug_elem_table(fwk_id_t module_id) struct mod_juno_debug_dev_config *juno_debug_config; status = juno_id_get_revision(&revision); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return NULL; + } juno_debug_config = (struct mod_juno_debug_dev_config *) juno_debug_element_table[0].data; diff --git a/product/juno/scp_ramfw/config_juno_dmc400.c b/product/juno/scp_ramfw/config_juno_dmc400.c index 54d166e7c113fbe0e8b272632e5075ddf0ce29e2..ad718a752e3091c8992263499bf7dd5faebfbe26 100644 --- a/product/juno/scp_ramfw/config_juno_dmc400.c +++ b/product/juno/scp_ramfw/config_juno_dmc400.c @@ -69,14 +69,16 @@ static const struct fwk_element *juno_dmc400_get_element_table juno_dmc400_element_table[0].data; status = juno_id_get_revision(&revision); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return NULL; + } /* On R2 boards only, the DDR is different for variants A and B */ if (revision == JUNO_IDX_REVISION_R2) { status = juno_id_get_variant(&variant_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return NULL; + } } if (variant_id == JUNO_IDX_VARIANT_A) { @@ -100,8 +102,9 @@ static const struct fwk_element *juno_dmc400_get_element_table } status = juno_id_get_platform(&platform_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return NULL; + } dmc400_config->is_platform_fvp = (platform_id == JUNO_IDX_PLATFORM_FVP); diff --git a/product/juno/scp_ramfw/config_juno_hdlcd.c b/product/juno/scp_ramfw/config_juno_hdlcd.c index b26b2b2e92f938a5e088c105038520fde490938d..04270d75c9d933789ac5e9b9e7798a16da9da101 100644 --- a/product/juno/scp_ramfw/config_juno_hdlcd.c +++ b/product/juno/scp_ramfw/config_juno_hdlcd.c @@ -79,8 +79,9 @@ static const struct fwk_element *juno_hdlcd_get_element_table( uintptr_t hdlcd_lookup = HDLCD_PRESET_TABLE_BASE; status = juno_id_get_platform(&platform_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return NULL; + } for (i = 0; i < JUNO_HDLCD_ELEMENT_COUNT; i++) { config = (struct mod_juno_hdlcd_dev_config *) diff --git a/product/juno/scp_ramfw/config_juno_pvt.c b/product/juno/scp_ramfw/config_juno_pvt.c index ba85722634f84057fbaf987dec6cfbf592990469..9fe1f2fc914d6a4b2761c1278ae59aa2d2847913 100644 --- a/product/juno/scp_ramfw/config_juno_pvt.c +++ b/product/juno/scp_ramfw/config_juno_pvt.c @@ -237,10 +237,11 @@ static const struct fwk_element *get_pvt_juno_element_table(fwk_id_t id) enum juno_idx_revision rev; status = juno_id_get_revision(&rev); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return NULL; + } - #if USE_FULL_SET_SENSORS +#if USE_FULL_SET_SENSORS if (rev == JUNO_IDX_REVISION_R0) { sensor_group[JUNO_PVT_GROUP_BIG].sensor_count = 1; @@ -257,8 +258,9 @@ static const struct fwk_element *get_pvt_juno_element_table(fwk_id_t id) sensor_group[JUNO_PVT_GROUP_BIG].sensor_count = 1; sensor_group[JUNO_PVT_GROUP_LITTLE].sensor_count = 1; - if (rev != JUNO_IDX_REVISION_R0) + if (rev != JUNO_IDX_REVISION_R0) { pvt_juno_element_table[JUNO_PVT_GROUP_SOC].data = &dev_config_soc_r1_r2; + } return pvt_juno_element_table; #endif diff --git a/product/juno/scp_ramfw/config_juno_soc_clock_ram.c b/product/juno/scp_ramfw/config_juno_soc_clock_ram.c index 65dbef06a4011d8abb410f2bf704461db1bf3349..e3f4158b11ae4e81c18d945ff829e4e3a8249b7c 100644 --- a/product/juno/scp_ramfw/config_juno_soc_clock_ram.c +++ b/product/juno/scp_ramfw/config_juno_soc_clock_ram.c @@ -457,8 +457,9 @@ static const struct fwk_element *juno_soc_clock_ram_get_element_table enum juno_idx_revision revision; status = juno_id_get_revision(&revision); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return NULL; + } big_cluster_clock_config.rate_table = big_cluster_rate_tables[revision]; big_cluster_clock_config.rate_count = big_cluster_rate_counts[revision]; diff --git a/product/juno/scp_ramfw/config_psu.c b/product/juno/scp_ramfw/config_psu.c index 0bbaa678474401dc6dc16b622c7b2b2ea87ea6fa..2e495e2b21aa51c74dd9d64c538f1a7341ee6740 100644 --- a/product/juno/scp_ramfw/config_psu.c +++ b/product/juno/scp_ramfw/config_psu.c @@ -110,13 +110,15 @@ static const struct fwk_element *psu_get_dev_desc_table(fwk_id_t module_id) enum juno_idx_platform platform_id = JUNO_IDX_PLATFORM_COUNT; status = juno_id_get_platform(&platform_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return NULL; + } - if (platform_id == JUNO_IDX_PLATFORM_FVP) + if (platform_id == JUNO_IDX_PLATFORM_FVP) { return psu_element_table_fvp; - else + } else { return psu_dev_desc_table; + } } struct fwk_module_config config_psu = { diff --git a/product/juno/scp_ramfw/config_sensor.c b/product/juno/scp_ramfw/config_sensor.c index 1cb97f7f9e71c984e19d138eb321676e2ec8d105..5340586666d04ceb14af085ada1d39e6bccd064e 100644 --- a/product/juno/scp_ramfw/config_sensor.c +++ b/product/juno/scp_ramfw/config_sensor.c @@ -322,12 +322,13 @@ static const struct fwk_element *get_sensor_element_table(fwk_id_t module_id) struct fwk_element *element_table; status = juno_id_get_platform(&platform_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return NULL; + } - if (platform_id == JUNO_IDX_PLATFORM_FVP) + if (platform_id == JUNO_IDX_PLATFORM_FVP) { return sensor_element_table_fvp; - else { + } else { sensor_elem_table_size = FWK_ARRAY_SIZE(sensor_element_table_r0); #if USE_FULL_SET_SENSORS @@ -369,8 +370,9 @@ static const struct fwk_element *get_sensor_element_table(fwk_id_t module_id) element_table = fwk_mm_calloc( (sensor_elem_table_size + 1), sizeof(struct fwk_element)); - if (element_table == NULL) + if (element_table == NULL) { return NULL; + } memcpy(element_table, sensor_element_table_r0, diff --git a/product/juno/scp_ramfw/rtx_config.c b/product/juno/scp_ramfw/rtx_config.c index 4eb391964451b93fa98a408071ec52f1c1ad8e4c..ccb81dbebcb17895d1908c859092c48f02137c57 100644 --- a/product/juno/scp_ramfw/rtx_config.c +++ b/product/juno/scp_ramfw/rtx_config.c @@ -29,8 +29,9 @@ __NO_RETURN void osRtxIdleThread(void *argument) { (void)argument; - while (true) + while (true) { __WFI(); + } } /* diff --git a/product/juno/scp_romfw/config_sds.c b/product/juno/scp_romfw/config_sds.c index 71bd66a118c2fcbf83b6c2b7247f851c28788c42..2a8c635976d429b33a3680f51ffb61c08590c124 100644 --- a/product/juno/scp_romfw/config_sds.c +++ b/product/juno/scp_romfw/config_sds.c @@ -149,8 +149,9 @@ static const struct fwk_element *get_element_table(fwk_id_t module_id) platid.platform_identifier = SSC->SSC_VERSION; status = juno_id_get_platform(&platform_id); - if (!fwk_expect(status == FWK_SUCCESS)) + if (!fwk_expect(status == FWK_SUCCESS)) { return NULL; + } platid.platform_type_identifier = (uint32_t)platform_id; /* diff --git a/product/juno/scp_romfw_bypass/juno_pll_workaround.c b/product/juno/scp_romfw_bypass/juno_pll_workaround.c index 32a1547d566b564019ed5471f34fba6d8f954d2f..ab3edf3361570fa80e7e7fa5cf5c28c158df2419 100644 --- a/product/juno/scp_romfw_bypass/juno_pll_workaround.c +++ b/product/juno/scp_romfw_bypass/juno_pll_workaround.c @@ -32,8 +32,9 @@ noreturn void __wrap_arch_exception_reset(void) unsigned int pll_idx; /* Release All system PLLs from reset */ - for (pll_idx = 0; pll_idx < PLL_IDX_COUNT; pll_idx++) + for (pll_idx = 0; pll_idx < PLL_IDX_COUNT; pll_idx++) { SCC->PLL[pll_idx].REG0 &= ~PLL_REG0_PLL_RESET; + } __real_arch_exception_reset(); } diff --git a/product/juno/src/juno_id.c b/product/juno/src/juno_id.c index 225caaa9aaa5d4f9c90215437ce8f73a76b73a1d..70f114c8ef04ff87348806896299a4a2d60942b3 100644 --- a/product/juno/src/juno_id.c +++ b/product/juno/src/juno_id.c @@ -27,8 +27,9 @@ int juno_id_get_platform(enum juno_idx_platform *platform) { unsigned int plat; - if (!fwk_expect(platform != NULL)) + if (!fwk_expect(platform != NULL)) { return FWK_E_PARAM; + } plat = (SCC->GPR0 & SCC_GPR0_PLATFORM_ID_PLAT) >> SCC_GPR0_PLATFORM_ID_PLAT_POS; @@ -65,8 +66,9 @@ int juno_id_get_revision(enum juno_idx_revision *revision) } status = juno_id_get_platform(&platform); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (platform != JUNO_IDX_PLATFORM_RTL) { revision_cached = JUNO_IDX_REVISION_R0; @@ -106,8 +108,9 @@ int juno_id_get_variant(enum juno_idx_variant *variant) unsigned int var; int status; - if (!fwk_expect(variant != NULL)) + if (!fwk_expect(variant != NULL)) { return FWK_E_PARAM; + } if (variant_cached != JUNO_IDX_VARIANT_COUNT) { *variant = variant_cached; @@ -116,8 +119,9 @@ int juno_id_get_variant(enum juno_idx_variant *variant) } status = juno_id_get_platform(&platform); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } if (platform != JUNO_IDX_PLATFORM_RTL) { variant_cached = JUNO_IDX_VARIANT_A; @@ -130,8 +134,9 @@ int juno_id_get_variant(enum juno_idx_variant *variant) var = (V2M_SYS_REGS->ID & (uint32_t)V2M_SYS_REGS_ID_VAR_MASK) >> V2M_SYS_REGS_ID_VAR_POS; - if (!fwk_expect(var < JUNO_IDX_VARIANT_COUNT)) + if (!fwk_expect(var < JUNO_IDX_VARIANT_COUNT)) { return FWK_E_DATA; + } variant_cached = (enum juno_idx_variant)var; *variant = variant_cached; diff --git a/product/juno/src/juno_utils.c b/product/juno/src/juno_utils.c index 6c1aadd4f539f8ff41002a0888ed8570a676b750..091c36e15b11732a7a5ed400d31f62b5937ec6b3 100644 --- a/product/juno/src/juno_utils.c +++ b/product/juno/src/juno_utils.c @@ -30,8 +30,9 @@ void juno_utils_open_snoop_gate_and_wait(volatile uint32_t *snoop_ctrl) fwk_assert(snoop_ctrl != NULL); *snoop_ctrl = SNOOP_CONTROL_L2ACCREQ; - while ((*snoop_ctrl & SNOOP_CONTROL_L2ACCACK) == 0) + while ((*snoop_ctrl & SNOOP_CONTROL_L2ACCACK) == 0) { continue; + } } void juno_utils_close_snoop_gate(volatile uint32_t *snoop_ctrl) @@ -144,8 +145,9 @@ void juno_utils_system_clock_enable(uint32_t mask) fwk_assert((mask & ~SCP_CONFIG_CLOCK_ENABLE_ALL) == 0); SCP_CONFIG->CLOCK_ENABLE_SET |= mask; - while ((SCP_CONFIG->CLOCK_ENABLE_STATUS & mask) != mask) + while ((SCP_CONFIG->CLOCK_ENABLE_STATUS & mask) != mask) { continue; + } } void juno_utils_smc_init(void) diff --git a/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c b/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c index 36e5c8b2abe82ce736e00652c7ce5b823d8f2b78..567eb6e180bdc5d0e6d30e4187d1dc88fee87281 100644 --- a/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c +++ b/product/n1sdp/module/n1sdp_c2c/src/mod_n1sdp_c2c_i2c.c @@ -227,8 +227,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) if (run_in_slave) { status = n1sdp_c2c_master_tx_command(cmd); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } FWK_LOG_INFO("[C2C] %s in master...", cmd_str[cmd]); @@ -243,8 +244,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -261,8 +263,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -279,8 +282,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -297,8 +301,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -315,8 +320,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -333,8 +339,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -351,8 +358,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -383,8 +391,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -401,8 +410,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -419,8 +429,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -437,8 +448,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -449,8 +461,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) case N1SDP_C2C_CMD_GET_SLV_DDR_SIZE: if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -470,8 +483,9 @@ static int n1sdp_c2c_multichip_run_command(uint8_t cmd, bool run_in_slave) } if (run_in_slave) { status = n1sdp_c2c_master_rx_response(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] Command failed in slave!"); return FWK_E_STATE; @@ -493,68 +507,81 @@ static int n1sdp_c2c_multichip_init(void) status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_PCIE_POWER_ON, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_PCIE_PHY_INIT, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_PCIE_CCIX_CONFIG, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_PCIE_CTRL_INIT, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_PCIE_LINK_TRAIN, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_PCIE_RC_SETUP, false); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_PCIE_VC1_CONFIG, false); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_CMN600_SET_CONFIG, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command( N1SDP_C2C_CMD_CMN600_XCHANGE_CREDITS, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command( N1SDP_C2C_CMD_CMN600_ENTER_SYS_COHERENCY, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command( N1SDP_C2C_CMD_CMN600_ENTER_DVM_DOMAIN, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_GET_SLV_DDR_SIZE, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_c2c_multichip_run_command(N1SDP_C2C_CMD_TIMER_SYNC, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -598,36 +625,41 @@ static int n1sdp_c2c_process_command(void) case N1SDP_C2C_CMD_PCIE_POWER_ON: status = n1sdp_c2c_ctx.pcie_init_api->power_on( n1sdp_c2c_ctx.config->ccix_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_PCIE_PHY_INIT: status = n1sdp_c2c_ctx.pcie_init_api->phy_init( n1sdp_c2c_ctx.config->ccix_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_PCIE_CTRL_INIT: status = n1sdp_c2c_ctx.pcie_init_api->controller_init( n1sdp_c2c_ctx.config->ccix_id, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_PCIE_LINK_TRAIN: status = n1sdp_c2c_ctx.pcie_init_api->link_training( n1sdp_c2c_ctx.config->ccix_id, true); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_PCIE_CCIX_CONFIG: status = n1sdp_c2c_ctx.ccix_config_api->enable_opt_tlp( CCIX_OPT_TLP_EN); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_CMN600_SET_CONFIG: @@ -645,35 +677,40 @@ static int n1sdp_c2c_process_command(void) remote_config.remote_ha_mmap[0].base = 0; remote_config.remote_ha_mmap[0].size = (4ULL * FWK_TIB); status = n1sdp_c2c_ctx.cmn600_api->set_config(&remote_config); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_CMN600_XCHANGE_CREDITS: status = n1sdp_c2c_ctx.cmn600_api->exchange_protocol_credit( CMN600_CCIX_LINK_ID); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_CMN600_ENTER_SYS_COHERENCY: status = n1sdp_c2c_ctx.cmn600_api->enter_system_coherency( CMN600_CCIX_LINK_ID); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_CMN600_ENTER_DVM_DOMAIN: status = n1sdp_c2c_ctx.cmn600_api->enter_dvm_domain( CMN600_CCIX_LINK_ID); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_GET_SLV_DDR_SIZE: status = n1sdp_c2c_ctx.dmc620_api->get_mem_size_gb(&ddr_size_gb); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } n1sdp_c2c_ctx.slave_tx_data[1] = (uint8_t)ddr_size_gb; break; @@ -689,8 +726,9 @@ static int n1sdp_c2c_process_command(void) FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, rx_data[1]), MOD_PD_COMPOSITE_STATE( MOD_PD_LEVEL_0, 0, 0, 0, MOD_PD_STATE_OFF)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case MOD_PD_TYPE_CLUSTER: @@ -698,16 +736,18 @@ static int n1sdp_c2c_process_command(void) status = n1sdp_c2c_ctx.pd_api->set_state( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, rx_data[1]), MOD_PD_STATE_OFF); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case MOD_PD_TYPE_SYSTEM: status = n1sdp_c2c_ctx.pd_api->set_state( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, rx_data[1]), MOD_PD_STATE_OFF); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; default: @@ -732,8 +772,9 @@ static int n1sdp_c2c_process_command(void) MOD_PD_STATE_ON, MOD_PD_STATE_ON, MOD_PD_STATE_ON)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case MOD_PD_TYPE_CLUSTER: @@ -741,16 +782,18 @@ static int n1sdp_c2c_process_command(void) status = n1sdp_c2c_ctx.pd_api->set_state( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, rx_data[1]), MOD_PD_STATE_ON); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case MOD_PD_TYPE_SYSTEM: status = n1sdp_c2c_ctx.pd_api->set_state( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, rx_data[1]), MOD_PD_STATE_ON); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; default: @@ -767,8 +810,9 @@ static int n1sdp_c2c_process_command(void) status = n1sdp_c2c_ctx.pd_api->get_state( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, rx_data[1]), &state); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } n1sdp_c2c_ctx.slave_tx_data[1] = (uint8_t)state; break; @@ -776,8 +820,9 @@ static int n1sdp_c2c_process_command(void) case N1SDP_C2C_CMD_TIMER_SYNC: status = n1sdp_c2c_ctx.tsync_api->slave_sync( FWK_ID_ELEMENT(FWK_MODULE_IDX_N1SDP_TIMER_SYNC, 0)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto error; + } break; case N1SDP_C2C_CMD_SHUTDOWN_OR_REBOOT: @@ -814,10 +859,11 @@ static int n1sdp_c2c_process_command(void) } error: - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { n1sdp_c2c_ctx.slave_tx_data[0] = N1SDP_C2C_SUCCESS; - else + } else { n1sdp_c2c_ctx.slave_tx_data[0] = N1SDP_C2C_ERROR; + } status = n1sdp_c2c_ctx.slave_api->write( n1sdp_c2c_ctx.config->i2c_id, @@ -869,8 +915,9 @@ static int n1sdp_c2c_pd_set_state(enum n1sdp_c2c_cmd cmd, uint8_t pd_id, n1sdp_c2c_ctx.master_tx_data[1] = pd_id; n1sdp_c2c_ctx.master_tx_data[2] = pd_type; status = n1sdp_c2c_master_tx_command((uint8_t)cmd); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* * PD command in slave will take some time to complete so master @@ -879,16 +926,18 @@ static int n1sdp_c2c_pd_set_state(enum n1sdp_c2c_cmd cmd, uint8_t pd_id, retries = C2C_MASTER_RETRIES; do { status = n1sdp_c2c_master_rx_response(); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { break; + } retries--; n1sdp_c2c_ctx.timer_api->delay(FWK_ID_ELEMENT(FWK_MODULE_IDX_TIMER, 0), C2C_MASTER_RETRY_DELAY_US); } while (retries != 0); - if ((retries == 0) && (status != FWK_SUCCESS)) + if ((retries == 0) && (status != FWK_SUCCESS)) { return status; + } if (n1sdp_c2c_ctx.master_rx_data[0] != N1SDP_C2C_SUCCESS) { FWK_LOG_INFO("[C2C] PD request failed!"); @@ -908,8 +957,9 @@ static int n1sdp_c2c_pd_get_state(enum n1sdp_c2c_cmd cmd, uint8_t pd_id, n1sdp_c2c_ctx.master_tx_data[1] = pd_id; status = n1sdp_c2c_master_tx_command((uint8_t)cmd); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* * PD command in slave will take some time to complete so master @@ -918,16 +968,18 @@ static int n1sdp_c2c_pd_get_state(enum n1sdp_c2c_cmd cmd, uint8_t pd_id, retries = C2C_MASTER_RETRIES; do { status = n1sdp_c2c_master_rx_response(); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { break; + } retries--; n1sdp_c2c_ctx.timer_api->delay(FWK_ID_ELEMENT(FWK_MODULE_IDX_TIMER, 0), C2C_MASTER_RETRY_DELAY_US); } while (retries != 0); - if ((retries == 0) && (status != FWK_SUCCESS)) + if ((retries == 0) && (status != FWK_SUCCESS)) { return status; + } /* * master_rx_data[0] contains return status code @@ -968,100 +1020,114 @@ static const struct n1sdp_c2c_pd_api pd_api = { static int n1sdp_c2c_init(fwk_id_t module_id, unsigned int unused, const void *data) { - if (data == NULL) + if (data == NULL) { return FWK_E_PARAM; + } n1sdp_c2c_ctx.config = (struct n1sdp_c2c_dev_config *)data; n1sdp_c2c_ctx.mc_mode = n1sdp_is_multichip_enabled(); - if (!n1sdp_c2c_ctx.mc_mode) + if (!n1sdp_c2c_ctx.mc_mode) { return FWK_SUCCESS; + } n1sdp_c2c_ctx.chip_id = n1sdp_get_chipid(); - if (n1sdp_c2c_ctx.chip_id == 0x0) + if (n1sdp_c2c_ctx.chip_id == 0x0) { return FWK_SUCCESS; - else + } else { return fwk_thread_create(module_id); + } } static int n1sdp_c2c_bind(fwk_id_t id, unsigned int round) { int status; - if (!n1sdp_c2c_ctx.mc_mode) + if (!n1sdp_c2c_ctx.mc_mode) { return FWK_SUCCESS; + } if (round == 0) { status = fwk_module_bind(n1sdp_c2c_ctx.config->ccix_id, FWK_ID_API(FWK_MODULE_IDX_N1SDP_PCIE, N1SDP_PCIE_API_IDX_PCIE_INIT), &n1sdp_c2c_ctx.pcie_init_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(n1sdp_c2c_ctx.config->ccix_id, FWK_ID_API(FWK_MODULE_IDX_N1SDP_PCIE, N1SDP_PCIE_API_IDX_CCIX_CONFIG), &n1sdp_c2c_ctx.ccix_config_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_CMN600), FWK_ID_API(FWK_MODULE_IDX_CMN600, MOD_CMN600_API_IDX_CCIX_CONFIG), &n1sdp_c2c_ctx.cmn600_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(fwk_module_id_power_domain, mod_pd_api_id_restricted, &n1sdp_c2c_ctx.pd_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_DMC620), FWK_ID_API(FWK_MODULE_IDX_N1SDP_DMC620, MOD_DMC620_API_IDX_MEM_INFO), &n1sdp_c2c_ctx.dmc620_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_ELEMENT(FWK_MODULE_IDX_TIMER, 0), FWK_ID_API(FWK_MODULE_IDX_TIMER, MOD_TIMER_API_IDX_TIMER), &n1sdp_c2c_ctx.timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_TIMER_SYNC), FWK_ID_API(FWK_MODULE_IDX_N1SDP_TIMER_SYNC, N1SDP_TIMER_SYNC_API_IDX_TSYNC), &n1sdp_c2c_ctx.tsync_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_SCP2PCC), FWK_ID_API(FWK_MODULE_IDX_N1SDP_SCP2PCC, 0), &n1sdp_c2c_ctx.scp2pcc_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_c2c_ctx.chip_id == 0) { status = fwk_module_bind(n1sdp_c2c_ctx.config->i2c_id, FWK_ID_API(FWK_MODULE_IDX_N1SDP_I2C, MOD_N1SDP_I2C_API_MASTER_POLLED), &n1sdp_c2c_ctx.master_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } else { status = fwk_module_bind(n1sdp_c2c_ctx.config->i2c_id, FWK_ID_API(FWK_MODULE_IDX_N1SDP_I2C, MOD_N1SDP_I2C_API_SLAVE_IRQ), &n1sdp_c2c_ctx.slave_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } } @@ -1089,22 +1155,26 @@ static int n1sdp_c2c_start(fwk_id_t id) { int status; - if (!n1sdp_c2c_ctx.mc_mode) + if (!n1sdp_c2c_ctx.mc_mode) { return FWK_SUCCESS; + } - if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) + if (fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { return FWK_SUCCESS; + } status = fwk_notification_subscribe( mod_clock_notification_id_state_changed, FWK_ID_ELEMENT(FWK_MODULE_IDX_CLOCK, CLOCK_IDX_INTERCONNECT), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_notification_subscribe(mod_n1sdp_i2c_notification_id_slave_rx, n1sdp_c2c_ctx.config->i2c_id, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_notification_subscribe(mod_n1sdp_i2c_notification_id_slave_tx, n1sdp_c2c_ctx.config->i2c_id, id); @@ -1119,8 +1189,9 @@ static int n1sdp_c2c_process_notification(const struct fwk_event *event, status = n1sdp_c2c_check_remote(); if (status == FWK_SUCCESS && (n1sdp_c2c_ctx.chip_id == 0)) { status = n1sdp_c2c_multichip_init(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { n1sdp_c2c_ctx.slave_alive = false; + } } /* * Unsubscribe from notification as C2C initialization will be done diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1200.c b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1200.c index be7355a4fc09c37bd8feb05c46881227e8dfdc7a..a89bdf7f5490e81739a59c9dfc1407e2255058be 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1200.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1200.c @@ -94,10 +94,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_47_DATA = 0x00000000; ddr_phy->DENALI_PHY_48_DATA = 0x00000000; ddr_phy->DENALI_PHY_49_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_50_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_50_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_51_DATA = 0x00000000; ddr_phy->DENALI_PHY_52_DATA = 0x00000000; ddr_phy->DENALI_PHY_53_DATA = 0x00000000; @@ -258,10 +259,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_303_DATA = 0x00000000; ddr_phy->DENALI_PHY_304_DATA = 0x00000000; ddr_phy->DENALI_PHY_305_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_306_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_306_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_307_DATA = 0x00000000; ddr_phy->DENALI_PHY_308_DATA = 0x00000000; ddr_phy->DENALI_PHY_309_DATA = 0x00000000; @@ -422,10 +424,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_559_DATA = 0x00000000; ddr_phy->DENALI_PHY_560_DATA = 0x00000000; ddr_phy->DENALI_PHY_561_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_562_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_562_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_563_DATA = 0x00000000; ddr_phy->DENALI_PHY_564_DATA = 0x00000000; ddr_phy->DENALI_PHY_565_DATA = 0x00000000; @@ -586,10 +589,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_815_DATA = 0x00000000; ddr_phy->DENALI_PHY_816_DATA = 0x00000000; ddr_phy->DENALI_PHY_817_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_818_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_818_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_819_DATA = 0x00000000; ddr_phy->DENALI_PHY_820_DATA = 0x00000000; ddr_phy->DENALI_PHY_821_DATA = 0x00000000; @@ -750,10 +754,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1071_DATA = 0x00000000; ddr_phy->DENALI_PHY_1072_DATA = 0x00000000; ddr_phy->DENALI_PHY_1073_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1074_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1074_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1075_DATA = 0x00000000; ddr_phy->DENALI_PHY_1076_DATA = 0x00000000; ddr_phy->DENALI_PHY_1077_DATA = 0x00000000; @@ -914,10 +919,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1327_DATA = 0x00000000; ddr_phy->DENALI_PHY_1328_DATA = 0x00000000; ddr_phy->DENALI_PHY_1329_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1330_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1330_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1331_DATA = 0x00000000; ddr_phy->DENALI_PHY_1332_DATA = 0x00000000; ddr_phy->DENALI_PHY_1333_DATA = 0x00000000; @@ -1078,10 +1084,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1583_DATA = 0x00000000; ddr_phy->DENALI_PHY_1584_DATA = 0x00000000; ddr_phy->DENALI_PHY_1585_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1586_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1586_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1587_DATA = 0x00000000; ddr_phy->DENALI_PHY_1588_DATA = 0x00000000; ddr_phy->DENALI_PHY_1589_DATA = 0x00000000; @@ -1242,10 +1249,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1839_DATA = 0x00000000; ddr_phy->DENALI_PHY_1840_DATA = 0x00000000; ddr_phy->DENALI_PHY_1841_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1842_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1842_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1843_DATA = 0x00000000; ddr_phy->DENALI_PHY_1844_DATA = 0x00000000; ddr_phy->DENALI_PHY_1845_DATA = 0x00000000; @@ -1394,10 +1402,11 @@ void ddr_phy_config_1200(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_2095_DATA = 0x00000000; ddr_phy->DENALI_PHY_2096_DATA = 0x00000000; ddr_phy->DENALI_PHY_2097_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_2098_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_2098_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_2099_DATA = 0x00000000; ddr_phy->DENALI_PHY_2100_DATA = 0x00000000; ddr_phy->DENALI_PHY_2101_DATA = 0x00000000; diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1333.c b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1333.c index 4e025e8ae312ea5f27fff70162f1201049cddd3a..cbee50f76cf2f2d12dbc5dac46e5f1dadfca2274 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1333.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_1333.c @@ -96,10 +96,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_47_DATA = 0x00000000; ddr_phy->DENALI_PHY_48_DATA = 0x00000000; ddr_phy->DENALI_PHY_49_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_50_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_50_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_51_DATA = 0x00000000; ddr_phy->DENALI_PHY_52_DATA = 0x00000000; ddr_phy->DENALI_PHY_53_DATA = 0x00000000; @@ -255,10 +256,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_303_DATA = 0x00000000; ddr_phy->DENALI_PHY_304_DATA = 0x00000000; ddr_phy->DENALI_PHY_305_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_306_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_306_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_307_DATA = 0x00000000; ddr_phy->DENALI_PHY_308_DATA = 0x00000000; ddr_phy->DENALI_PHY_309_DATA = 0x00000000; @@ -414,10 +416,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_559_DATA = 0x00000000; ddr_phy->DENALI_PHY_560_DATA = 0x00000000; ddr_phy->DENALI_PHY_561_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_562_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_562_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_563_DATA = 0x00000000; ddr_phy->DENALI_PHY_564_DATA = 0x00000000; ddr_phy->DENALI_PHY_565_DATA = 0x00000000; @@ -573,10 +576,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_815_DATA = 0x00000000; ddr_phy->DENALI_PHY_816_DATA = 0x00000000; ddr_phy->DENALI_PHY_817_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_818_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_818_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_819_DATA = 0x00000000; ddr_phy->DENALI_PHY_820_DATA = 0x00000000; ddr_phy->DENALI_PHY_821_DATA = 0x00000000; @@ -732,10 +736,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1071_DATA = 0x00000000; ddr_phy->DENALI_PHY_1072_DATA = 0x00000000; ddr_phy->DENALI_PHY_1073_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1074_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1074_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1075_DATA = 0x00000000; ddr_phy->DENALI_PHY_1076_DATA = 0x00000000; ddr_phy->DENALI_PHY_1077_DATA = 0x00000000; @@ -891,10 +896,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1327_DATA = 0x00000000; ddr_phy->DENALI_PHY_1328_DATA = 0x00000000; ddr_phy->DENALI_PHY_1329_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1330_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1330_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1331_DATA = 0x00000000; ddr_phy->DENALI_PHY_1332_DATA = 0x00000000; ddr_phy->DENALI_PHY_1333_DATA = 0x00000000; @@ -1050,10 +1056,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1583_DATA = 0x00000000; ddr_phy->DENALI_PHY_1584_DATA = 0x00000000; ddr_phy->DENALI_PHY_1585_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1586_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1586_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1587_DATA = 0x00000000; ddr_phy->DENALI_PHY_1588_DATA = 0x00000000; ddr_phy->DENALI_PHY_1589_DATA = 0x00000000; @@ -1209,10 +1216,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1839_DATA = 0x00000000; ddr_phy->DENALI_PHY_1840_DATA = 0x00000000; ddr_phy->DENALI_PHY_1841_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1842_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1842_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1843_DATA = 0x00000000; ddr_phy->DENALI_PHY_1844_DATA = 0x00000000; ddr_phy->DENALI_PHY_1845_DATA = 0x00000000; @@ -1368,10 +1376,11 @@ void ddr_phy_config_1333(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_2095_DATA = 0x00000000; ddr_phy->DENALI_PHY_2096_DATA = 0x00000000; ddr_phy->DENALI_PHY_2097_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_2098_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_2098_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_2099_DATA = 0x00000000; ddr_phy->DENALI_PHY_2100_DATA = 0x00000000; ddr_phy->DENALI_PHY_2101_DATA = 0x00000000; diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_800.c b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_800.c index e6e38eace5cb8fb1ca1ebae71b35ebfc0bd3de01..e77c1ce31b7981ee47f41ad387d4c04bdc723233 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_800.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/ddr_phy_values_800.c @@ -36,10 +36,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, { fwk_assert((ddr_phy != NULL) && (info != NULL)); - if (info->number_of_ranks == 1) + if (info->number_of_ranks == 1) { PHY_PAD_VREF_CTRL_DQ_1600 = 0x1234; - else + } else { PHY_PAD_VREF_CTRL_DQ_1600 = 0x1260; + } ddr_phy->DENALI_PHY_00_DATA = 0x76543210; ddr_phy->DENALI_PHY_01_DATA = 0x0004C008; @@ -91,10 +92,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_47_DATA = 0x00000000; ddr_phy->DENALI_PHY_48_DATA = 0x00000000; ddr_phy->DENALI_PHY_49_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_50_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_50_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_51_DATA = 0x00000000; ddr_phy->DENALI_PHY_52_DATA = 0x00000000; ddr_phy->DENALI_PHY_53_DATA = 0x00000000; @@ -243,10 +245,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_303_DATA = 0x00000000; ddr_phy->DENALI_PHY_304_DATA = 0x00000000; ddr_phy->DENALI_PHY_305_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_306_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_306_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_307_DATA = 0x00000000; ddr_phy->DENALI_PHY_308_DATA = 0x00000000; ddr_phy->DENALI_PHY_309_DATA = 0x00000000; @@ -395,10 +398,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_559_DATA = 0x00000000; ddr_phy->DENALI_PHY_560_DATA = 0x00000000; ddr_phy->DENALI_PHY_561_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_562_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_562_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_563_DATA = 0x00000000; ddr_phy->DENALI_PHY_564_DATA = 0x00000000; ddr_phy->DENALI_PHY_565_DATA = 0x00000000; @@ -547,10 +551,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_815_DATA = 0x00000000; ddr_phy->DENALI_PHY_816_DATA = 0x00000000; ddr_phy->DENALI_PHY_817_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_818_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_818_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_819_DATA = 0x00000000; ddr_phy->DENALI_PHY_820_DATA = 0x00000000; ddr_phy->DENALI_PHY_821_DATA = 0x00000000; @@ -699,10 +704,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1071_DATA = 0x00000000; ddr_phy->DENALI_PHY_1072_DATA = 0x00000000; ddr_phy->DENALI_PHY_1073_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1074_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1074_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1075_DATA = 0x00000000; ddr_phy->DENALI_PHY_1076_DATA = 0x00000000; ddr_phy->DENALI_PHY_1077_DATA = 0x00000000; @@ -851,10 +857,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1327_DATA = 0x00000000; ddr_phy->DENALI_PHY_1328_DATA = 0x00000000; ddr_phy->DENALI_PHY_1329_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1330_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1330_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1331_DATA = 0x00000000; ddr_phy->DENALI_PHY_1332_DATA = 0x00000000; ddr_phy->DENALI_PHY_1333_DATA = 0x00000000; @@ -1003,10 +1010,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1583_DATA = 0x00000000; ddr_phy->DENALI_PHY_1584_DATA = 0x00000000; ddr_phy->DENALI_PHY_1585_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1586_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1586_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1587_DATA = 0x00000000; ddr_phy->DENALI_PHY_1588_DATA = 0x00000000; ddr_phy->DENALI_PHY_1589_DATA = 0x00000000; @@ -1155,10 +1163,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_1839_DATA = 0x00000000; ddr_phy->DENALI_PHY_1840_DATA = 0x00000000; ddr_phy->DENALI_PHY_1841_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_1842_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_1842_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_1843_DATA = 0x00000000; ddr_phy->DENALI_PHY_1844_DATA = 0x00000000; ddr_phy->DENALI_PHY_1845_DATA = 0x00000000; @@ -1307,10 +1316,11 @@ void ddr_phy_config_800(struct mod_n1sdp_ddr_phy_reg *ddr_phy, ddr_phy->DENALI_PHY_2095_DATA = 0x00000000; ddr_phy->DENALI_PHY_2096_DATA = 0x00000000; ddr_phy->DENALI_PHY_2097_DATA = 0x00000000; - if (info->dimm_mem_width == 4) + if (info->dimm_mem_width == 4) { ddr_phy->DENALI_PHY_2098_DATA = 0x00000000; - else + } else { ddr_phy->DENALI_PHY_2098_DATA = 0x00010000; + } ddr_phy->DENALI_PHY_2099_DATA = 0x00000000; ddr_phy->DENALI_PHY_2100_DATA = 0x00000000; ddr_phy->DENALI_PHY_2101_DATA = 0x00000000; diff --git a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c index c664369dedba7d7148272ae5aeeb46c792ef932f..2d8e8a31040d30989d0e50404abc86a3350e48ef 100644 --- a/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c +++ b/product/n1sdp/module/n1sdp_ddr_phy/src/mod_n1sdp_ddr_phy.c @@ -209,8 +209,9 @@ static void delay_ms(uint32_t ms) { volatile uint32_t i = 0; while (ms) { - for (i = 0; i < 6000; i++) + for (i = 0; i < 6000; i++) { ; + } ms--; } } @@ -231,8 +232,9 @@ uint32_t dci_write_dram(struct mod_dmc620_reg *dmc, uint32_t *scp_address, dmc->DIRECT_ADDR = 0x00000002; dmc->DIRECT_CMD = (rank_1_hot << 16) | 0x000B; - while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_STATUS_MGR_ACTIVE) != 0) + while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_STATUS_MGR_ACTIVE) != 0) { ; + } // Set DCI_STRB dmc->DCI_STRB = 0x0000000F; @@ -243,8 +245,9 @@ uint32_t dci_write_dram(struct mod_dmc620_reg *dmc, uint32_t *scp_address, dmc->DIRECT_ADDR = 0x00000000; // Fill the write buffer - for (count = 0; count < size_32 ; count++) + for (count = 0; count < size_32; count++) { dmc->DCI_DATA = scp_address[count]; + } // Set the column address to 0 dmc->DIRECT_ADDR = 0x00000000; @@ -255,16 +258,18 @@ uint32_t dci_write_dram(struct mod_dmc620_reg *dmc, uint32_t *scp_address, // Issue WRITE command dmc->DIRECT_CMD = (rank_1_hot << 16) | 0x0008; - while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_STATUS_MGR_ACTIVE) != 0) + while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_STATUS_MGR_ACTIVE) != 0) { ; + } // Issue precharge direct command dmc->DIRECT_ADDR = 0x00000010; dmc->DIRECT_CMD = (rank_1_hot << 16) | 0x0002; dmc->DIRECT_ADDR = 0x00000000; - while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_STATUS_MGR_ACTIVE) != 0) + while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_STATUS_MGR_ACTIVE) != 0) { ; + } return FWK_SUCCESS; } @@ -291,12 +296,14 @@ uint32_t dci_read_dram(struct mod_dmc620_reg *dmc, uint32_t *scp_address, // Issue READ command dmc->DIRECT_CMD = (rank_1_hot << 16) | 0x0007; - while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_STATUS_MGR_ACTIVE) != 0) + while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_STATUS_MGR_ACTIVE) != 0) { ; + } // Copy read data back to buffer - for (count = 0; count < size_32 ; count++) + for (count = 0; count < size_32; count++) { scp_address[count] = dmc->DCI_DATA; + } // Issue precharge direct command dmc->DIRECT_ADDR = 0x00000010; @@ -386,8 +393,9 @@ static int write_eye_detect_single_rank(fwk_id_t element_id, } else if (dmc_id == 1) { dmc = (struct mod_dmc620_reg *)SCP_DMC1; ddr_phy_base = SCP_DDR_PHY1; - } else + } else { fwk_unexpected(); + } best_vrefdq_mr6 = -1; for (slice = 0; slice < NUM_SLICES; slice++) { @@ -466,8 +474,9 @@ static int write_eye_detect_single_rank(fwk_id_t element_id, num_completed = 0; delay = DEFAULT_DELAY; while (num_completed != NUM_DQ_BITS) { - if ((delay < DELAY_MIN) || (delay > DELAY_MAX)) + if ((delay < DELAY_MIN) || (delay > DELAY_MAX)) { break; + } for (slice = 0; slice < NUM_SLICES; slice++) { for (bit = 0; bit < NUM_BITS_PER_SLICE; bit++) { @@ -500,12 +509,14 @@ static int write_eye_detect_single_rank(fwk_id_t element_id, wr_data = wr_data_all[data_pattern]; ret_code = dci_write_dram(dmc, wr_data, DCI_FIFO_SIZE, rank, 0); - if (ret_code != FWK_SUCCESS) + if (ret_code != FWK_SUCCESS) { return ret_code; + } ret_code = dci_read_dram(dmc, rd_data, DCI_FIFO_SIZE, rank, 0); - if (ret_code != FWK_SUCCESS) + if (ret_code != FWK_SUCCESS) { return ret_code; + } for (dfi_beat = 0; dfi_beat < NUM_DFI_BEATS_TO_CHECK; @@ -518,8 +529,9 @@ static int write_eye_detect_single_rank(fwk_id_t element_id, start_bit = (dqs_edge * 64) + (slice * NUM_BITS_PER_SLICE); - if (slice == NUM_SLICES - 1) + if (slice == NUM_SLICES - 1) { start_bit += (dqs_edge % 2 == 0) ? 64 : 8; + } word_num = (start_bit / 32) + dfi_beat_word_offset; @@ -595,21 +607,25 @@ static int write_eye_detect_single_rank(fwk_id_t element_id, for (slice = 0; slice < NUM_SLICES; slice++) { min_width = DELAY_MAX; num_good_eyes_in_slice = 0; - for (i = 0; i < NUM_BITS_PER_SLICE; i++) + for (i = 0; i < NUM_BITS_PER_SLICE; i++) { sorted_mids[i] = DELAY_MAX; + } for (bit = 0; bit < NUM_BITS_PER_SLICE; bit++) { eye = &wrdq_eyes[slice][bit]; - if (!eye->min_found && !eye->max_found) + if (!eye->min_found && !eye->max_found) { break; + } eye->width = eye->max - eye->min; - if (eye->width < min_width) + if (eye->width < min_width) { min_width = eye->width; + } eye->mid = (eye->min + eye->max) / 2; for (s = 0; s < (int)NUM_BITS_PER_SLICE; s++) { if (eye->mid < sorted_mids[s]) { - for (t = num_good_eyes_in_slice-1; t >= 0; t--) + for (t = num_good_eyes_in_slice - 1; t >= 0; t--) { sorted_mids[t+1] = sorted_mids[t]; + } sorted_mids[s] = eye->mid; break; } @@ -625,8 +641,9 @@ static int write_eye_detect_single_rank(fwk_id_t element_id, better_slices = 0; for (slice = 0; slice < NUM_SLICES; slice++) { if (slice_eye_stats[slice].min_width > - best_slice_eye_stats[slice].min_width) + best_slice_eye_stats[slice].min_width) { better_slices++; + } } if (better_slices == NUM_SLICES) { best_vrefdq_mr6 = vrefdq_mr6; @@ -635,16 +652,18 @@ static int write_eye_detect_single_rank(fwk_id_t element_id, memcpy(best_slice_eye_stats, slice_eye_stats, sizeof(struct slice_eye_stat)*NUM_SLICES); } - if (!sweep_vrefdq) + if (!sweep_vrefdq) { break; + } } if (best_vrefdq_mr6 != -1) { for (slice = 0; slice < NUM_SLICES; slice++) { for (bit = 0; bit < NUM_BITS_PER_SLICE; bit++) { eye = &best_wrdq_eyes[slice][bit]; - if (eye->max == 0) + if (eye->max == 0) { analysis_ret_code = FWK_E_RANGE; + } } } } @@ -693,8 +712,9 @@ static int write_eye_detect_single_rank(fwk_id_t element_id, *(uint32_t *)(ddr_phy_base + (4 * denali_index)) = wr_val; } - if (ret_code != FWK_SUCCESS) - return ret_code; + if (ret_code != FWK_SUCCESS) { + return ret_code; + } return analysis_ret_code; } @@ -768,8 +788,9 @@ static int n1sdp_ddr_phy_post_training_configure(fwk_id_t element_id, value = rddqs_latency_adjust_value + ((rddqs_gate_slave_delay_value & 0x00000100) >> 8) + rptr_update_value; - if (value > rddata_valid_value) + if (value > rddata_valid_value) { rddata_valid_value = value; + } } if (info->dimm_mem_width == 4) { for (i = 0; i < 9; i++) { @@ -781,8 +802,9 @@ static int n1sdp_ddr_phy_post_training_configure(fwk_id_t element_id, value = rddqs_x4_latency_adjust_value + ((rddqs_x4_gate_slave_delay_value & 0x00000100) >> 8) + rptr_update_value; - if (value > rddata_valid_value) + if (value > rddata_valid_value) { rddata_valid_value = value; + } } } @@ -817,8 +839,9 @@ static int n1sdp_ddr_phy_post_training_configure(fwk_id_t element_id, } } - if (info->number_of_ranks > 1) + if (info->number_of_ranks > 1) { adjust_per_rank_rptr_update_value(phy_addr, info); + } if (info->speed >= 1333) { FWK_LOG_INFO("[DDR-PHY] Performing write eye training..."); @@ -917,10 +940,11 @@ static int n1sdp_verify_phy_status(fwk_id_t element_id, *(uint32_t *)(phy_base + (4 * (17 + (i * 256)))) = value1; for (j = 0; j < num_slices; j++) { value1 = *(uint32_t *)(phy_base + (4 * (34 + (i * 256)))); - if (j <= 16) + if (j <= 16) { value1 = (value1 & 0xFF00FFFF) | (j << 16); - else + } else { value1 = (value1 & 0xFF00FFFF) | (0x18 << 16); + } *(uint32_t *)(phy_base + (4 * (34 + (i * 256)))) = value1; value1 = *(uint32_t *)(phy_base + (4 * (47 + (i * 256)))); @@ -1085,10 +1109,11 @@ static int n1sdp_read_eye_phy_obs_regs(fwk_id_t element_id, *(uint32_t *)(phy_addr + (4 * (17 + (i * 256)))) = value; for (j = 0; j < num_dq_slices; j++) { value = *(uint32_t *)(phy_addr + (4 * (34 + (i * 256)))); - if (j <= 16) + if (j <= 16) { value = (value & 0xFF00FFFF) | (j << 16); - else + } else { value = (value & 0xFF00FFFF) | (0x18 << 16); + } *(uint32_t *)(phy_addr + (4 * (34 + (i * 256)))) = value; } @@ -1103,12 +1128,14 @@ static int n1sdp_phy_obs_regs(fwk_id_t element_id, int status; status = n1sdp_wrlvl_phy_obs_regs(element_id, rank, info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = n1sdp_read_gate_phy_obs_regs(element_id, rank, info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return n1sdp_read_eye_phy_obs_regs(element_id, info); } @@ -1143,12 +1170,14 @@ static int n1sdp_ddr_phy_element_init(fwk_id_t element_id, unsigned int unused, static int n1sdp_ddr_phy_bind(fwk_id_t id, unsigned int round) { /* Skip the second round (rounds are zero-indexed) */ - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } /* Nothing to be done for element-level binding */ - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { return FWK_SUCCESS; + } return FWK_SUCCESS; } @@ -1157,8 +1186,9 @@ static int n1sdp_ddr_phy_process_bind_request(fwk_id_t requester_id, fwk_id_t id, fwk_id_t api_type, const void **api) { /* Binding to elements is not permitted. */ - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { return FWK_E_ACCESS; + } *api = &n1sdp_ddr_phy_api; diff --git a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c index 33ac5366f47b164bb2996c044c2a624976ecfe08..7e721a8b80578d837440f4d77dd328e15df8ceb4 100644 --- a/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c +++ b/product/n1sdp/module/n1sdp_dmc620/src/dimm_spd.c @@ -43,28 +43,32 @@ static int spd_read(struct mod_n1sdp_i2c_master_api_polled *i2c_api, status = i2c_api->write((FWK_ID_ELEMENT(FWK_MODULE_IDX_N1SDP_I2C, 0)), WRITE_PAGE0, data, SPD_W_TRANSFER_SIZE, SPD_STOP); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } for (i = SPD_PAGE0_START; i <= MAX_SPD_PAGE0; i++) { status = i2c_api->read((FWK_ID_ELEMENT(FWK_MODULE_IDX_N1SDP_I2C, 0)), address, (char *)&spd_data[i], SPD_R_TRANSFER_SIZE); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } status = i2c_api->write((FWK_ID_ELEMENT(FWK_MODULE_IDX_N1SDP_I2C, 0)), WRITE_PAGE1, data, SPD_W_TRANSFER_SIZE, SPD_STOP); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } for (i = SPD_PAGE1_START; i <= MAX_SPD_PAGE1; i++) { status = i2c_api->read((FWK_ID_ELEMENT(FWK_MODULE_IDX_N1SDP_I2C, 0)), address, (char *)&spd_data[i], SPD_R_TRANSFER_SIZE); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -81,21 +85,25 @@ static int chk_ddr4_dimms(unsigned int speed, dimm0_dram_param = (uint8_t *)dimm0; dimm1_dram_param = (uint8_t *)dimm1; - if (memcmp(dimm0_dram_param, dimm1_dram_param, 125) != 0) + if (memcmp(dimm0_dram_param, dimm1_dram_param, 125) != 0) { return FWK_E_DATA; + } switch (speed) { case 800: - if ((dimm0_dram_param[18] > 0x0A) || (dimm1_dram_param[18] > 0x0A)) + if ((dimm0_dram_param[18] > 0x0A) || (dimm1_dram_param[18] > 0x0A)) { return FWK_E_DATA; + } break; case 1200: - if ((dimm0_dram_param[18] > 0x07) || (dimm1_dram_param[18] > 0x07)) + if ((dimm0_dram_param[18] > 0x07) || (dimm1_dram_param[18] > 0x07)) { return FWK_E_DATA; + } break; case 1333: - if ((dimm0_dram_param[18] > 0x06) || (dimm1_dram_param[18] > 0x06)) + if ((dimm0_dram_param[18] > 0x06) || (dimm1_dram_param[18] > 0x06)) { return FWK_E_DATA; + } break; default: fwk_unexpected(); @@ -116,8 +124,9 @@ static void dimm_device_data(uint8_t *spd_data, uint8_t dimm_id) " Manufacturer ID = 0x%x 0x%x", spd_data[320], spd_data[321]); j = 0; - for (i = 329; i <= 348; i++) + for (i = 329; i <= 348; i++) { part_num[j++] = spd_data[i]; + } FWK_LOG_INFO(" Module part number = %s", part_num); @@ -449,8 +458,9 @@ int dimm_spd_init_check(struct mod_n1sdp_i2c_master_api_polled *i2c_api, spd_read(i2c_api, DIMM1_SPD_SLAVE, (uint8_t *)&ddr4_dimm1); status = chk_ddr4_dimms(ddr->speed, &ddr4_dimm0, &ddr4_dimm1); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } dmc_clk_freq = ddr->speed * UINT32_C(1000000); dmc_clk_period = 1.0f / dmc_clk_freq; @@ -472,27 +482,32 @@ int dimm_spd_address_control(uint32_t *temp_reg, struct dimm_info *ddr) temp = ddr4_dimm0.dram_param.sdram_addr; status = get_dimm_col_bits(temp, temp_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = get_dimm_row_bits(temp, temp_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } temp = ddr4_dimm0.dram_param.sdram_density_banks; status = get_dimm_bank_addr_grp_bits(temp, temp_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } temp = ddr4_dimm0.dram_param.mod_org; status = get_dimm_rank_bits(temp, temp_reg, ddr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } temp = ddr4_dimm0.dram_param.sdram_pkg_type; status = get_dimm_cid_bits(temp, temp_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -504,8 +519,9 @@ int dimm_spd_format_control(uint32_t *temp_reg) temp = ddr4_dimm0.dram_param.mod_mem_bus_width; status = get_dimm_memory_width(temp, temp_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -517,22 +533,26 @@ int dimm_spd_memory_type(uint32_t *temp_reg, struct dimm_info *ddr) temp = ddr4_dimm0.dram_param.kb_dram_type; status = get_dimm_memory_type_nxt(temp, temp_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = get_dimm_row_bits(temp, temp_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } temp = ddr4_dimm0.dram_param.sdram_density_banks; status = get_dimm_bank_grp_bits(temp, temp_reg); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } temp = ddr4_dimm0.dram_param.mod_org; status = get_dimm_memory_device_width_next_bits(temp, temp_reg, ddr); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -570,8 +590,9 @@ int dimm_spd_t_rfc(uint32_t *temp_reg) if (multi_rank == true) { status = dimm_spd_t_refi(&tmp_value); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } *temp_reg |= (T_RFCFC_NEXT_MASK & ((uint32_t)((float)tmp_value/t_refi) << 20)); @@ -747,36 +768,40 @@ int dimm_spd_calculate_dimm_size_gb(uint32_t *size_gb) temp = ddr4_dimm0.dram_param.sdram_density_banks; temp = (temp & SPD_SDRAM_DENSITY_MASK) >> SPD_SDRAM_DENSITY_POS; - if (temp <= 7) + if (temp <= 7) { size = (uint64_t)(1 << temp) * 256UL * FWK_MIB; - else if (temp == 0x8) + } else if (temp == 0x8) { size = 12UL * FWK_GIB; - else if (temp == 0x9) + } else if (temp == 0x9) { size = 24UL * FWK_GIB; - else + } else { return FWK_E_DEVICE; + } size = size / 8UL; temp = ddr4_dimm0.dram_param.mod_mem_bus_width; temp = (temp & SPD_PRI_BUS_WIDTH_BITS_MASK) >> SPD_PRI_BUS_WIDTH_BITS_POS; - if (temp <= 3) + if (temp <= 3) { size = size * (uint64_t)((1 << temp) * 8UL); - else + } else { return FWK_E_DEVICE; + } temp = ddr4_dimm0.dram_param.mod_org; temp = (temp & SDRAM_DEVICE_WIDTH_MASK) >> SDRAM_DEVICE_WIDTH_POS; - if (temp <= 3) + if (temp <= 3) { size = size / (uint64_t)((1 << temp) * 4); - else + } else { return FWK_E_DEVICE; + } temp = ddr4_dimm0.dram_param.mod_org; temp = (temp & SPD_PKG_RANK_BITS_MASK) >> SPD_PKG_RANK_BITS_OFFSET; - if (temp <= 7) + if (temp <= 7) { size = size * (uint64_t)(temp + 1); - else + } else { return FWK_E_DEVICE; + } *size_gb = size / FWK_GIB; return FWK_SUCCESS; diff --git a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c index 76a339667f31dde8a3c2d9e7a6758ccacaf01b36..a13b493bcd79d17d441b4df8923ef8bd41f8f26f 100644 --- a/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c +++ b/product/n1sdp/module/n1sdp_dmc620/src/mod_n1sdp_dmc620.c @@ -66,8 +66,9 @@ void dmc620_abort_recover(struct mod_dmc620_reg *dmc) /* Wait for DMC to enter aborted state */ FWK_LOG_INFO("[DDR] Waiting for DMC to enter abort state..."); - while ((dmc->MEMC_STATUS & 0x00000007) != 0x4) + while ((dmc->MEMC_STATUS & 0x00000007) != 0x4) { continue; + } FWK_LOG_INFO("[DDR] DONE"); @@ -81,8 +82,9 @@ void dmc620_abort_recover(struct mod_dmc620_reg *dmc) /* Wait for state transition to complete */ FWK_LOG_INFO("[DDR] Waiting for DMC state transition..."); - while ((dmc->MEMC_STATUS & 0x00000007) != 0x5) + while ((dmc->MEMC_STATUS & 0x00000007) != 0x5) { continue; + } FWK_LOG_INFO("[DDR] DONE"); @@ -92,8 +94,9 @@ void dmc620_abort_recover(struct mod_dmc620_reg *dmc) /* Wait for state transition to complete */ FWK_LOG_INFO("[DDR] Waiting for DMC state transition..."); - while ((dmc->MEMC_STATUS & 0x00000007) != current_state) + while ((dmc->MEMC_STATUS & 0x00000007) != current_state) { continue; + } FWK_LOG_INFO("[DDR] DONE"); @@ -356,21 +359,24 @@ static int ddr_training(struct mod_dmc620_reg *dmc, FWK_LOG_INFO("[DDR] Write leveling rank %d... ", i); /* Clear interrupt status if any */ - if (dmc->INTERRUPT_STATUS != 0) + if (dmc->INTERRUPT_STATUS != 0) { dmc->INTERRUPT_CLR = 0xFFFFFFFF; + } /* Set training command */ dmc->DIRECT_ADDR = DDR_ADDR_TRAIN_TYPE_WR_LVL; if (dmc->DIRECT_ADDR != DDR_ADDR_TRAIN_TYPE_WR_LVL) { - for (j = 1; j <= ddr_info.number_of_ranks; j++) + for (j = 1; j <= ddr_info.number_of_ranks; j++) { ddr_phy_api->wrlvl_phy_obs_regs(ddr_id, j, info); + } return FWK_E_DEVICE; } dmc->DIRECT_CMD = ((1 << (i + 15)) | 0x000A); status = ddr_poll_training_status(dmc); if (status != FWK_SUCCESS) { - for (j = 1; j <= ddr_info.number_of_ranks; j++) + for (j = 1; j <= ddr_info.number_of_ranks; j++) { ddr_phy_api->wrlvl_phy_obs_regs(ddr_id, j, info); + } return status; } ddr_phy_api->wrlvl_phy_obs_regs(ddr_id, i, info); @@ -379,8 +385,9 @@ static int ddr_training(struct mod_dmc620_reg *dmc, FWK_LOG_INFO("[DDR] Read gate training"); /* Clear interrupt status if any */ - if (dmc->INTERRUPT_STATUS != 0) + if (dmc->INTERRUPT_STATUS != 0) { dmc->INTERRUPT_CLR = 0xFFFFFFFF; + } FWK_LOG_INFO("[DDR] A side..."); @@ -400,14 +407,16 @@ static int ddr_training(struct mod_dmc620_reg *dmc, status = ddr_poll_training_status(dmc); if (status != FWK_SUCCESS) { - for (j = 1; j <= ddr_info.number_of_ranks; j++) + for (j = 1; j <= ddr_info.number_of_ranks; j++) { ddr_phy_api->read_gate_phy_obs_regs(ddr_id, j, info); + } return status; } /* Clear interrupt status if any */ - if (dmc->INTERRUPT_STATUS != 0) + if (dmc->INTERRUPT_STATUS != 0) { dmc->INTERRUPT_CLR = 0xFFFFFFFF; + } #if DDR_TRAIN_TWO_RANKS FWK_LOG_INFO("[DDR] B side..."); @@ -430,14 +439,16 @@ static int ddr_training(struct mod_dmc620_reg *dmc, return status; #endif - for (j = 1; j <= ddr_info.number_of_ranks; j++) + for (j = 1; j <= ddr_info.number_of_ranks; j++) { ddr_phy_api->read_gate_phy_obs_regs(ddr_id, j, info); + } FWK_LOG_INFO("[DDR] Read eye training"); /* Clear interrupt status if any */ - if (dmc->INTERRUPT_STATUS != 0) + if (dmc->INTERRUPT_STATUS != 0) { dmc->INTERRUPT_CLR = 0xFFFFFFFF; + } FWK_LOG_INFO("[DDR] A side..."); @@ -457,14 +468,16 @@ static int ddr_training(struct mod_dmc620_reg *dmc, status = ddr_poll_training_status(dmc); if (status != FWK_SUCCESS) { - for (j = 1; j <= ddr_info.number_of_ranks; j++) + for (j = 1; j <= ddr_info.number_of_ranks; j++) { ddr_phy_api->phy_obs_regs(ddr_id, j, info); + } return status; } /* Clear interrupt status if any */ - if (dmc->INTERRUPT_STATUS != 0) + if (dmc->INTERRUPT_STATUS != 0) { dmc->INTERRUPT_CLR = 0xFFFFFFFF; + } FWK_LOG_INFO("[DDR] B side..."); @@ -483,14 +496,16 @@ static int ddr_training(struct mod_dmc620_reg *dmc, status = ddr_poll_training_status(dmc); if (status != FWK_SUCCESS) { - for (j = 1; j <= ddr_info.number_of_ranks; j++) + for (j = 1; j <= ddr_info.number_of_ranks; j++) { ddr_phy_api->phy_obs_regs(ddr_id, j, info); + } return status; } /* Clear interrupt status if any */ - if (dmc->INTERRUPT_STATUS != 0) + if (dmc->INTERRUPT_STATUS != 0) { dmc->INTERRUPT_CLR = 0xFFFFFFFF; + } FWK_LOG_INFO("[DDR] MC initiated update..."); @@ -498,13 +513,15 @@ static int ddr_training(struct mod_dmc620_reg *dmc, dmc->DIRECT_CMD = ((ddr_info.ranks_to_train << 16) | 0x000A); status = ddr_poll_training_status(dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } dmc->DIRECT_CMD = ((ddr_info.ranks_to_train << 16) | 0x000C); - for (j = 1; j <= ddr_info.number_of_ranks; j++) + for (j = 1; j <= ddr_info.number_of_ranks; j++) { ddr_phy_api->phy_obs_regs(ddr_id, j, info); + } return FWK_SUCCESS; } @@ -515,23 +532,27 @@ static int dmc620_verify_phy_status(fwk_id_t ddr_id) status = ddr_phy_api->verify_phy_status(ddr_id, DDR_ADDR_TRAIN_TYPE_WR_LVL, &ddr_info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_phy_api->verify_phy_status(ddr_id, DDR_ADDR_TRAIN_TYPE_RD_GATE, &ddr_info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_phy_api->verify_phy_status(ddr_id, DDR_ADDR_TRAIN_TYPE_RD_EYE, &ddr_info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_phy_api->verify_phy_status(ddr_id, DDR_ADDR_TRAIN_TYPE_VREF, &ddr_info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -540,8 +561,9 @@ static void delay_ms(uint32_t ms) { volatile uint32_t i = 0; while (ms) { - for (i = 0; i < 6000; i++) + for (i = 0; i < 6000; i++) { ; + } ms--; } } @@ -554,8 +576,9 @@ static void execute_ddr_cmd(struct mod_dmc620_reg *dmc, dmc->DIRECT_ADDR = addr; dmc->DIRECT_CMD = cmd; - if (ms != 0) + if (ms != 0) { delay_ms(ms); + } status = dmc620_poll_dmc_status(dmc); if (status != FWK_SUCCESS) { @@ -573,8 +596,9 @@ static int direct_ddr_cmd(struct mod_dmc620_reg *dmc) int status; /* Clear interrupt status if any */ - if (dmc->INTERRUPT_STATUS != 0) + if (dmc->INTERRUPT_STATUS != 0) { dmc->INTERRUPT_CLR = 0xFFFFFFFF; + } execute_ddr_cmd(dmc, 0x00000004, 0x0001000A, 0); execute_ddr_cmd(dmc, 0x00000006, @@ -588,8 +612,9 @@ static int direct_ddr_cmd(struct mod_dmc620_reg *dmc) ((ddr_info.ranks_to_train << 16) | 0x000B), 0); execute_ddr_cmd(dmc, 0x0000002A, 0x0001000D, 0); - for (count = 0; count < 12; count++) + for (count = 0; count < 12; count++) { execute_ddr_cmd(dmc, 0x00000200, 0x0001000D, 1); + } execute_ddr_cmd(dmc, 0x00000000, ((ddr_info.ranks_to_train << 16) | 0x0000), 0); @@ -642,45 +667,51 @@ static int direct_ddr_cmd(struct mod_dmc620_reg *dmc) /* RC03, CA and CS Signals Driver Characteristics Control Word */ addr = 0; if (ddr_info.number_of_ranks == 1) { - if (ddr_info.dimm_mem_width == 4) + if (ddr_info.dimm_mem_width == 4) { addr = 0x00000035; - else + } else { addr = 0x00000030; + } } else { - if (ddr_info.dimm_mem_width == 4) + if (ddr_info.dimm_mem_width == 4) { addr = 0x0000003A; - else + } else { addr = 0x00000035; + } } execute_ddr_cmd(dmc, addr, 0x0001070F, 5); /* RC04, ODT and CKE Signal Driver Characteristics Control Word */ addr = 0; if (ddr_info.number_of_ranks == 1) { - if (ddr_info.dimm_mem_width == 4) + if (ddr_info.dimm_mem_width == 4) { addr = 0x00000045; - else + } else { addr = 0x00000040; + } } else { - if (ddr_info.dimm_mem_width == 4) + if (ddr_info.dimm_mem_width == 4) { addr = 0x0000004A; - else + } else { addr = 0x00000045; + } } execute_ddr_cmd(dmc, addr, 0x0001070F, 5); /* RC05, Clock Driver Characteristics Control Word */ addr = 0; if (ddr_info.number_of_ranks == 1) { - if (ddr_info.dimm_mem_width == 4) + if (ddr_info.dimm_mem_width == 4) { addr = 0x00000055; - else + } else { addr = 0x00000050; + } } else { - if (ddr_info.dimm_mem_width == 4) + if (ddr_info.dimm_mem_width == 4) { addr = 0x0000005A; - else + } else { addr = 0x00000055; + } } execute_ddr_cmd(dmc, addr, 0x0001070F, 5); @@ -692,22 +723,25 @@ static int direct_ddr_cmd(struct mod_dmc620_reg *dmc) addr = 0; switch (ddr_info.speed) { case 800: - if (ddr_info.number_of_ranks == 1) + if (ddr_info.number_of_ranks == 1) { addr = 0x00000497; - else + } else { addr = 0x000004A3; + } break; case 1200: - if (ddr_info.number_of_ranks == 1) + if (ddr_info.number_of_ranks == 1) { addr = 0x00000894; - else + } else { addr = 0x000008A3; + } break; case 1333: - if (ddr_info.number_of_ranks == 1) + if (ddr_info.number_of_ranks == 1) { addr = 0x00000C95; - else + } else { addr = 0x00000CA3; + } break; default: fwk_unexpected(); @@ -720,8 +754,9 @@ static int direct_ddr_cmd(struct mod_dmc620_reg *dmc) delay_ms(1); dmc->DIRECT_CMD = ((ddr_info.ranks_to_train << 16) | 0x0601); status = dmc620_poll_dmc_status(dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } addr = addr & 0xFFFFFF7F; execute_ddr_cmd(dmc, addr, @@ -789,14 +824,16 @@ static int direct_ddr_cmd(struct mod_dmc620_reg *dmc) } dmc->T_WTR_NEXT = addr; - for (count = 0; count < 12; count++) + for (count = 0; count < 12; count++) { execute_ddr_cmd(dmc, 0x00000200, 0x0001000D, 0); + } execute_ddr_cmd(dmc, 0x00000400, ((ddr_info.ranks_to_train << 16) | 0x0005), 0); - for (count = 0; count < 12; count++) + for (count = 0; count < 12; count++) { execute_ddr_cmd(dmc, 0x00000200, 0x0001000D, 0); + } return FWK_SUCCESS; } @@ -846,16 +883,18 @@ static int dmc620_post_init(void) FWK_LOG_INFO("[DDR] Verifying PHY status for DMC %d...", i); status = dmc620_verify_phy_status(element_config->ddr_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } FWK_LOG_INFO("[DDR] Done"); } for (i = 0; i < count; i++) { id = FWK_ID_ELEMENT(FWK_MODULE_IDX_N1SDP_DMC620, i); element_config = fwk_module_get_data(id); - for (j = 1; j <= ddr_info.number_of_ranks; j++) + for (j = 1; j <= ddr_info.number_of_ranks; j++) { ddr_phy_api->phy_obs_regs(element_config->ddr_id, j, &ddr_info); + } } return FWK_SUCCESS; @@ -870,8 +909,9 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) dmc_id = fwk_id_get_element_idx(ddr_id); if (dmc_id == 0) { status = dmc620_pre_init(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } FWK_LOG_INFO("[DDR] Initialising DMC620 at 0x%x", (uintptr_t)dmc); @@ -997,20 +1037,22 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) } dmc->T_ACT_WINDOW_NEXT = value; - if ((ddr_info.speed == 1333) || (ddr_info.speed == 1200)) + if ((ddr_info.speed == 1333) || (ddr_info.speed == 1200)) { dmc->T_RTR_NEXT = 0x24090704; - else + } else { dmc->T_RTR_NEXT = 0x14060604; + } dmc->T_RTW_NEXT = 0x001B1B1B; dmc->T_RTP_NEXT = 0x00000008; dmc->T_WR_NEXT = 0x00000029; dmc->T_WTR_NEXT = 0x001B1B1B; - if ((ddr_info.speed == 1333) || (ddr_info.speed == 1200)) + if ((ddr_info.speed == 1333) || (ddr_info.speed == 1200)) { dmc->T_WTW_NEXT = 0x24090704; - else + } else { dmc->T_WTW_NEXT = 0x14060604; + } dmc->T_XMPD_NEXT = 0x00000480; dmc->T_EP_NEXT = 0x00000006; @@ -1109,8 +1151,9 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) continue; status = ddr_phy_api->configure(ddr_id, &ddr_info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } dmc->MEMC_CMD = MOD_DMC620_MEMC_CMD_CONFIG; while ((dmc->MEMC_STATUS & MOD_DMC620_MEMC_CMD) != @@ -1128,21 +1171,25 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) FWK_LOG_INFO("[DDR] Sending direct DDR commands"); status = direct_ddr_cmd(dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_training(dmc, ddr_id, &ddr_info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = ddr_phy_api->post_training_configure(ddr_id, &ddr_info); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } FWK_LOG_INFO("[DDR] Enable DIMM refresh..."); status = enable_dimm_refresh(dmc); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Switch to READY */ FWK_LOG_INFO("[DDR] Setting DMC to READY mode"); @@ -1156,8 +1203,9 @@ static int dmc620_config(struct mod_dmc620_reg *dmc, fwk_id_t ddr_id) if (dmc_id == 1) { status = dmc620_post_init(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -1174,8 +1222,9 @@ static int dmc620_get_mem_size_gb(uint32_t *size) size_gb = 0; status = dimm_spd_calculate_dimm_size_gb(&size_gb); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } *size = size_gb * 2; return FWK_SUCCESS; @@ -1211,33 +1260,38 @@ static int mod_dmc620_bind(fwk_id_t id, unsigned int round) const struct mod_dmc620_module_config *module_config; /* Nothing to do in the second round of calls. */ - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } /* Nothing to do in case of elements. */ - if (fwk_module_is_valid_element_id(id)) + if (fwk_module_is_valid_element_id(id)) { return FWK_SUCCESS; + } module_config = fwk_module_get_data(fwk_module_id_n1sdp_dmc620); fwk_assert(module_config != NULL); status = fwk_module_bind(module_config->ddr_module_id, module_config->ddr_api_id, &ddr_phy_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_ELEMENT(FWK_MODULE_IDX_TIMER, 0), FWK_ID_API(FWK_MODULE_IDX_TIMER, MOD_TIMER_API_IDX_TIMER), &timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_I2C), FWK_ID_API(FWK_MODULE_IDX_N1SDP_I2C, MOD_N1SDP_I2C_API_MASTER_POLLED), &i2c_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -1298,8 +1352,9 @@ static int mod_dmc620_process_notification( params = (struct clock_notification_params *)event->params; - if (params->new_state == MOD_CLOCK_STATE_RUNNING) + if (params->new_state == MOD_CLOCK_STATE_RUNNING) { return dmc620_notify_system_state_transition_resume(event->target_id); + } return FWK_SUCCESS; } diff --git a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c index e28e969a1d626fa5699ee6cbb7ceebb3c9eca27e..41d49cd17e8fa64c3d9512bbcfae46a9446ceab0 100644 --- a/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c +++ b/product/n1sdp/module/n1sdp_i2c/src/mod_n1sdp_i2c.c @@ -138,11 +138,13 @@ static void i2c_isr(uintptr_t data) isr = ctx->reg->ISR; ctx->reg->ISR = isr; - if (isr == 0) + if (isr == 0) { return; + } - if (isr & I2C_ISR_ERROR_MASK) + if (isr & I2C_ISR_ERROR_MASK) { goto i2c_error; + } switch (ctx->irq_data_ctx.state) { case MOD_N1SDP_I2C_STATE_TX: @@ -167,18 +169,20 @@ static void i2c_isr(uintptr_t data) } /* Make sure transaction sizes align. */ - if (ctx->reg->SR & I2C_SR_RXDV_MASK) + if (ctx->reg->SR & I2C_SR_RXDV_MASK) { goto i2c_error; + } /* If master, reload TSR if more data expected. */ if ((ctx->config->mode == MOD_N1SDP_I2C_MASTER_MODE) && (ctx->irq_data_ctx.index < ctx->irq_data_ctx.size)) { if ((ctx->irq_data_ctx.size - ctx->irq_data_ctx.index) > - I2C_TSR_TANSFER_SIZE) + I2C_TSR_TANSFER_SIZE) { ctx->reg->TSR = I2C_TSR_TANSFER_SIZE; - else + } else { ctx->reg->TSR = (ctx->irq_data_ctx.size - ctx->irq_data_ctx.index); + } } break; @@ -189,19 +193,22 @@ static void i2c_isr(uintptr_t data) /* Check for completion interrupt */ if (isr & I2C_ISR_COMP_MASK) { /* Make sure the correct amount of data was transferred */ - if (ctx->irq_data_ctx.index != ctx->irq_data_ctx.size) + if (ctx->irq_data_ctx.index != ctx->irq_data_ctx.size) { goto i2c_error; + } ctx->irq_data_ctx.busy = false; I2C_REG_W(ctx->reg->AR, I2C_AR_ADD7_MASK, I2C_AR_ADD7_SHIFT, 0); /* Run completion callback */ if ((ctx->irq_data_ctx.state == MOD_N1SDP_I2C_STATE_TX) && - (ctx->i2c_callback)) + (ctx->i2c_callback)) { ctx->i2c_callback(ctx, MOD_N1SDP_I2C_NOTIFICATION_IDX_TX); - else if ((ctx->irq_data_ctx.state == MOD_N1SDP_I2C_STATE_RX) && - (ctx->i2c_callback)) + } else if ( + (ctx->irq_data_ctx.state == MOD_N1SDP_I2C_STATE_RX) && + (ctx->i2c_callback)) { ctx->i2c_callback(ctx, MOD_N1SDP_I2C_NOTIFICATION_IDX_RX); + } /* Reset I2C driver state */ ctx->reg->IDR = 0xFFFF; @@ -212,8 +219,9 @@ static void i2c_isr(uintptr_t data) return; i2c_error: - if (ctx->i2c_callback) + if (ctx->i2c_callback) { ctx->i2c_callback(ctx, MOD_N1SDP_I2C_NOTIFICATION_IDX_ERROR); + } ctx->reg->IDR = 0xFFFF; I2C_REG_RMW(ctx->reg->CR, I2C_CR_CLRFIFO_MASK, I2C_CR_CLRFIFO_SHIFT, @@ -245,9 +253,10 @@ static int i2c_master_read_polled(fwk_id_t device_id, I2C_REG_RMW(device_ctx->reg->CR, I2C_CR_RW_MASK, I2C_CR_RW_SHIFT, I2C_RW_READ); - if (!device_ctx->perform_repeat_start) + if (!device_ctx->perform_repeat_start) { I2C_REG_RMW(device_ctx->reg->CR, I2C_CR_CLRFIFO_MASK, I2C_CR_CLRFIFO_SHIFT, I2C_CLRFIFO_ON); + } clear_isr(device_ctx); @@ -263,9 +272,12 @@ static int i2c_master_read_polled(fwk_id_t device_id, while (!complete && (timeout != 0)) { if (I2C_REG_R(device_ctx->reg->SR, I2C_SR_RXDV_MASK, I2C_SR_RXDV_SHIFT)) { - if (I2C_REG_R(device_ctx->reg->ISR, I2C_ISR_COMP_MASK, - I2C_ISR_COMP_SHIFT)) + if (I2C_REG_R( + device_ctx->reg->ISR, + I2C_ISR_COMP_MASK, + I2C_ISR_COMP_SHIFT)) { complete = true; + } } timeout--; } @@ -354,8 +366,9 @@ static int i2c_master_write_polled(fwk_id_t device_id, uint16_t address, if (sr == 0) { isr = I2C_REG_R(device_ctx->reg->ISR, I2C_ISR_COMP_MASK, I2C_ISR_COMP_SHIFT); - if (isr != 0) + if (isr != 0) { complete = true; + } } timeout--; } @@ -400,8 +413,9 @@ static int i2c_slave_write_irq(fwk_id_t device_id, fwk_assert((length != 0) && (data != NULL)); - if (device_ctx->irq_data_ctx.busy) + if (device_ctx->irq_data_ctx.busy) { return FWK_E_BUSY; + } device_ctx->irq_data_ctx.state = MOD_N1SDP_I2C_STATE_TX; device_ctx->irq_data_ctx.data = data; @@ -436,8 +450,9 @@ static int i2c_slave_read_irq(fwk_id_t device_id, fwk_assert((length != 0) && (data != NULL)); - if (device_ctx->irq_data_ctx.busy) + if (device_ctx->irq_data_ctx.busy) { return FWK_E_BUSY; + } device_ctx->irq_data_ctx.state = MOD_N1SDP_I2C_STATE_RX; device_ctx->irq_data_ctx.data = data; @@ -453,8 +468,9 @@ static int i2c_slave_read_irq(fwk_id_t device_id, I2C_REG_W(device_ctx->reg->AR, I2C_AR_ADD7_MASK, I2C_AR_ADD7_SHIFT, device_ctx->config->slave_addr); - if (length < (I2C_TSR_TANSFER_SIZE - 2)) + if (length < (I2C_TSR_TANSFER_SIZE - 2)) { device_ctx->reg->TSR = length; + } /* Clear any pending IRQs and re-enable interrupts */ device_ctx->reg->ISR = I2C_ISR_MASK; @@ -481,8 +497,9 @@ static void i2c_init(struct n1sdp_i2c_dev_ctx *device_ctx, divider = (aclk / (I2C_HZ * hz)) - I2C_DIV; - if (divider > I2C_DIV_MAX) + if (divider > I2C_DIV_MAX) { divider = (divider / I2C_DIV_VAL) | (I2C_DIV_VAL1 << I2C_DIV_SHIFT); + } I2C_REG_RMW(device_ctx->reg->CR, I2C_CR_DIV_MASK, I2C_CR_DIV_SHIFT, divider); @@ -494,8 +511,9 @@ static void i2c_init(struct n1sdp_i2c_dev_ctx *device_ctx, static int n1sdp_i2c_init(fwk_id_t module_id, unsigned int element_count, const void *data) { - if (element_count == 0) + if (element_count == 0) { return FWK_E_DATA; + } i2c_ctx.device_ctx_table = fwk_mm_calloc(element_count, sizeof(i2c_ctx.device_ctx_table[0])); @@ -509,18 +527,21 @@ static int n1sdp_i2c_element_init(fwk_id_t element_id, unsigned int unused, struct mod_n1sdp_i2c_device_config *config; struct n1sdp_i2c_dev_ctx *device_ctx; - if (data == NULL) + if (data == NULL) { return FWK_E_PARAM; + } config = (struct mod_n1sdp_i2c_device_config *)data; if ((config->addr_size != MOD_N1SDP_I2C_ADDRESS_7_BIT) || - (config->ack_en != MOD_N1SDP_I2C_ACK_ENABLE)) + (config->ack_en != MOD_N1SDP_I2C_ACK_ENABLE)) { return FWK_E_SUPPORT; + } device_ctx = &i2c_ctx.device_ctx_table[fwk_id_get_element_idx(element_id)]; - if (device_ctx == NULL) + if (device_ctx == NULL) { return FWK_E_DATA; + } device_ctx->config = config; device_ctx->reg = (struct i2c_reg *)config->reg_base; @@ -581,13 +602,15 @@ static int n1sdp_i2c_start(fwk_id_t id) unsigned int i2c_element_id; /* Nothing to do for module */ - if (!fwk_module_is_valid_element_id(id)) + if (!fwk_module_is_valid_element_id(id)) { return FWK_SUCCESS; + } i2c_element_id = fwk_id_get_element_idx(id); device_ctx = &i2c_ctx.device_ctx_table[i2c_element_id]; - if (device_ctx == NULL) + if (device_ctx == NULL) { return FWK_E_DATA; + } device_ctx->i2c_id = i2c_element_id; @@ -595,16 +618,19 @@ static int n1sdp_i2c_start(fwk_id_t id) i2c_irq = device_ctx->config->irq; status = fwk_interrupt_set_isr_param(i2c_irq, i2c_isr, (uintptr_t)device_ctx); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } status = fwk_interrupt_clear_pending(i2c_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } status = fwk_interrupt_enable(i2c_irq); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_DEVICE; + } device_ctx->i2c_callback = i2c_callback_fn; } diff --git a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c index b799860c6236d4bfd9af21744fe41f88d51545be..1a083e0991e729e3720dcffb0d1a056cb5c200ff 100644 --- a/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c +++ b/product/n1sdp/module/n1sdp_pcie/src/mod_n1sdp_pcie.c @@ -117,22 +117,25 @@ static int n1sdp_pcie_ccix_enable_opt_tlp(bool enable) } } - if (config == NULL) + if (config == NULL) { return FWK_E_DATA; + } /* Configure for the optimized header or pcie compatible header*/ - if (enable) + if (enable) { value = (CCIX_CTRL_CAW | CCIX_CTRL_EN_OPT_TLP | CCIX_CTRL_CSTT_V0_V1 | CCIX_VENDER_ID); - else + } else { value = (CCIX_CTRL_CAW | CCIX_VENDER_ID); + } FWK_LOG_INFO("[CCIX] CCIX_CONTROL: 0x%" PRIX32, value); *(uint32_t *)(dev_ctx->lm_apb + PCIE_LM_RC_CCIX_CTRL_REG) = value; - if (enable) + if (enable) { dev_ctx->ctrl_apb->CCIX_CTRL = 0x1; + } return FWK_SUCCESS; } @@ -153,8 +156,9 @@ static int n1sdp_pcie_power_on(fwk_id_t id) did = fwk_id_get_element_idx(id); dev_ctx = &pcie_ctx.device_ctx_table[did]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } FWK_LOG_INFO("[%s] Powering ON controller...", pcie_type[did]); wait_data.ctrl_apb = NULL; @@ -202,14 +206,16 @@ static int n1sdp_pcie_phy_init(fwk_id_t id) did = fwk_id_get_element_idx(id); dev_ctx = &pcie_ctx.device_ctx_table[did]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } if ((n1sdp_get_chipid() != 0x0) || !dev_ctx->config->ccix_capable || - pcie_ctx.c2c_api->is_slave_alive()) + pcie_ctx.c2c_api->is_slave_alive()) { gen_speed = PCIE_GEN_3; - else + } else { gen_speed = PCIE_GEN_4; + } lane_count = LAN_COUNT_IN_X_16; @@ -240,14 +246,16 @@ static int n1sdp_pcie_controller_init(fwk_id_t id, bool ep_mode) did = fwk_id_get_element_idx(id); dev_ctx = &pcie_ctx.device_ctx_table[did]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } if ((n1sdp_get_chipid() != 0x0) || !dev_ctx->config->ccix_capable || - pcie_ctx.c2c_api->is_slave_alive()) + pcie_ctx.c2c_api->is_slave_alive()) { gen_speed = PCIE_GEN_3; - else + } else { gen_speed = PCIE_GEN_4; + } lane_count = LAN_COUNT_IN_X_16; @@ -288,8 +296,9 @@ static int n1sdp_pcie_link_training(fwk_id_t id, bool ep_mode) did = fwk_id_get_element_idx(id); dev_ctx = &pcie_ctx.device_ctx_table[did]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } if ((n1sdp_get_chipid() != 0x0) || !dev_ctx->config->ccix_capable || pcie_ctx.c2c_api->is_slave_alive()) { @@ -406,8 +415,9 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) did = fwk_id_get_element_idx(id); dev_ctx = &pcie_ctx.device_ctx_table[did]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } FWK_LOG_INFO("[%s] Setup Type0 configuration...", pcie_type[did]); if (dev_ctx->config->ccix_capable) @@ -427,12 +437,13 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) FWK_LOG_INFO("[%s] Done", pcie_type[did]); FWK_LOG_INFO("[%s] Setup Type1 configuration...", pcie_type[did]); - if (dev_ctx->config->ccix_capable) + if (dev_ctx->config->ccix_capable) { ecam_base_addr = dev_ctx->config->axi_slave_base32 + CCIX_AXI_ECAM_TYPE1_OFFSET; - else + } else { ecam_base_addr = dev_ctx->config->axi_slave_base32 + PCIE_AXI_ECAM_TYPE1_OFFSET; + } status = axi_outbound_region_setup(dev_ctx->rc_axi_config_apb, (ecam_base_addr - SCP_AP_AXI_OFFSET), __builtin_ctz(AXI_ECAM_TYPE1_SIZE), @@ -444,12 +455,13 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) FWK_LOG_INFO("[%s] Done", pcie_type[did]); FWK_LOG_INFO("[%s] Setup MMIO32 configuration...", pcie_type[did]); - if (dev_ctx->config->ccix_capable) + if (dev_ctx->config->ccix_capable) { ecam_base_addr = dev_ctx->config->axi_slave_base32 + CCIX_AXI_MMIO32_OFFSET; - else + } else { ecam_base_addr = dev_ctx->config->axi_slave_base32 + PCIE_AXI_MMIO32_OFFSET; + } status = axi_outbound_region_setup(dev_ctx->rc_axi_config_apb, (ecam_base_addr - SCP_AP_AXI_OFFSET), __builtin_ctz(AXI_MMIO32_SIZE), @@ -461,12 +473,13 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) FWK_LOG_INFO("[%s] Done", pcie_type[did]); FWK_LOG_INFO("[%s] Setup IO configuration...", pcie_type[did]); - if (dev_ctx->config->ccix_capable) + if (dev_ctx->config->ccix_capable) { ecam_base_addr = dev_ctx->config->axi_slave_base32 + CCIX_AXI_IO_OFFSET; - else + } else { ecam_base_addr = dev_ctx->config->axi_slave_base32 + PCIE_AXI_IO_OFFSET; + } status = axi_outbound_region_setup(dev_ctx->rc_axi_config_apb, (ecam_base_addr - SCP_AP_AXI_OFFSET), __builtin_ctz(AXI_IO_SIZE), @@ -519,17 +532,19 @@ static int n1sdp_pcie_rc_setup(fwk_id_t id) FWK_LOG_INFO("[%s] Skipping ATS capability...", pcie_type[did]); status = pcie_skip_ext_cap(dev_ctx->rp_ep_config_apb, EXT_CAP_ID_ATS); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { FWK_LOG_INFO("[%s] Not found!", pcie_type[did]); - else + } else { FWK_LOG_INFO("[%s] Done", pcie_type[did]); + } FWK_LOG_INFO("[%s] Skipping PRI capability...", pcie_type[did]); status = pcie_skip_ext_cap(dev_ctx->rp_ep_config_apb, EXT_CAP_ID_PRI); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { FWK_LOG_INFO("[%s] Not found!", pcie_type[did]); - else + } else { FWK_LOG_INFO("[%s] Done", pcie_type[did]); + } /* * Wait until devices connected in downstream ports @@ -550,11 +565,13 @@ static int n1sdp_pcie_vc1_setup(fwk_id_t id, uint8_t vc1_tc) int status; dev_ctx = &pcie_ctx.device_ctx_table[fwk_id_get_element_idx(id)]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } - if (!dev_ctx->config->ccix_capable || (vc1_tc > 7) || (vc1_tc == 0)) + if (!dev_ctx->config->ccix_capable || (vc1_tc > 7) || (vc1_tc == 0)) { return FWK_E_PARAM; + } config_base_addr = dev_ctx->rp_ep_config_apb; @@ -608,33 +625,39 @@ static int n1sdp_pcie_setup(fwk_id_t id) int status; dev_ctx = &pcie_ctx.device_ctx_table[fwk_id_get_element_idx(id)]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } /* PCIe controller power ON */ status = n1sdp_pcie_power_on(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* PCIe PHY initialization */ status = n1sdp_pcie_phy_init(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* PCIe controller initialization */ status = n1sdp_pcie_controller_init(id, false); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Link training */ status = n1sdp_pcie_link_training(id, false); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return dev_ctx->config->ccix_capable ? FWK_SUCCESS : status; + } /* Root Complex setup */ status = n1sdp_pcie_rc_setup(id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return FWK_SUCCESS; } @@ -645,8 +668,9 @@ static int n1sdp_pcie_setup(fwk_id_t id) static int n1sdp_pcie_init(fwk_id_t module_id, unsigned int element_count, const void *data) { - if (element_count == 0) + if (element_count == 0) { return FWK_E_DATA; + } pcie_ctx.device_ctx_table = fwk_mm_calloc(element_count, sizeof(pcie_ctx.device_ctx_table[0])); @@ -662,14 +686,16 @@ static int n1sdp_pcie_element_init(fwk_id_t element_id, unsigned int unused, struct n1sdp_pcie_dev_ctx *dev_ctx; struct n1sdp_pcie_dev_config *config; - if (data == NULL) + if (data == NULL) { return FWK_E_PARAM; + } config = (struct n1sdp_pcie_dev_config *)data; dev_ctx = &pcie_ctx.device_ctx_table[fwk_id_get_element_idx(element_id)]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_DATA; + } dev_ctx->config = config; @@ -696,14 +722,16 @@ static int n1sdp_pcie_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(FWK_ID_ELEMENT(FWK_MODULE_IDX_TIMER, 0), FWK_ID_API(FWK_MODULE_IDX_TIMER, MOD_TIMER_API_IDX_TIMER), &pcie_ctx.timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_C2C), FWK_ID_API(FWK_MODULE_IDX_N1SDP_C2C, N1SDP_C2C_API_IDX_SLAVE_INFO), &pcie_ctx.c2c_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; } @@ -722,8 +750,9 @@ static int n1sdp_pcie_start(fwk_id_t id) } dev_ctx = &pcie_ctx.device_ctx_table[fwk_id_get_element_idx(id)]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } return fwk_notification_subscribe( mod_clock_notification_id_state_changed, @@ -755,8 +784,9 @@ static int n1sdp_pcie_process_notification(const struct fwk_event *event, dev_ctx = &pcie_ctx.device_ctx_table[ fwk_id_get_element_idx(event->target_id)]; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return FWK_E_PARAM; + } /* * The CCIX RP should not be initialized by n1sdp_pcie_setup() function @@ -767,8 +797,9 @@ static int n1sdp_pcie_process_notification(const struct fwk_event *event, * then it will be initialized by C2C module in RP mode. */ if (dev_ctx->config->ccix_capable) { - if (pcie_ctx.c2c_api->is_slave_alive() || (n1sdp_get_chipid() != 0)) + if (pcie_ctx.c2c_api->is_slave_alive() || (n1sdp_get_chipid() != 0)) { return FWK_SUCCESS; + } } return n1sdp_pcie_setup(event->target_id); diff --git a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c index a4d40de5459d4a3a917bd0f1dde86018e57d9c5c..d0d7f48d676cc1721ac9014a61b3d08db810df2d 100644 --- a/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c +++ b/product/n1sdp/module/n1sdp_pcie/src/n1sdp_pcie.c @@ -322,8 +322,9 @@ int pcie_init(struct pcie_ctrl_apb_reg *ctrl_apb, PCIE_PHY_PLL_LOCK_TIMEOUT, pcie_wait_condition, &wait_data); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } break; /* PCIe RC reset request */ @@ -343,8 +344,9 @@ int pcie_init(struct pcie_ctrl_apb_reg *ctrl_apb, PCIE_CTRL_RC_RESET_TIMEOUT, pcie_wait_condition, &wait_data); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } break; /* PCIe link training request */ @@ -354,8 +356,9 @@ int pcie_init(struct pcie_ctrl_apb_reg *ctrl_apb, PCIE_LINK_TRAINING_TIMEOUT, pcie_wait_condition, &wait_data); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } break; default: @@ -402,8 +405,9 @@ int axi_outbound_region_setup(uint32_t axi_config_base_addr, volatile uint32_t *ptr; int count; - if (region_count >= AXI_OB_REGIONS_MAX) + if (region_count >= AXI_OB_REGIONS_MAX) { return FWK_E_RANGE; + } memset((void *)&ob_config, 0, sizeof(struct axi_ob_config)); @@ -430,8 +434,9 @@ int axi_outbound_region_setup(uint32_t axi_config_base_addr, ptr = (volatile uint32_t *)&ob_config; - for (count = 0; count < AXI_OB_REGISTER_COUNT; count++) + for (count = 0; count < AXI_OB_REGISTER_COUNT; count++) { region_address[count] = ptr[count]; + } return FWK_SUCCESS; } @@ -443,10 +448,10 @@ int axi_inbound_region_setup(uint32_t axi_config_base_addr, { uint32_t offset; - if ((bar >= AXI_IB_REGIONS_MAX) || - (region_size > AXI_ADDR_NUM_BITS_MAX) || - (__builtin_ctz(axi_base_addr) < AXI_LOW_ADDR_BIT_POS)) + if ((bar >= AXI_IB_REGIONS_MAX) || (region_size > AXI_ADDR_NUM_BITS_MAX) || + (__builtin_ctz(axi_base_addr) < AXI_LOW_ADDR_BIT_POS)) { return FWK_E_PARAM; + } offset = AXI_IB_REGION_REGS_OFFSET + (bar * AXI_IB_REGISTER_SET_SIZE); *(uint32_t *)(axi_config_base_addr + offset) = (uint32_t)axi_base_addr | @@ -460,8 +465,9 @@ int pcie_rp_ep_config_write_word(uint32_t base, uint32_t offset, uint32_t value) { - if ((offset % 4)) + if ((offset % 4)) { return FWK_E_PARAM; + } base |= ROOT_PORT_WRITE_ENABLE; *(volatile uint32_t *)(base + offset) = value; @@ -473,8 +479,9 @@ int pcie_rp_ep_config_read_word(uint32_t base, uint32_t offset, uint32_t *value) { - if ((offset % 4) || (value == NULL)) + if ((offset % 4) || (value == NULL)) { return FWK_E_PARAM; + } *value = *(volatile uint32_t *)(base + offset); @@ -502,10 +509,11 @@ int pcie_set_gen_tx_preset(uint32_t rp_ep_config_apb_base, nibble = (gen == PCIE_GEN_3) ? GEN3_PRESET : GEN4_PRESET; for (i = 0, j = 0; i < 32; i += nibble, j++) { - if (j%2 == 0) + if (j % 2 == 0) { preset_value |= (down_stream_tx_preset << i); - else + } else { preset_value |= (up_stream_tx_preset << i); + } } for (offset = offset_min; offset < offset_max; offset += 0x4) { @@ -514,8 +522,9 @@ int pcie_set_gen_tx_preset(uint32_t rp_ep_config_apb_base, pcie_rp_ep_config_read_word(rp_ep_config_apb_base, offset, ®_value); - if (reg_value != preset_value) + if (reg_value != preset_value) { return FWK_E_DATA; + } } return FWK_SUCCESS; } @@ -554,8 +563,9 @@ int pcie_skip_ext_cap(uint32_t base, uint16_t ext_cap_id) int pcie_vc_setup(uint32_t base, uint8_t vc1_tc) { /* VC1 Traffic class cannot be greater than 7 or equal to 0 */ - if ((vc1_tc > 7) || (vc1_tc == 0)) + if ((vc1_tc > 7) || (vc1_tc == 0)) { return FWK_E_PARAM; + } /* Map all other TCs to VC0 */ *(volatile uint32_t *)(base + PCIE_VC_RESOURCE_CTRL_0_OFFSET) = diff --git a/product/n1sdp/module/n1sdp_pcie/src/pcie_enumeration.c b/product/n1sdp/module/n1sdp_pcie/src/pcie_enumeration.c index 48d5c45523e1f9e5778f619eaa4c274a15d77eb6..6627029360d0263b93422d1524ac0fc34058c994 100644 --- a/product/n1sdp/module/n1sdp_pcie/src/pcie_enumeration.c +++ b/product/n1sdp/module/n1sdp_pcie/src/pcie_enumeration.c @@ -102,12 +102,13 @@ void pcie_init_bdf_table(struct n1sdp_pcie_dev_config *config) struct bdf_table *table; /* Set BDF table pointer based on the root complex */ - if (config->ccix_capable) + if (config->ccix_capable) { table = (struct bdf_table *)(SCP_NONTRUSTED_RAM_BASE + CCIX_BDF_TABLE_OFFSET); - else + } else { table = (struct bdf_table *)(SCP_NONTRUSTED_RAM_BASE + PCIE_BDF_TABLE_OFFSET); + } table->rp_config_base_addr = config->global_config_base - SCP_AP_AXI_OFFSET; @@ -133,8 +134,9 @@ static uint8_t pcie_bus_scan(uint32_t ecam_addr, * config space of device 0 for all other device numbers on bus 1 */ if (((pri_bnum == PCIE_PRIMARY_BUS_NUM_START) && (dev_num != 0)) || - ((pri_bnum == CCIX_PRIMARY_BUS_NUM_START) && (dev_num != 0))) + ((pri_bnum == CCIX_PRIMARY_BUS_NUM_START) && (dev_num != 0))) { break; + } /* Loop over all functions on dev_num device */ for (fn_num = 0; fn_num < FUNCTIONS_PER_DEVICE_MAX; fn_num++) { bdf_addr = (pri_bnum << BDF_ADDR_SHIFT_BUS) | @@ -156,10 +158,11 @@ static uint8_t pcie_bus_scan(uint32_t ecam_addr, /* If function 0 of any device has invalid VID break the loop */ if ((vid & 0xFFFF) == 0xFFFF) { - if (fn_num == 0) + if (fn_num == 0) { break; - else + } else { continue; + } } /* @@ -215,12 +218,13 @@ void pcie_bus_enumeration(struct n1sdp_pcie_dev_config *config) struct bdf_table *table; /* Set BDF table pointer based on the root complex */ - if (config->ccix_capable) + if (config->ccix_capable) { table = (struct bdf_table *)(SCP_NONTRUSTED_RAM_BASE + CCIX_BDF_TABLE_OFFSET); - else + } else { table = (struct bdf_table *)(SCP_NONTRUSTED_RAM_BASE + PCIE_BDF_TABLE_OFFSET); + } pcie_init_bdf_table(config); @@ -322,8 +326,9 @@ FWK_NOINLINE /* only one location where the checked load happen */ : "=r"(err), "=r"(dst) : "r"(src) : "r0"); - if (err == CHECKED_READ_U32__ERROR_VALUE) + if (err == CHECKED_READ_U32__ERROR_VALUE) { return false; + } *value = dst; return true; } @@ -357,7 +362,9 @@ void arch_exception_invalid(void) : "=r"(context)); const int exception = *ICSR & ICSR_VECTACTIVE; - if (!exception_handler(exception, context)) - while (true) + if (!exception_handler(exception, context)) { + while (true) { __WFI(); -} + } + } +} \ No newline at end of file diff --git a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c index b88ff698b0e54fc16a8216c66a3011421ad06f91..1c02e1f46f18d91cd420b45f9fd999db6585362c 100644 --- a/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c +++ b/product/n1sdp/module/n1sdp_pll/src/mod_n1sdp_pll.c @@ -72,11 +72,13 @@ static int pll_set_rate(struct n1sdp_pll_dev_ctx *ctx, uint64_t rate, config = ctx->config; - if (ctx->current_state == MOD_CLOCK_STATE_STOPPED) + if (ctx->current_state == MOD_CLOCK_STATE_STOPPED) { return FWK_E_PWRSTATE; + } - if ((rate < MOD_N1SDP_PLL_RATE_MIN) || (rate > MOD_N1SDP_PLL_RATE_MAX)) + if ((rate < MOD_N1SDP_PLL_RATE_MIN) || (rate > MOD_N1SDP_PLL_RATE_MAX)) { return FWK_E_RANGE; + } /* Assume initial refdiv and postdiv to be 1 */ refdiv = MOD_N1SDP_PLL_REFDIV_MIN; @@ -118,8 +120,9 @@ result: while ((*config->control_reg1 & (UINT32_C(1) << PLL_LOCK_STATUS_POS)) == 0) { wait_cycles--; - if (wait_cycles == 0) + if (wait_cycles == 0) { return FWK_E_TIMEOUT; + } } /* Store the current configured PLL rate */ @@ -137,8 +140,9 @@ static int n1sdp_pll_set_rate(fwk_id_t dev_id, uint64_t rate, { struct n1sdp_pll_dev_ctx *ctx = NULL; - if (!fwk_module_is_valid_element_id(dev_id)) + if (!fwk_module_is_valid_element_id(dev_id)) { return FWK_E_PARAM; + } ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); @@ -149,8 +153,9 @@ static int n1sdp_pll_get_rate(fwk_id_t dev_id, uint64_t *rate) { struct n1sdp_pll_dev_ctx *ctx = NULL; - if ((!fwk_module_is_valid_element_id(dev_id)) || (rate == NULL)) + if ((!fwk_module_is_valid_element_id(dev_id)) || (rate == NULL)) { return FWK_E_PARAM; + } ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); *rate = ctx->current_rate; @@ -168,8 +173,9 @@ static int n1sdp_pll_get_rate_from_index(fwk_id_t dev_id, static int n1sdp_pll_set_state(fwk_id_t dev_id, enum mod_clock_state state) { - if (state == MOD_CLOCK_STATE_RUNNING) + if (state == MOD_CLOCK_STATE_RUNNING) { return FWK_SUCCESS; + } /* PLLs can only be stopped by a parent power domain state change. */ return FWK_E_SUPPORT; @@ -179,8 +185,9 @@ static int n1sdp_pll_get_state(fwk_id_t dev_id, enum mod_clock_state *state) { struct n1sdp_pll_dev_ctx *ctx = NULL; - if ((!fwk_module_is_valid_element_id(dev_id)) || (state == NULL)) + if ((!fwk_module_is_valid_element_id(dev_id)) || (state == NULL)) { return FWK_E_PARAM; + } ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); *state = ctx->current_state; @@ -190,8 +197,9 @@ static int n1sdp_pll_get_state(fwk_id_t dev_id, enum mod_clock_state *state) static int n1sdp_pll_get_range(fwk_id_t dev_id, struct mod_clock_range *range) { - if ((!fwk_module_is_valid_element_id(dev_id)) || (range == NULL)) + if ((!fwk_module_is_valid_element_id(dev_id)) || (range == NULL)) { return FWK_E_PARAM; + } range->rate_type = MOD_CLOCK_RATE_TYPE_CONTINUOUS; range->min = MOD_N1SDP_PLL_RATE_MIN; @@ -206,13 +214,15 @@ static int n1sdp_pll_power_state_change(fwk_id_t dev_id, unsigned int state) uint64_t rate; struct n1sdp_pll_dev_ctx *ctx = NULL; - if (!fwk_module_is_valid_element_id(dev_id)) + if (!fwk_module_is_valid_element_id(dev_id)) { return FWK_E_PARAM; + } ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); - if (state != MOD_PD_STATE_ON) + if (state != MOD_PD_STATE_ON) { return FWK_SUCCESS; + } ctx->current_state = MOD_CLOCK_STATE_RUNNING; @@ -235,14 +245,16 @@ static int n1sdp_pll_power_state_pending_change( { struct n1sdp_pll_dev_ctx *ctx = NULL; - if (!fwk_module_is_valid_element_id(dev_id)) + if (!fwk_module_is_valid_element_id(dev_id)) { return FWK_E_PARAM; + } ctx = module_ctx.dev_ctx_table + fwk_id_get_element_idx(dev_id); - if (next_state == MOD_PD_STATE_OFF) + if (next_state == MOD_PD_STATE_OFF) { /* Just mark the PLL as stopped */ ctx->current_state = MOD_CLOCK_STATE_STOPPED; + } return FWK_SUCCESS; } @@ -268,8 +280,9 @@ static int n1sdp_pll_init(fwk_id_t module_id, unsigned int element_count, size_t i; struct n1sdp_pll_custom_freq_param_entry *freq_entry; - if ((element_count == 0) || (config == NULL)) + if ((element_count == 0) || (config == NULL)) { return FWK_E_PARAM; + } module_ctx.dev_count = element_count; @@ -285,8 +298,9 @@ static int n1sdp_pll_init(fwk_id_t module_id, unsigned int element_count, (freq_entry->refdiv < MOD_N1SDP_PLL_REFDIV_MIN) || (freq_entry->refdiv > MOD_N1SDP_PLL_REFDIV_MAX) || (freq_entry->postdiv < MOD_N1SDP_PLL_POSTDIV_MIN) || - (freq_entry->postdiv > MOD_N1SDP_PLL_POSTDIV_MAX)) + (freq_entry->postdiv > MOD_N1SDP_PLL_POSTDIV_MAX)) { return FWK_E_RANGE; + } } return FWK_SUCCESS; @@ -303,12 +317,13 @@ static int n1sdp_pll_element_init(fwk_id_t element_id, unsigned int unused, /* Check for valid element configuration data */ if ((ctx->config->control_reg0 == NULL) || - (ctx->config->control_reg1 == NULL) || - (ctx->config->ref_rate == 0)) + (ctx->config->control_reg1 == NULL) || (ctx->config->ref_rate == 0)) { return FWK_E_PARAM; + } - if (ctx->config->defer_initialization) + if (ctx->config->defer_initialization) { return FWK_SUCCESS; + } ctx->initialized = true; ctx->current_state = MOD_CLOCK_STATE_RUNNING; diff --git a/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c b/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c index f11e74f5a5c97f4ee20f4527edca01a2fb3307ca..6b39902fcb9158401d4fee37bb087b130add282f 100644 --- a/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c +++ b/product/n1sdp/module/n1sdp_remote_pd/src/mod_n1sdp_remote_pd.c @@ -104,8 +104,9 @@ static int remote_pd_set_state(fwk_id_t pd_id, unsigned int state) status = remote_pd_ctx.c2c_pd_api->set_state( N1SDP_C2C_CMD_POWER_DOMAIN_OFF, (uint8_t)element_id, (uint8_t)dev_ctx->config->pd_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = dev_ctx->pd_driver_input_api->report_power_state_transition( dev_ctx->bound_id, MOD_PD_STATE_OFF); @@ -116,8 +117,9 @@ static int remote_pd_set_state(fwk_id_t pd_id, unsigned int state) status = remote_pd_ctx.c2c_pd_api->set_state( N1SDP_C2C_CMD_POWER_DOMAIN_ON, (uint8_t)element_id, (uint8_t)dev_ctx->config->pd_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = dev_ctx->pd_driver_input_api->report_power_state_transition( dev_ctx->bound_id, MOD_PD_STATE_ON); @@ -138,8 +140,9 @@ static int remote_pd_reset(fwk_id_t pd_id) int status; status = remote_pd_set_state(pd_id, MOD_PD_STATE_OFF); - if (status == FWK_SUCCESS) + if (status == FWK_SUCCESS) { status = remote_pd_set_state(pd_id, MOD_PD_STATE_ON); + } return status; } @@ -171,11 +174,13 @@ static const struct mod_pd_driver_api remote_pd_driver = { static int remote_pd_init(fwk_id_t module_id, unsigned int device_count, const void *unused) { - if (!n1sdp_is_multichip_enabled() || (n1sdp_get_chipid() != 0x0)) + if (!n1sdp_is_multichip_enabled() || (n1sdp_get_chipid() != 0x0)) { return FWK_SUCCESS; + } - if (device_count == 0) + if (device_count == 0) { return FWK_E_PARAM; + } remote_pd_ctx.dev_ctx_table = fwk_mm_calloc(device_count, sizeof(remote_pd_ctx.dev_ctx_table[0])); @@ -192,8 +197,9 @@ static int remote_pd_element_init(fwk_id_t device_id, unsigned int slot_count, (struct mod_n1sdp_remote_pd_config *)data; struct n1sdp_remote_pd_device_ctx *dev_ctx; - if (!n1sdp_is_multichip_enabled() || (n1sdp_get_chipid() != 0x0)) + if (!n1sdp_is_multichip_enabled() || (n1sdp_get_chipid() != 0x0)) { return FWK_SUCCESS; + } dev_ctx = &remote_pd_ctx.dev_ctx_table[fwk_id_get_element_idx(device_id)]; dev_ctx->config = config; @@ -206,16 +212,18 @@ static int remote_pd_bind(fwk_id_t id, unsigned int round) int status; struct n1sdp_remote_pd_device_ctx *dev_ctx; - if (!n1sdp_is_multichip_enabled() || (n1sdp_get_chipid() != 0x0)) + if (!n1sdp_is_multichip_enabled() || (n1sdp_get_chipid() != 0x0)) { return FWK_SUCCESS; + } if ((round == 0) && fwk_id_is_type(id, FWK_ID_TYPE_MODULE)) { status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_C2C), FWK_ID_API(FWK_MODULE_IDX_N1SDP_C2C, N1SDP_C2C_API_IDX_PD), &remote_pd_ctx.c2c_pd_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } if ((round == 1) && fwk_id_is_type(id, FWK_ID_TYPE_ELEMENT)) { @@ -223,8 +231,9 @@ static int remote_pd_bind(fwk_id_t id, unsigned int round) status = fwk_module_bind(dev_ctx->bound_id, mod_pd_api_id_driver_input, &dev_ctx->pd_driver_input_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -237,11 +246,13 @@ static int remote_pd_process_bind_request(fwk_id_t source_id, { struct n1sdp_remote_pd_device_ctx *dev_ctx; - if (!n1sdp_is_multichip_enabled() || (n1sdp_get_chipid() != 0x0)) + if (!n1sdp_is_multichip_enabled() || (n1sdp_get_chipid() != 0x0)) { return FWK_E_ACCESS; + } - if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) + if (!fwk_id_is_type(target_id, FWK_ID_TYPE_ELEMENT)) { return FWK_E_ACCESS; + } dev_ctx = &remote_pd_ctx.dev_ctx_table[fwk_id_get_element_idx(target_id)]; diff --git a/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c b/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c index 51c2e304c434fb574578b3307a0c3f06982cf314..26c1bd94fc477a9fe01f069bd0fb6222ec5f0efd 100644 --- a/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c +++ b/product/n1sdp/module/n1sdp_scp2pcc/src/mod_n1sdp_scp2pcc.c @@ -41,8 +41,9 @@ static void wrdmemcpy(void *destination, const void *source, unsigned int num) { unsigned int index; - for (index = 0; index < num; index++) + for (index = 0; index < num; index++) { ((unsigned int *)destination)[index] = ((unsigned int *)source)[index]; + } } static void reset_shared_memory(void) @@ -72,8 +73,9 @@ static int mem_msg_send_message(void *data, uint16_t size, uint16_t type) unsigned int index; struct mem_msg_packet_st *packet = NULL; - if (type == SCP2PCC_TYPE_SHUTDOWN) + if (type == SCP2PCC_TYPE_SHUTDOWN) { FWK_LOG_INFO("Shutdown request to PCC"); + } /* Check parameters. */ if ((size > MSG_PAYLOAD_SIZE) || @@ -87,8 +89,9 @@ static int mem_msg_send_message(void *data, uint16_t size, uint16_t type) /* Attempt to set alive value and try again. */ *(scp2pcc_ctx.config->shared_alive_address) = MSG_ALIVE_VALUE; - if (*(scp2pcc_ctx.config->shared_alive_address) != MSG_ALIVE_VALUE) + if (*(scp2pcc_ctx.config->shared_alive_address) != MSG_ALIVE_VALUE) { return FWK_E_STATE; + } /* If successful, reset shared memory. */ reset_shared_memory(); @@ -103,8 +106,9 @@ static int mem_msg_send_message(void *data, uint16_t size, uint16_t type) if (packet->type == MSG_UNUSED_MESSAGE_TYPE) { /* Unused packet found, copy data payload. */ - if (data != NULL) + if (data != NULL) { wrdmemcpy((void *)&packet->payload, data, (size / 4)); + } /* Set size. */ wrdmemset((void *)&packet->size, size); @@ -131,8 +135,9 @@ static const struct mod_n1sdp_scp2pcc_api n1sdp_scp2pcc_api = { static int n1sdp_scp2pcc_init(fwk_id_t module_id, unsigned int unused, const void *data) { - if (data == NULL) + if (data == NULL) { return FWK_E_PARAM; + } scp2pcc_ctx.config = (struct mem_msg_config_st *)data; diff --git a/product/n1sdp/module/n1sdp_sensor/src/mod_n1sdp_sensor.c b/product/n1sdp/module/n1sdp_sensor/src/mod_n1sdp_sensor.c index dee4810e5181a2132531cdf6ac4768fb810b1e93..413242fc371c021f0b0ca9cc1f93a9cdf021c26d 100644 --- a/product/n1sdp/module/n1sdp_sensor/src/mod_n1sdp_sensor.c +++ b/product/n1sdp/module/n1sdp_sensor/src/mod_n1sdp_sensor.c @@ -58,8 +58,9 @@ static void n1sdp_sensor_timer_callback(uintptr_t unused) t_dev_ctx->sensor_data_buffer[t_dev_ctx->buf_index++] = value; - if (t_dev_ctx->buf_index == PVT_HISTORY_LEN) + if (t_dev_ctx->buf_index == PVT_HISTORY_LEN) { t_dev_ctx->buf_index = 0; + } } } /* Start new sample. */ @@ -74,8 +75,9 @@ static void n1sdp_sensor_timer_callback(uintptr_t unused) v_dev_ctx->sensor_data_buffer[v_dev_ctx->buf_index++] = value; - if (v_dev_ctx->buf_index == PVT_HISTORY_LEN) + if (v_dev_ctx->buf_index == PVT_HISTORY_LEN) { v_dev_ctx->buf_index = 0; + } } } /* Start new sample. */ @@ -98,14 +100,16 @@ static int get_value(fwk_id_t element_id, uint64_t *value) if (id < t_sensor_count) { t_dev_ctx = &sensor_ctx.t_dev_ctx_table[id]; - if (t_dev_ctx == NULL) + if (t_dev_ctx == NULL) { return FWK_E_DATA; + } buf_value = t_dev_ctx->sensor_data_buffer[t_dev_ctx->buf_index]; } else { v_dev_ctx = &sensor_ctx.v_dev_ctx_table[id - t_sensor_count]; - if (v_dev_ctx == NULL) + if (v_dev_ctx == NULL) { return FWK_E_DATA; + } buf_value = v_dev_ctx->sensor_data_buffer[v_dev_ctx->buf_index]; } @@ -128,8 +132,9 @@ static int n1sdp_sensor_init( { fwk_assert(data != NULL); - if (element_count == 0) + if (element_count == 0) { return FWK_E_DATA; + } sensor_ctx.module_config = (struct mod_n1sdp_sensor_config *)data; @@ -137,15 +142,17 @@ static int n1sdp_sensor_init( sensor_ctx.module_config->t_sensor_count, sizeof(sensor_ctx.t_dev_ctx_table[0])); - if (sensor_ctx.t_dev_ctx_table == NULL) + if (sensor_ctx.t_dev_ctx_table == NULL) { return FWK_E_NOMEM; + } sensor_ctx.v_dev_ctx_table = fwk_mm_calloc( sensor_ctx.module_config->v_sensor_count, sizeof(sensor_ctx.v_dev_ctx_table[0])); - if (sensor_ctx.v_dev_ctx_table == NULL) + if (sensor_ctx.v_dev_ctx_table == NULL) { return FWK_E_NOMEM; + } return FWK_SUCCESS; } @@ -170,30 +177,34 @@ static int n1sdp_sensor_element_init( t_config = (struct mod_n1sdp_temp_sensor_config *)data; t_dev_ctx = &sensor_ctx.t_dev_ctx_table[id]; - if (t_dev_ctx == NULL) + if (t_dev_ctx == NULL) { return FWK_E_DATA; + } t_dev_ctx->config = t_config; t_dev_ctx->sensor_data_buffer = fwk_mm_calloc(PVT_HISTORY_LEN, sizeof(int32_t)); - if (t_dev_ctx->sensor_data_buffer == NULL) + if (t_dev_ctx->sensor_data_buffer == NULL) { return FWK_E_NOMEM; + } t_dev_ctx->buf_index = 0; } else { v_config = (struct mod_n1sdp_volt_sensor_config *)data; v_dev_ctx = &sensor_ctx.v_dev_ctx_table[id - t_sensor_count]; - if (v_dev_ctx == NULL) + if (v_dev_ctx == NULL) { return FWK_E_DATA; + } v_dev_ctx->config = v_config; v_dev_ctx->sensor_data_buffer = fwk_mm_calloc(PVT_HISTORY_LEN, sizeof(int32_t)); - if (v_dev_ctx->sensor_data_buffer == NULL) + if (v_dev_ctx->sensor_data_buffer == NULL) { return FWK_E_NOMEM; + } v_dev_ctx->buf_index = 0; } @@ -212,15 +223,17 @@ static int n1sdp_sensor_bind(fwk_id_t id, unsigned int round) sensor_ctx.module_config->alarm_api, &sensor_ctx.timer_alarm_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_SCP2PCC), FWK_ID_API(FWK_MODULE_IDX_N1SDP_SCP2PCC, 0), &sensor_ctx.scp2pcc_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } } return FWK_SUCCESS; @@ -253,8 +266,9 @@ static int n1sdp_sensor_start(fwk_id_t id) &n1sdp_sensor_timer_callback, 0); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } FWK_LOG_INFO( "[PVT] Started driver version %d.%d\n", diff --git a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c index 70e2ec3fb09e11c25c5345dde150a20387557f62..5edd4b8f2eca3dbfe3765315751bd9c917deca31 100644 --- a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c +++ b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c @@ -169,8 +169,9 @@ static void ppu_cores_isr(void) core_idx = __builtin_ctz(status); status &= ~(1 << core_idx); - if (core_idx >= n1sdp_core_get_core_count()) + if (core_idx >= n1sdp_core_get_core_count()) { continue; + } n1sdp_system_ctx.ppu_v1_isr_api->ppu_interrupt_handler( FWK_ID_ELEMENT(FWK_MODULE_IDX_PPU_V1, core_idx)); @@ -426,20 +427,23 @@ static int n1sdp_system_init_primary_core(void) status = n1sdp_system_copy_to_ap_sram( AP_CORE_RESET_ADDR, entry.base, entry.size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return FWK_E_PANIC; + } /* Fill BL33 image information structure */ FWK_LOG_INFO("[N1SDP SYSTEM] Filling BL33 information..."); status = n1sdp_system_fill_bl33_info(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Fill Platform information structure */ FWK_LOG_INFO("[N1SDP SYSTEM] Collecting Platform information..."); status = n1sdp_system_fill_platform_info(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Enable non-secure CoreSight debug access */ FWK_LOG_INFO( @@ -462,8 +466,9 @@ static int n1sdp_system_init_primary_core(void) MOD_PD_STATE_ON, MOD_PD_STATE_ON, MOD_PD_STATE_ON)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -496,8 +501,9 @@ static int n1sdp_system_mod_init(fwk_id_t module_id, unsigned int unused, for (idx = 0; idx < FWK_ARRAY_SIZE(isrs); idx++) { isr = &isrs[idx]; status = fwk_interrupt_set_isr(isr->interrupt, isr->handler); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -507,51 +513,59 @@ static int n1sdp_system_bind(fwk_id_t id, unsigned int round) { int status; - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_FIP), FWK_ID_API(FWK_MODULE_IDX_FIP, 0), &n1sdp_system_ctx.fip_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_DMC620), FWK_ID_API(FWK_MODULE_IDX_N1SDP_DMC620, MOD_DMC620_API_IDX_MEM_INFO), &n1sdp_system_ctx.dmc620_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_POWER_DOMAIN), FWK_ID_API(FWK_MODULE_IDX_POWER_DOMAIN, MOD_PD_API_IDX_RESTRICTED), &n1sdp_system_ctx.mod_pd_restricted_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_PPU_V1), FWK_ID_API(FWK_MODULE_IDX_PPU_V1, MOD_PPU_V1_API_IDX_ISR), &n1sdp_system_ctx.ppu_v1_isr_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_C2C), FWK_ID_API(FWK_MODULE_IDX_N1SDP_C2C, N1SDP_C2C_API_IDX_SLAVE_INFO), &n1sdp_system_ctx.c2c_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_C2C), FWK_ID_API(FWK_MODULE_IDX_N1SDP_C2C, N1SDP_C2C_API_IDX_PD), &n1sdp_system_ctx.c2c_pd_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_N1SDP_SCP2PCC), FWK_ID_API(FWK_MODULE_IDX_N1SDP_SCP2PCC, 0), &n1sdp_system_ctx.scp2pcc_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_module_bind(fwk_module_id_sds, FWK_ID_API(FWK_MODULE_IDX_SDS, 0), @@ -585,8 +599,9 @@ static int n1sdp_system_start(fwk_id_t id) mod_clock_notification_id_state_changed, FWK_ID_ELEMENT(FWK_MODULE_IDX_CLOCK, CLOCK_IDX_INTERCONNECT), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_interrupt_set_isr(CDBG_PWR_UP_REQ_IRQ, cdbg_pwrupreq_handler); if (status == FWK_SUCCESS) { @@ -604,10 +619,12 @@ static int n1sdp_system_start(fwk_id_t id) CS_CNTCONTROL->CS_CNTCR |= (1 << 0); CS_CNTCONTROL->CS_CNTCVLW = 0x00000000; CS_CNTCONTROL->CS_CNTCVUP = 0x0000FFFF; - } else + } else { FWK_LOG_ERR("[N1SDP SYSTEM] CSYS PWR UP REQ IRQ register failed"); - } else + } + } else { FWK_LOG_ERR("[N1SDP SYSTEM] CDBG PWR UP REQ IRQ register failed"); + } FWK_LOG_INFO("[N1SDP SYSTEM] Requesting SYSTOP initialization..."); @@ -623,8 +640,9 @@ static int n1sdp_system_start(fwk_id_t id) fwk_id_build_element_id(fwk_module_id_scmi, scmi_notification_table[i]), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* @@ -635,8 +653,9 @@ static int n1sdp_system_start(fwk_id_t id) mod_sds_notification_id_initialized, fwk_module_id_sds, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } if (n1sdp_is_multichip_enabled() && (n1sdp_get_chipid() == 0x0)) { composite_state = MOD_PD_COMPOSITE_STATE(MOD_PD_LEVEL_3, @@ -676,8 +695,9 @@ static int n1sdp_system_process_notification(const struct fwk_event *event, */ if (params->new_state == MOD_CLOCK_STATE_RUNNING) { status = n1sdp_system_init_primary_core(); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* * Unsubscribe to interconnect clock state change notification as @@ -694,8 +714,9 @@ static int n1sdp_system_process_notification(const struct fwk_event *event, } else if (fwk_id_is_equal(event->id, mod_sds_notification_id_initialized)) { sds_notification_received = true; - } else + } else { return FWK_E_PARAM; + } if ((scmi_notification_count == FWK_ARRAY_SIZE(scmi_notification_table)) && sds_notification_received) { diff --git a/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c b/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c index 43da95d1c46d239944e9db72129f8d337b1ca8a0..fc50a2374ae9e5a29087347ba3ad5d14f05d46a9 100644 --- a/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c +++ b/product/n1sdp/module/n1sdp_timer_sync/src/mod_n1sdp_timer_sync.c @@ -73,16 +73,18 @@ static void timer_sync_isr(uintptr_t data) uint32_t timeout; dev_ctx = (struct tsync_device_ctx *)data; - if (dev_ctx == NULL) + if (dev_ctx == NULL) { return; + } timeout = INT_STATUS_TIMEOUT; while (dev_ctx->reg->SLVCHIP_GCNT_INT_STATUS & SLVCHIP_GCNT_INT_STATUS_INT_MASK) { dev_ctx->reg->SLVCHIP_GCNT_INT_CLR = SLVCHIP_GCNT_INT_CLR_MASK; timeout--; - if (timeout == 0) + if (timeout == 0) { return; + } } dev_ctx->reg->SLVCHIP_GCNT_SYNC_CTRL = 0; dev_ctx->reg->SLVCHIP_GCNT_SYNC_CTRL = SLV_GCNT_SYNC_CTRL_EN_MASK; @@ -129,19 +131,22 @@ static int n1sdp_sync_master_timer(fwk_id_t id) retries = SYNC_RETRIES; do { - if (is_timer_synced(device_ctx)) + if (is_timer_synced(device_ctx)) { break; + } tsync_ctx.timer_api->delay(FWK_ID_ELEMENT(FWK_MODULE_IDX_TIMER, 0), SYNC_CHECK_INTERVAL_US); retries--; - if ((retries % 10) == 0) + if ((retries % 10) == 0) { FWK_LOG_INFO("[N1SDP_TIMER_SYNC] Retries: %u", retries); + } } while (retries != 0); - if ((retries == 0) && (!is_timer_synced(device_ctx))) + if ((retries == 0) && (!is_timer_synced(device_ctx))) { FWK_LOG_INFO("[N1SDP_TIMER_SYNC] Timeout!"); - else + } else { FWK_LOG_INFO("[N1SDP_TIMER_SYNC] Synced"); + } return FWK_SUCCESS; } @@ -181,8 +186,9 @@ const struct n1sdp_timer_sync_api n1sdp_tsync_api = { static int n1sdp_timer_sync_init(fwk_id_t module_id, unsigned int device_count, const void *unused) { - if (device_count == 0) + if (device_count == 0) { return FWK_E_PARAM; + } tsync_ctx.device_ctx_table = fwk_mm_calloc(device_count, sizeof(tsync_ctx.device_ctx_table[0])); @@ -197,8 +203,9 @@ static int n1sdp_timer_sync_device_init(fwk_id_t device_id, (struct mod_n1sdp_tsync_config *)data; struct tsync_device_ctx *device_ctx; - if (config->reg == 0) + if (config->reg == 0) { return FWK_E_PARAM; + } device_ctx = &tsync_ctx.device_ctx_table[ fwk_id_get_element_idx(device_id)]; @@ -222,14 +229,16 @@ static int n1sdp_timer_sync_bind(fwk_id_t id, unsigned int round) FWK_ID_API(FWK_MODULE_IDX_N1SDP_SYSTEM, MOD_N1SDP_SYSTEM_API_IDX_AP_MEMORY_ACCESS), &tsync_ctx.ap_mem_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_ELEMENT(FWK_MODULE_IDX_TIMER, 0), FWK_ID_API(FWK_MODULE_IDX_TIMER, MOD_TIMER_API_IDX_TIMER), &tsync_ctx.timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; diff --git a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c index 9b47ae507c70dbf0ed89dfe8717a28744503bfb2..5428509df1458b8986e53d53be617f42e0d9bddb 100644 --- a/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c +++ b/product/n1sdp/module/scmi_ccix_config/src/mod_scmi_ccix_config.c @@ -124,8 +124,9 @@ static int scmi_ccix_config_protocol_msg_attributes_handler(fwk_id_t service_id, /* All commands have an attributes value of 0 */ .attributes = 0, }; - } else + } else { return_values.status = SCMI_NOT_FOUND; + } scmi_ccix_config_ctx.scmi_api->respond(service_id, &return_values, (return_values.status == SCMI_SUCCESS) ? @@ -148,13 +149,15 @@ static int scmi_ccix_config_protocol_get_handler(fwk_id_t service_id, return_values.status = SCMI_SUCCESS; status = scmi_ccix_config_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_ccix_config_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* Only the OSPM agent allowed */ if (agent_type != SCMI_AGENT_TYPE_OSPM) { @@ -165,8 +168,9 @@ static int scmi_ccix_config_protocol_get_handler(fwk_id_t service_id, status = scmi_ccix_config_ctx.scmi_api->get_max_payload_size(service_id, &max_payload_size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (sizeof(return_values) > max_payload_size) { return_values.status = SCMI_OUT_OF_RANGE; @@ -236,13 +240,15 @@ static int scmi_ccix_config_protocol_set_handler(fwk_id_t service_id, params = (const struct scmi_ccix_config_protocol_set_a2p *)payload; status = scmi_ccix_config_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_ccix_config_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* Only the OSPM agent allowed */ if (agent_type != SCMI_AGENT_TYPE_OSPM) { @@ -253,8 +259,9 @@ static int scmi_ccix_config_protocol_set_handler(fwk_id_t service_id, status = scmi_ccix_config_ctx.scmi_api->get_max_payload_size(service_id, &max_payload_size); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } if (sizeof(*params) > max_payload_size) { return_values.status = SCMI_OUT_OF_RANGE; @@ -410,8 +417,9 @@ static int scmi_ccix_config_bind(fwk_id_t id, unsigned int round) { int status; - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), FWK_ID_API(FWK_MODULE_IDX_SCMI, MOD_SCMI_API_IDX_PROTOCOL), @@ -448,8 +456,9 @@ static int scmi_ccix_config_process_bind_request(fwk_id_t source_id, fwk_id_t api_id, const void **api) { - if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) + if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) { return FWK_E_ACCESS; + } *api = &scmi_ccix_config_protocol_api; diff --git a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c index fecabf4819dd625ed48d9851de4c4019d93eda13..180187e0b64587261930997d4f951aaf8990cb4b 100644 --- a/product/n1sdp/module/scmi_management/src/mod_scmi_management.c +++ b/product/n1sdp/module/scmi_management/src/mod_scmi_management.c @@ -120,8 +120,9 @@ static int scmi_management_protocol_message_attributes_handler( message_id = parameters->message_id; if ((message_id >= FWK_ARRAY_SIZE(handler_table)) || - (handler_table[message_id] == NULL)) + (handler_table[message_id] == NULL)) { return_values.status = SCMI_NOT_FOUND; + } response_size = (return_values.status == SCMI_SUCCESS) ? sizeof(return_values) : sizeof(return_values.status); @@ -146,13 +147,15 @@ static int scmi_management_clock_status_get_handler(fwk_id_t service_id, }; status = scmi_management_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_management_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* Only the Management agent may get the clock status */ if (agent_type != SCMI_AGENT_TYPE_MANAGEMENT) { @@ -185,13 +188,15 @@ static int scmi_management_chipid_info_get_handler(fwk_id_t service_id, }; status = scmi_management_ctx.scmi_api->get_agent_id(service_id, &agent_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } status = scmi_management_ctx.scmi_api->get_agent_type(agent_id, &agent_type); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { goto exit; + } /* Only the Management agent may get the CHIP ID information */ if (agent_type != SCMI_AGENT_TYPE_MANAGEMENT) { @@ -279,8 +284,9 @@ static int scmi_management_init(fwk_id_t module_id, unsigned int unused, static int scmi_management_bind(fwk_id_t id, unsigned int round) { - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } /* Bind to the SCMI module, storing an API pointer for later use. */ return fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SCMI), @@ -292,8 +298,9 @@ static int scmi_management_process_bind_request(fwk_id_t source_id, fwk_id_t target_id, fwk_id_t api_id, const void **api) { /* Only accept binding requests from the SCMI module. */ - if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) + if (!fwk_id_is_equal(source_id, FWK_ID_MODULE(FWK_MODULE_IDX_SCMI))) { return FWK_E_ACCESS; + } *api = &scmi_management_mod_scmi_to_protocol_api; diff --git a/product/n1sdp/scp_ramfw/config_power_domain.c b/product/n1sdp/scp_ramfw/config_power_domain.c index 8e3fbe8894c47f240a86cb51b3a6a58773292bf1..eaa70104c88a8f14b95dcddfaf4713883cdb7164 100644 --- a/product/n1sdp/scp_ramfw/config_power_domain.c +++ b/product/n1sdp/scp_ramfw/config_power_domain.c @@ -474,10 +474,11 @@ static struct fwk_element n1sdp_pd_multi_chip_element_table[] = { static const struct fwk_element *n1sdp_power_domain_get_element_table (fwk_id_t module_id) { - if (n1sdp_is_multichip_enabled() && (n1sdp_get_chipid() == 0x0)) + if (n1sdp_is_multichip_enabled() && (n1sdp_get_chipid() == 0x0)) { return n1sdp_pd_multi_chip_element_table; - else + } else { return n1sdp_pd_single_chip_element_table; + } } /* diff --git a/product/n1sdp/scp_ramfw/rtx_config.c b/product/n1sdp/scp_ramfw/rtx_config.c index 08c4a58b60b2b48b82bbfda51124af4cc8c2b42d..18024a993c75f577c842bd20b0069d3f7228c84b 100644 --- a/product/n1sdp/scp_ramfw/rtx_config.c +++ b/product/n1sdp/scp_ramfw/rtx_config.c @@ -27,8 +27,9 @@ uint32_t SystemCoreClock = CLOCK_RATE_REFCLK; */ __NO_RETURN void osRtxIdleThread(void *argument) { - while (true) + while (true) { __WFI(); + } } /* diff --git a/product/rdn2/module/platform_system/src/mod_platform_system.c b/product/rdn2/module/platform_system/src/mod_platform_system.c index 71ed577e9cdd1ee1cdbdb3f027262e376025fb29..56d88119e219b9a5f71801b73dd5168b23922dd0 100644 --- a/product/rdn2/module/platform_system/src/mod_platform_system.c +++ b/product/rdn2/module/platform_system/src/mod_platform_system.c @@ -110,8 +110,9 @@ static void ppu_cores_isr(unsigned int first, uint32_t status) core_idx = __builtin_ctz(status); status &= ~(1 << core_idx); - if ((first + core_idx) >= platform_get_core_count()) + if ((first + core_idx) >= platform_get_core_count()) { continue; + } platform_system_ctx.ppu_v1_isr_api->ppu_interrupt_handler( FWK_ID_ELEMENT(FWK_MODULE_IDX_PPU_V1, first + core_idx)); @@ -199,8 +200,9 @@ static int platform_system_mod_init( for (idx = 0; idx < FWK_ARRAY_SIZE(isrs); idx++) { isr = &isrs[idx]; status = fwk_interrupt_set_isr(isr->interrupt, isr->handler); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } platform_system_ctx.pik_scp_reg = (struct pik_scp_reg *)SCP_PIK_SCP_BASE; @@ -212,29 +214,33 @@ static int platform_system_bind(fwk_id_t id, unsigned int round) { int status; - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_POWER_DOMAIN), FWK_ID_API(FWK_MODULE_IDX_POWER_DOMAIN, MOD_PD_API_IDX_RESTRICTED), &platform_system_ctx.mod_pd_restricted_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_PPU_V1), FWK_ID_API(FWK_MODULE_IDX_PPU_V1, MOD_PPU_V1_API_IDX_ISR), &platform_system_ctx.ppu_v1_isr_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_APREMAP), FWK_ID_API(FWK_MODULE_IDX_APREMAP, MOD_APREMAP_API_IDX_CMN_ATRANS), &platform_system_ctx.apremap_cmn_atrans_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_module_bind( fwk_module_id_sds, @@ -261,8 +267,9 @@ static int platform_system_start(fwk_id_t id) mod_clock_notification_id_state_changed, FWK_ID_ELEMENT(FWK_MODULE_IDX_CLOCK, CLOCK_IDX_INTERCONNECT), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* * This platform has the CMN configuration register in the AP address space @@ -284,8 +291,9 @@ static int platform_system_start(fwk_id_t id) fwk_id_build_element_id( fwk_module_id_scmi, scmi_notification_table[i]), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* @@ -294,8 +302,9 @@ static int platform_system_start(fwk_id_t id) */ status = fwk_notification_subscribe( mod_sds_notification_id_initialized, fwk_module_id_sds, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = platform_system_ctx.mod_pd_restricted_api->set_state_async( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, 0), @@ -361,8 +370,9 @@ int platform_system_process_notification( } else if (fwk_id_is_equal( event->id, mod_sds_notification_id_initialized)) { sds_notification_received = true; - } else + } else { return FWK_E_PARAM; + } if ((scmi_notification_count == FWK_ARRAY_SIZE(scmi_notification_table)) && sds_notification_received) { diff --git a/product/rdn2/scp_ramfw/rtx_config.c b/product/rdn2/scp_ramfw/rtx_config.c index cfcd53ac542fddac4908409b9a5f4d0fcf9fc292..2ec1549a92e3a02843820f4750e5a3918c0e8c9b 100644 --- a/product/rdn2/scp_ramfw/rtx_config.c +++ b/product/rdn2/scp_ramfw/rtx_config.c @@ -27,8 +27,9 @@ uint32_t SystemCoreClock = CLOCK_RATE_REFCLK; */ __NO_RETURN void osRtxIdleThread(void *argument) { - while (true) + while (true) { __WFI(); + } } /* diff --git a/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c b/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c index 83ddf3622c69bc558c7767f5fa556f21042f8453..8c68b223d3463cb3c8752cfc91e90cb8909e1349 100644 --- a/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c +++ b/product/sgi575/module/sgi575_system/src/mod_sgi575_system.c @@ -104,8 +104,9 @@ static void ppu_cores_isr(unsigned int first, uint32_t status) core_idx = __builtin_ctz(status); status &= ~(1 << core_idx); - if ((first + core_idx) >= sgi575_core_get_core_count()) + if ((first + core_idx) >= sgi575_core_get_core_count()) { continue; + } sgi575_system_ctx.ppu_v1_isr_api->ppu_interrupt_handler( FWK_ID_ELEMENT(FWK_MODULE_IDX_PPU_V1, first + core_idx)); @@ -196,8 +197,9 @@ static int sgi575_system_mod_init(fwk_id_t module_id, unsigned int unused, for (idx = 0; idx < FWK_ARRAY_SIZE(isrs); idx++) { isr = &isrs[idx]; status = fwk_interrupt_set_isr(isr->interrupt, isr->handler); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } sgi575_system_ctx.pik_scp_reg = (struct pik_scp_reg *)SCP_PIK_SCP_BASE; @@ -209,20 +211,23 @@ static int sgi575_system_bind(fwk_id_t id, unsigned int round) { int status; - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_POWER_DOMAIN), FWK_ID_API(FWK_MODULE_IDX_POWER_DOMAIN, MOD_PD_API_IDX_RESTRICTED), &sgi575_system_ctx.mod_pd_restricted_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_PPU_V1), FWK_ID_API(FWK_MODULE_IDX_PPU_V1, MOD_PPU_V1_API_IDX_ISR), &sgi575_system_ctx.ppu_v1_isr_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_module_bind(fwk_module_id_sds, FWK_ID_API(FWK_MODULE_IDX_SDS, 0), @@ -245,8 +250,9 @@ static int sgi575_system_start(fwk_id_t id) mod_clock_notification_id_state_changed, FWK_ID_ELEMENT(FWK_MODULE_IDX_CLOCK, CLOCK_IDX_INTERCONNECT), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } FWK_LOG_INFO("[SGI575 SYSTEM] Requesting SYSTOP initialization..."); @@ -262,8 +268,9 @@ static int sgi575_system_start(fwk_id_t id) fwk_id_build_element_id(fwk_module_id_scmi, scmi_notification_table[i]), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* @@ -274,8 +281,9 @@ static int sgi575_system_start(fwk_id_t id) mod_sds_notification_id_initialized, fwk_module_id_sds, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return sgi575_system_ctx.mod_pd_restricted_api->set_state_async( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, 0), @@ -320,8 +328,9 @@ int sgi575_system_process_notification(const struct fwk_event *event, MOD_PD_STATE_ON, MOD_PD_STATE_ON, MOD_PD_STATE_ON)); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Unsubscribe to the notification */ return fwk_notification_unsubscribe(event->id, event->source_id, @@ -335,8 +344,9 @@ int sgi575_system_process_notification(const struct fwk_event *event, } else if (fwk_id_is_equal(event->id, mod_sds_notification_id_initialized)) { sds_notification_received = true; - } else + } else { return FWK_E_PARAM; + } if ((scmi_notification_count == FWK_ARRAY_SIZE(scmi_notification_table)) && sds_notification_received) { diff --git a/product/sgi575/scp_ramfw/config_resource_perms.c b/product/sgi575/scp_ramfw/config_resource_perms.c index ef943259e5fb71fdacc0c8589490cb677145f2a8..f2c6a8ef9ca6444a860ff6b1cd0b49ed313e31b7 100644 --- a/product/sgi575/scp_ramfw/config_resource_perms.c +++ b/product/sgi575/scp_ramfw/config_resource_perms.c @@ -187,8 +187,9 @@ enum mod_res_perms_permissions mod_res_plat_agent_message_permissions( uint32_t message_id) { if ((protocol_id == MOD_SCMI_PROTOCOL_ID_APCORE) && - (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) + (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) { return MOD_RES_PERMS_ACCESS_ALLOWED; + } return MOD_RES_PERMS_ACCESS_DENIED; } @@ -206,8 +207,9 @@ enum mod_res_perms_permissions mod_res_plat_agent_resource_permissions( uint32_t resource_id) { if ((protocol_id == MOD_SCMI_PROTOCOL_ID_APCORE) && - (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) + (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) { return MOD_RES_PERMS_ACCESS_ALLOWED; + } return MOD_RES_PERMS_ACCESS_DENIED; } diff --git a/product/sgi575/scp_ramfw/rtx_config.c b/product/sgi575/scp_ramfw/rtx_config.c index f351f6fccc1730c0f69fc4e8c442b04c95c0e6cc..34b68dd6cae201d816910297a2ecb939cdeddd04 100644 --- a/product/sgi575/scp_ramfw/rtx_config.c +++ b/product/sgi575/scp_ramfw/rtx_config.c @@ -27,8 +27,9 @@ uint32_t SystemCoreClock = CLOCK_RATE_REFCLK; */ __NO_RETURN void osRtxIdleThread(void *argument) { - while (true) + while (true) { __WFI(); + } } /* diff --git a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c index 762082a4a494a70de6f9dafab0260b4ec0066048..aeb44207ae05b3047da0ac71128b2726485caaf0 100644 --- a/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c +++ b/product/sgm775/module/sgm775_ddr_phy500/src/mod_sgm775_ddr_phy500.c @@ -74,8 +74,9 @@ static int sgm775_ddr_phy500_process_bind_request(fwk_id_t requester_id, fwk_id_t id, fwk_id_t api_id, const void **api) { /* Only binding to module is permitted */ - if (!fwk_module_is_valid_module_id(id)) + if (!fwk_module_is_valid_module_id(id)) { return FWK_E_ACCESS; + } *((const void**)api) = &ddr_phy500_api; diff --git a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c index c95ba61c4f0c7b83635fa6aedc35fa045977606c..3b1066056944f2d7fcdfc01bdfbb9dd0f9b7554a 100644 --- a/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c +++ b/product/sgm775/module/sgm775_dmc500/src/mod_sgm775_dmc500.c @@ -63,8 +63,9 @@ static int mod_sgm775_dmc500_bind(fwk_id_t id, unsigned int round) const struct mod_sgm775_dmc500_module_config *module_config; /* Nothing to do in the second round of calls. */ - if (round == 1) + if (round == 1) { return FWK_SUCCESS; + } if (fwk_module_is_valid_module_id(id)) { @@ -74,15 +75,17 @@ static int mod_sgm775_dmc500_bind(fwk_id_t id, unsigned int round) /* Bind to the timer */ status = fwk_module_bind(module_config->timer_id, FWK_ID_API(FWK_MODULE_IDX_TIMER, 0), &timer_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } /* Bind to the DDR-PHY specific module */ status = fwk_module_bind(FWK_ID_MODULE(FWK_MODULE_IDX_SGM775_DDR_PHY500), FWK_ID_API(FWK_MODULE_IDX_SGM775_DDR_PHY500, 0), &ddr_phy_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } return FWK_SUCCESS; @@ -94,8 +97,9 @@ static int mod_sgm775_dmc500_start(fwk_id_t id) struct mod_sgm775_dmc500_reg *dmc; /* Nothing to start for the module */ - if (fwk_module_is_valid_module_id(id)) + if (fwk_module_is_valid_module_id(id)) { return FWK_SUCCESS; + } element_config = fwk_module_get_data(id); dmc = (struct mod_sgm775_dmc500_reg *)element_config->dmc; @@ -262,8 +266,9 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, dmc->PHY_CONFIG = 0x01000001; status = ddr_phy_api->configure(ddr_phy_id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } dmc->PHY_CONFIG = 0x01000001; dmc->PHY_CONFIG = 0x01000000; @@ -300,12 +305,14 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, status = timer_api->time_to_timestamp(module_config->timer_id, TIMEOUT_DMC_INIT_US, &timeout); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = timer_api->get_counter(module_config->timer_id, &counter); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } timeout += counter; @@ -313,11 +320,13 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, MOD_DMC500_MI_STATUS_IDLE) { status = timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (remaining_ticks == 0) + if (remaining_ticks == 0) { goto timeout; + } } dmc->MI_STATE_CONTROL = 0x00000000; @@ -330,11 +339,13 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, while ((dmc->QUEUE_STATUS & MOD_DMC500_QUEUE_STATUS_STALL_ACK) != 0) { status = timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (remaining_ticks == 0) + if (remaining_ticks == 0) { goto timeout; + } } FWK_LOG_INFO("[DDR] Waiting for SI0 stall = 0..."); @@ -342,11 +353,13 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, while ((dmc->SI0_SI_STATUS & MOD_DMC500_SI_STATUS_STALL_ACK) != 0) { status = timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (remaining_ticks == 0) + if (remaining_ticks == 0) { goto timeout; + } } FWK_LOG_INFO("[DDR] Waiting for SI1 stall = 0..."); @@ -354,11 +367,13 @@ static int sgm775_dmc500_config(struct mod_sgm775_dmc500_reg *dmc, while ((dmc->SI1_SI_STATUS & MOD_DMC500_SI_STATUS_STALL_ACK) != 0) { status = timer_api->remaining(module_config->timer_id, timeout, &remaining_ticks); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } - if (remaining_ticks == 0) + if (remaining_ticks == 0) { goto timeout; + } } FWK_LOG_INFO("[DDR] DMC init done."); diff --git a/product/sgm775/module/sgm775_system/src/mod_sgm775_system.c b/product/sgm775/module/sgm775_system/src/mod_sgm775_system.c index adf22d34003478e8b76e263e6686fdfb8ed5f8fc..626fdf3a843b39ad732bd474210a49cee385509e 100644 --- a/product/sgm775/module/sgm775_system/src/mod_sgm775_system.c +++ b/product/sgm775/module/sgm775_system/src/mod_sgm775_system.c @@ -89,8 +89,9 @@ static int sgm775_system_init(fwk_id_t module_id, unsigned int unused, static int sgm775_system_bind(fwk_id_t id, unsigned int round) { - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } return fwk_module_bind(fwk_module_id_sds, FWK_ID_API(FWK_MODULE_IDX_SDS, 0), @@ -122,8 +123,9 @@ static int sgm775_system_start(fwk_id_t id) fwk_id_build_element_id(fwk_module_id_scmi, scmi_notification_table[i]), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* @@ -142,8 +144,9 @@ static int sgm775_system_process_notification(const struct fwk_event *event, static unsigned int scmi_notification_count = 0; static bool sds_notification_received = false; - if (!fwk_expect(fwk_id_is_type(event->target_id, FWK_ID_TYPE_MODULE))) + if (!fwk_expect(fwk_id_is_type(event->target_id, FWK_ID_TYPE_MODULE))) { return FWK_E_PARAM; + } if (fwk_id_is_equal(event->id, mod_scmi_notification_id_initialized)) { @@ -151,8 +154,9 @@ static int sgm775_system_process_notification(const struct fwk_event *event, } else if (fwk_id_is_equal(event->id, mod_sds_notification_id_initialized)) { sds_notification_received = true; - } else + } else { return FWK_E_PARAM; + } if ((scmi_notification_count == FWK_ARRAY_SIZE(scmi_notification_table)) && sds_notification_received) { diff --git a/product/sgm775/scp_ramfw/config_resource_perms.c b/product/sgm775/scp_ramfw/config_resource_perms.c index 7cdb10ac67ec2e8265aa278bb05ad652eb3d9409..afce8f6182d3d74eec0b5327576384e76467fe21 100644 --- a/product/sgm775/scp_ramfw/config_resource_perms.c +++ b/product/sgm775/scp_ramfw/config_resource_perms.c @@ -125,8 +125,9 @@ enum mod_res_perms_permissions mod_res_plat_agent_message_permissions( uint32_t message_id) { if ((protocol_id == MOD_SCMI_PROTOCOL_ID_APCORE) && - (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) + (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) { return MOD_RES_PERMS_ACCESS_ALLOWED; + } return MOD_RES_PERMS_ACCESS_DENIED; } @@ -144,8 +145,9 @@ enum mod_res_perms_permissions mod_res_plat_agent_resource_permissions( uint32_t resource_id) { if ((protocol_id == MOD_SCMI_PROTOCOL_ID_APCORE) && - (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) + (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) { return MOD_RES_PERMS_ACCESS_ALLOWED; + } return MOD_RES_PERMS_ACCESS_DENIED; } diff --git a/product/sgm776/scp_ramfw/config_resource_perms.c b/product/sgm776/scp_ramfw/config_resource_perms.c index 082c1615335ed9e8cf529688179d2fc8adfa83c9..ed033b19ff8bb7b77607c4facf4f9b425848586f 100644 --- a/product/sgm776/scp_ramfw/config_resource_perms.c +++ b/product/sgm776/scp_ramfw/config_resource_perms.c @@ -133,8 +133,9 @@ enum mod_res_perms_permissions mod_res_plat_agent_message_permissions( uint32_t message_id) { if ((protocol_id == MOD_SCMI_PROTOCOL_ID_APCORE) && - (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) + (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) { return MOD_RES_PERMS_ACCESS_ALLOWED; + } return MOD_RES_PERMS_ACCESS_DENIED; } @@ -152,8 +153,9 @@ enum mod_res_perms_permissions mod_res_plat_agent_resource_permissions( uint32_t resource_id) { if ((protocol_id == MOD_SCMI_PROTOCOL_ID_APCORE) && - (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) + (message_id <= MOD_SCMI_APCORE_RESET_ADDRESS_GET)) { return MOD_RES_PERMS_ACCESS_ALLOWED; + } return MOD_RES_PERMS_ACCESS_DENIED; } diff --git a/product/tc0/module/tc0_system/src/mod_tc0_system.c b/product/tc0/module/tc0_system/src/mod_tc0_system.c index 1d1ff315c95c8829d575890b37d5831501cf6b0f..89b1c707db8617298ad7d788a51730bb563735d4 100644 --- a/product/tc0/module/tc0_system/src/mod_tc0_system.c +++ b/product/tc0/module/tc0_system/src/mod_tc0_system.c @@ -102,8 +102,9 @@ static void ppu_cores_isr(unsigned int first, uint32_t status) core_idx = __builtin_ctz(status); status &= ~(1 << core_idx); - if ((first + core_idx) >= tc0_core_get_core_count()) + if ((first + core_idx) >= tc0_core_get_core_count()) { continue; + } tc0_system_ctx.ppu_v1_isr_api->ppu_interrupt_handler( FWK_ID_ELEMENT(FWK_MODULE_IDX_PPU_V1, first + core_idx)); @@ -193,8 +194,9 @@ static int tc0_system_mod_init( for (idx = 0; idx < FWK_ARRAY_SIZE(isrs); idx++) { isr = &isrs[idx]; status = fwk_interrupt_set_isr(isr->interrupt, isr->handler); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } tc0_system_ctx.pik_scp_reg = (struct pik_scp_reg *)SCP_PIK_SCP_BASE; @@ -206,22 +208,25 @@ static int tc0_system_bind(fwk_id_t id, unsigned int round) { int status; - if (round > 0) + if (round > 0) { return FWK_SUCCESS; + } status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_POWER_DOMAIN), FWK_ID_API(FWK_MODULE_IDX_POWER_DOMAIN, MOD_PD_API_IDX_RESTRICTED), &tc0_system_ctx.mod_pd_restricted_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } status = fwk_module_bind( FWK_ID_MODULE(FWK_MODULE_IDX_PPU_V1), FWK_ID_API(FWK_MODULE_IDX_PPU_V1, MOD_PPU_V1_API_IDX_ISR), &tc0_system_ctx.ppu_v1_isr_api); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return fwk_module_bind( fwk_module_id_sds, @@ -256,8 +261,9 @@ static int tc0_system_start(fwk_id_t id) fwk_id_build_element_id( fwk_module_id_scmi, scmi_notification_table[i]), id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } } /* @@ -266,8 +272,9 @@ static int tc0_system_start(fwk_id_t id) */ status = fwk_notification_subscribe( mod_sds_notification_id_initialized, fwk_module_id_sds, id); - if (status != FWK_SUCCESS) + if (status != FWK_SUCCESS) { return status; + } return tc0_system_ctx.mod_pd_restricted_api->set_state_async( FWK_ID_ELEMENT(FWK_MODULE_IDX_POWER_DOMAIN, 0), @@ -294,8 +301,9 @@ int tc0_system_process_notification( } else if (fwk_id_is_equal( event->id, mod_sds_notification_id_initialized)) { sds_notification_received = true; - } else + } else { return FWK_E_PARAM; + } if ((scmi_notification_count == FWK_ARRAY_SIZE(scmi_notification_table)) && sds_notification_received) { diff --git a/product/tc0/scp_ramfw/config_ppu_v1.c b/product/tc0/scp_ramfw/config_ppu_v1.c index a53a7d9333d195e99d13a1165509d517e2962a30..65a07b92a1122082d75c7b32cdad457b03b0afaa 100644 --- a/product/tc0/scp_ramfw/config_ppu_v1.c +++ b/product/tc0/scp_ramfw/config_ppu_v1.c @@ -83,13 +83,15 @@ static const struct fwk_element *ppu_v1_get_element_table(fwk_id_t module_id) core_count + cluster_count + FWK_ARRAY_SIZE(ppu_v1_system_element_table) + 1, sizeof(struct fwk_element)); - if (element_table == NULL) + if (element_table == NULL) { return NULL; + } pd_config_table = fwk_mm_calloc( core_count + cluster_count, sizeof(struct mod_ppu_v1_pd_config)); - if (pd_config_table == NULL) + if (pd_config_table == NULL) { return NULL; + } for (core_idx = 0; core_idx < tc0_core_get_core_per_cluster_count(CLUSTER_ID); @@ -98,8 +100,9 @@ static const struct fwk_element *ppu_v1_get_element_table(fwk_id_t module_id) pd_config = &pd_config_table[core_element_count]; element->name = fwk_mm_alloc(PPU_CORE_NAME_SIZE, 1); - if (element->name == NULL) + if (element->name == NULL) { return NULL; + } snprintf((char *)element->name, PPU_CORE_NAME_SIZE, "CORE%u", core_idx); @@ -118,8 +121,9 @@ static const struct fwk_element *ppu_v1_get_element_table(fwk_id_t module_id) pd_config = &pd_config_table[core_count]; element->name = fwk_mm_alloc(PPU_CLUS_NAME_SIZE, 1); - if (element->name == NULL) + if (element->name == NULL) { return NULL; + } element->data = pd_config; diff --git a/product/tc0/scp_ramfw/rtx_config.c b/product/tc0/scp_ramfw/rtx_config.c index cfcd53ac542fddac4908409b9a5f4d0fcf9fc292..2ec1549a92e3a02843820f4750e5a3918c0e8c9b 100644 --- a/product/tc0/scp_ramfw/rtx_config.c +++ b/product/tc0/scp_ramfw/rtx_config.c @@ -27,8 +27,9 @@ uint32_t SystemCoreClock = CLOCK_RATE_REFCLK; */ __NO_RETURN void osRtxIdleThread(void *argument) { - while (true) + while (true) { __WFI(); + } } /*