diff options
| -rw-r--r-- | board/arcada_ish/board.c | 2 | ||||
| -rw-r--r-- | chip/ish/aontaskfw/ish_aontask.c | 5 | ||||
| -rw-r--r-- | chip/ish/clock.c | 4 | ||||
| -rw-r--r-- | chip/ish/gpio.c | 5 | ||||
| -rw-r--r-- | chip/ish/i2c.c | 16 | ||||
| -rw-r--r-- | chip/ish/ipc_heci.c | 26 | ||||
| -rw-r--r-- | chip/ish/power_mgt.c | 4 | ||||
| -rw-r--r-- | chip/ish/system_state_subsys.c | 15 | ||||
| -rw-r--r-- | core/minute-ia/panic.c | 5 | ||||
| -rw-r--r-- | core/minute-ia/task.c | 153 |
10 files changed, 109 insertions, 126 deletions
diff --git a/board/arcada_ish/board.c b/board/arcada_ish/board.c index 8d1566723e..01c126aede 100644 --- a/board/arcada_ish/board.c +++ b/board/arcada_ish/board.c @@ -167,7 +167,6 @@ static void board_init(void) } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); -#ifdef HAS_TASK_CHIPSET /* TODO(b/122364080): replace when implement real chipset/power task */ int chipset_in_state(int state_mask) { @@ -186,7 +185,6 @@ int chipset_in_or_transitioning_to_state(int state_mask) void chipset_force_shutdown(enum chipset_shutdown_reason reason) { } -#endif /* HAS_TASK_CHIPSET */ /* TODO(b/122364080): remove when implement real chipset/power task */ int board_idle_task(void *unused) diff --git a/chip/ish/aontaskfw/ish_aontask.c b/chip/ish/aontaskfw/ish_aontask.c index d25f2a5f4d..996827e8c9 100644 --- a/chip/ish/aontaskfw/ish_aontask.c +++ b/chip/ish/aontaskfw/ish_aontask.c @@ -93,8 +93,6 @@ static void pmu_wakeup_isr(void) __builtin_unreachable(); } -#ifdef CONFIG_ISH_PM_RESET_PREP - /* ISR for reset prep interrupt */ static void reset_prep_isr(void) { @@ -113,9 +111,6 @@ static void reset_prep_isr(void) __builtin_unreachable(); } -#endif - - /** * Use a static data array for aon IDT, and setting IDT header for IDTR * register diff --git a/chip/ish/clock.c b/chip/ish/clock.c index 7e0879cc0a..ac818f5733 100644 --- a/chip/ish/clock.c +++ b/chip/ish/clock.c @@ -20,8 +20,6 @@ void clock_init(void) /* No initialization for clock on ISH */ } -#ifdef CONFIG_LOW_POWER_IDLE - void clock_refresh_console_in_use(void) { /** @@ -32,5 +30,3 @@ void clock_refresh_console_in_use(void) */ ish_pm_refresh_console_in_use(); } - -#endif diff --git a/chip/ish/gpio.c b/chip/ish/gpio.c index 18890c111d..3d374f3cb8 100644 --- a/chip/ish/gpio.c +++ b/chip/ish/gpio.c @@ -55,13 +55,12 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags) } /* ISH 3 can't support both rising and falling edge */ -#ifdef CHIP_FAMILY_ISH3 - if ((flags & GPIO_INT_F_RISING) && (flags & GPIO_INT_F_FALLING)) { + if (IS_ENABLED(CHIP_FAMILY_ISH3) && + (flags & GPIO_INT_F_RISING) && (flags & GPIO_INT_F_FALLING)) { ccprintf("\n\nISH 2/3 does not support both rising & falling " "edge for %d 0x%02x\n\n", port, mask); } -#endif /* GPSR/GPCR Output high/low */ if (flags & GPIO_HIGH) /* Output high */ diff --git a/chip/ish/i2c.c b/chip/ish/i2c.c index cecb81f40f..0cb445cea0 100644 --- a/chip/ish/i2c.c +++ b/chip/ish/i2c.c @@ -427,17 +427,21 @@ int chip_i2c_xfer(int port, int slave_addr, const uint8_t *out, int out_size, static void i2c_interrupt_handler(struct i2c_context *ctx) { -#ifdef INTR_DEBUG uint32_t raw_intr; - raw_intr = 0x0000FFFF & i2c_mmio_read(ctx->base, IC_RAW_INTR_STAT); -#endif + + if (IS_ENABLED(INTR_DEBUG)) + raw_intr = 0x0000FFFF & i2c_mmio_read(ctx->base, + IC_RAW_INTR_STAT); + /* check interrupts */ ctx->interrupts = i2c_mmio_read(ctx->base, IC_INTR_STAT); ctx->reason = (uint16_t) i2c_mmio_read(ctx->base, IC_TX_ABRT_SOURCE); -#ifdef INTR_DEBUG - CPRINTS("INTR_STAT = 0x%04x, TX_ABORT_SRC = 0x%04x, RAW_INTR_STAT = 0x%04x\n", + + if (IS_ENABLED(INTR_DEBUG)) + CPRINTS("INTR_STAT = 0x%04x, TX_ABORT_SRC = 0x%04x, " + "RAW_INTR_STAT = 0x%04x\n", ctx->interrupts, ctx->reason, raw_intr); -#endif + /* disable interrupts */ i2c_intr_switch(ctx->base, DISABLE_INT); task_set_event(ctx->wait_task_id, TASK_EVENT_I2C_IDLE, 0); diff --git a/chip/ish/ipc_heci.c b/chip/ish/ipc_heci.c index 394c768e28..1eb3e7da4d 100644 --- a/chip/ish/ipc_heci.c +++ b/chip/ish/ipc_heci.c @@ -323,10 +323,11 @@ static int ipc_get_protocol_data(const struct ipc_if_ctx *ctx, CPRINTS("buffer is smaller than payload\n"); return -IPC_ERR_TOO_SMALL_BUFFER; } -#ifdef IPC_HECI_DEBUG - CPRINTF("ipc p=%d, db=0x%0x, payload_size=%d\n", protocol, drbl_val, - IPC_DB_MSG_LENGTH(drbl_val)); -#endif + + if (IS_ENABLED(IPC_HECI_DEBUG)) + CPRINTF("ipc p=%d, db=0x%0x, payload_size=%d\n", + protocol, drbl_val, + IPC_DB_MSG_LENGTH(drbl_val)); switch (protocol) { case IPC_PROTOCOL_HECI: @@ -446,7 +447,6 @@ static void ipc_host2ish_isr(void) uint32_t pisr = IPC_PISR; uint32_t pimr = IPC_PIMR; -#ifdef CHIP_FAMILY_ISH5 /* * TODO(b/122364080): Remove this code once proper power management is * in place for ISH. @@ -456,9 +456,8 @@ static void ipc_host2ish_isr(void) * host ipc communication). Resume is where we would like to restore all * power settings, but that is too late for this power request. */ - - PMU_VNN_REQ = VNN_REQ_IPC_HOST_WRITE & ~PMU_VNN_REQ; -#endif + if (IS_ENABLED(CHIP_FAMILY_ISH5)) + PMU_VNN_REQ = VNN_REQ_IPC_HOST_WRITE & ~PMU_VNN_REQ; if ((pisr & IPC_PISR_HOST2ISH_BIT) && (pimr & IPC_PIMR_HOST2ISH_BIT)) handle_msg_recv_interrupt(IPC_PEER_ID_HOST); @@ -687,17 +686,18 @@ void ipc_mng_task(void) struct ipc_msg msg; ipc_handle_t handle; -#ifdef CHIP_FAMILY_ISH5 /* * TODO(b/122364080): Remove this code once proper power management is * in place for ISH. * * Ensure that power for host IPCs is requested and ack'ed */ - PMU_VNN_REQ = VNN_REQ_IPC_HOST_WRITE & ~PMU_VNN_REQ; - while (!(PMU_VNN_REQ_ACK & PMU_VNN_REQ_ACK_STATUS)) - continue; -#endif + if (IS_ENABLED(CHIP_FAMILY_ISH5)) { + PMU_VNN_REQ = VNN_REQ_IPC_HOST_WRITE & ~PMU_VNN_REQ; + while (!(PMU_VNN_REQ_ACK & PMU_VNN_REQ_ACK_STATUS)) + continue; + } + handle = ipc_open(IPC_PEER_ID_HOST, IPC_PROTOCOL_MNG, EVENT_FLAG_BIT_MNG_MSG); diff --git a/chip/ish/power_mgt.c b/chip/ish/power_mgt.c index 7d4e901a13..dea5b4cf1c 100644 --- a/chip/ish/power_mgt.c +++ b/chip/ish/power_mgt.c @@ -711,25 +711,21 @@ static void handle_d3(uint32_t irq_vec) } } -__maybe_unused static void d3_rise_isr(void) { handle_d3(ISH_D3_RISE_VEC); } -__maybe_unused static void d3_fall_isr(void) { handle_d3(ISH_D3_FALL_VEC); } -__maybe_unused static void bme_rise_isr(void) { handle_d3(ISH_BME_RISE_VEC); } -__maybe_unused static void bme_fall_isr(void) { handle_d3(ISH_BME_FALL_VEC); diff --git a/chip/ish/system_state_subsys.c b/chip/ish/system_state_subsys.c index 5a0fe582b5..93539d2ddf 100644 --- a/chip/ish/system_state_subsys.c +++ b/chip/ish/system_state_subsys.c @@ -30,9 +30,7 @@ #define SUSPEND_STATE_BIT BIT(1) /* suspend/resume */ /* Cached state of ISH's requested power rails when AP suspends */ -#ifdef CHIP_FAMILY_ISH5 static uint32_t cached_vnn_request; -#endif struct ss_header { uint32_t cmd; @@ -108,7 +106,6 @@ static int ss_subsys_suspend(void) ss_subsys_ctx.clients[i]); } -#ifdef CHIP_FAMILY_ISH5 /* * TODO(b/122364080): Remove this code once proper power management is * in place for ISH. @@ -118,9 +115,10 @@ static int ss_subsys_suspend(void) * rails. Setting a bit to 1 both sets and clears a requested value. * Cache the value of request power so we can restore it on resume. */ - cached_vnn_request = PMU_VNN_REQ; - PMU_VNN_REQ = cached_vnn_request; -#endif + if (IS_ENABLED(CHIP_FAMILY_ISH5)) { + cached_vnn_request = PMU_VNN_REQ; + PMU_VNN_REQ = cached_vnn_request; + } return EC_SUCCESS; } @@ -128,21 +126,20 @@ static int ss_subsys_resume(void) { int i; -#ifdef CHIP_FAMILY_ISH5 /* * TODO(b/122364080): Remove this code once proper power management is * in place for ISH. * * Restore VNN power request from before suspend. */ - if (cached_vnn_request) { + if (IS_ENABLED(CHIP_FAMILY_ISH5) && + cached_vnn_request) { /* Request all cached power rails that are not already on. */ PMU_VNN_REQ = cached_vnn_request & ~PMU_VNN_REQ; /* Wait for power request to get acknowledged */ while (!(PMU_VNN_REQ_ACK & PMU_VNN_REQ_ACK_STATUS)) continue; } -#endif for (i = 0; i < ss_subsys_ctx.num_of_ss_client; i++) { if (ss_subsys_ctx.clients[i]->cbs->resume) diff --git a/core/minute-ia/panic.c b/core/minute-ia/panic.c index 9b0cf68c69..464d25ec52 100644 --- a/core/minute-ia/panic.c +++ b/core/minute-ia/panic.c @@ -169,8 +169,8 @@ __attribute__((noreturn)) void __keep exception_panic( __builtin_unreachable(); } -#ifdef CONFIG_SOFTWARE_PANIC -__attribute__((noreturn)) void software_panic(uint32_t reason, uint32_t info) +__attribute__((noreturn)) +void software_panic(uint32_t reason, uint32_t info) { uint16_t code_segment; @@ -212,4 +212,3 @@ void panic_get_reason(uint32_t *reason, uint32_t *info, uint8_t *exception) *reason = *info = *exception = 0; } } -#endif diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c index fe00340994..8cd42186f2 100644 --- a/core/minute-ia/task.c +++ b/core/minute-ia/task.c @@ -180,10 +180,10 @@ inline int in_interrupt_context(void) task_id_t task_get_current(void) { -#ifdef CONFIG_DEBUG_BRINGUP /* If we haven't done a context switch then our task ID isn't valid */ - ASSERT(task_start_called() != 1); -#endif + if (IS_ENABLED(CONFIG_DEBUG_BRINGUP)) + ASSERT(task_start_called() != 1); + return current_task - tasks; } @@ -216,15 +216,15 @@ uint32_t switch_handler(int desched, task_id_t resched) current = current_task; -#ifdef CONFIG_DEBUG_STACK_OVERFLOW - if (*current->stack != STACK_UNUSED_VALUE) { + if (IS_ENABLED(CONFIG_DEBUG_STACK_OVERFLOW) && + *current->stack != STACK_UNUSED_VALUE) { panic_printf("\n\nStack overflow in %s task!\n", task_get_name(current - tasks)); -#ifdef CONFIG_SOFTWARE_PANIC - software_panic(PANIC_SW_STACK_OVERFLOW, current - tasks); -#endif + + if (IS_ENABLED(CONFIG_SOFTWARE_PANIC)) + software_panic(PANIC_SW_STACK_OVERFLOW, + current - tasks); } -#endif if (desched && !current->events) { /* @@ -238,29 +238,26 @@ uint32_t switch_handler(int desched, task_id_t resched) ASSERT(tasks_ready & tasks_enabled); next = __task_id_to_ptr(__fls(tasks_ready & tasks_enabled)); -#ifdef CONFIG_TASK_PROFILING /* Only the first ISR on the (nested IRQ) stack calculates time */ - if (__in_isr == 1) { + if (IS_ENABLED(CONFIG_TASK_PROFILING) && + __in_isr == 1) { /* Track time in interrupts */ uint32_t t = get_time().le.lo; exc_end_time = t; exc_total_time += (t - exc_start_time); } -#endif /* Nothing to do */ if (next == current) return 0; -#ifdef ISH_DEBUG - CPRINTF("[%d -> %d]\n", current - tasks, next - tasks); -#endif + if (IS_ENABLED(ISH_DEBUG)) + CPRINTF("[%d -> %d]\n", current - tasks, next - tasks); /* Switch to new task */ -#ifdef CONFIG_TASK_PROFILING - task_switches++; -#endif + if (IS_ENABLED(CONFIG_TASK_PROFILING)) + task_switches++; next_task = next; /* TS required */ @@ -497,18 +494,15 @@ void task_print_list(void) { int i; -#ifdef CONFIG_FPU - ccputs("Task Ready Name Events Time (s) " - " StkUsed UseFPU\n"); -#else - ccputs("Task Ready Name Events Time (s) StkUsed\n"); -#endif + if (IS_ENABLED(CONFIG_FPU)) + ccputs("Task Ready Name Events Time (s) " + " StkUsed UseFPU\n"); + else + ccputs("Task Ready Name Events Time (s) " + "StkUsed\n"); for (i = 0; i < TASK_ID_COUNT; i++) { char is_ready = (tasks_ready & (1<<i)) ? 'R' : ' '; -#ifdef CONFIG_FPU - char use_fpu = tasks[i].use_fpu ? 'Y' : 'N'; -#endif uint32_t *sp; int stackused = tasks_init[i].stack_size; @@ -518,15 +512,19 @@ void task_print_list(void) sp++) stackused -= sizeof(uint32_t); -#ifdef CONFIG_FPU - ccprintf("%4d %c %-16s %08x %11.6ld %3d/%3d %c\n", i, is_ready, - task_get_name(i), tasks[i].events, tasks[i].runtime, - stackused, tasks_init[i].stack_size, use_fpu); -#else - ccprintf("%4d %c %-16s %08x %11.6ld %3d/%3d\n", i, is_ready, - task_get_name(i), tasks[i].events, tasks[i].runtime, - stackused, tasks_init[i].stack_size); -#endif + if (IS_ENABLED(CONFIG_FPU)) { + char use_fpu = tasks[i].use_fpu ? 'Y' : 'N'; + + ccprintf("%4d %c %-16s %08x %11.6ld %3d/%3d %c\n", + i, is_ready, task_get_name(i), tasks[i].events, + tasks[i].runtime, stackused, + tasks_init[i].stack_size, use_fpu); + } else { + ccprintf("%4d %c %-16s %08x %11.6ld %3d/%3d\n", + i, is_ready, task_get_name(i), tasks[i].events, + tasks[i].runtime, stackused, + tasks_init[i].stack_size); + } cflush(); } @@ -534,30 +532,29 @@ void task_print_list(void) int command_task_info(int argc, char **argv) { -#ifdef CONFIG_TASK_PROFILING - int total = 0; - int i; -#endif - task_print_list(); -#ifdef CONFIG_TASK_PROFILING - ccputs("IRQ counts by type:\n"); - cflush(); - for (i = 0; i < ARRAY_SIZE(irq_dist); i++) { - if (irq_dist[i]) { - ccprintf("%4d %8d\n", i, irq_dist[i]); - total += irq_dist[i]; + if (IS_ENABLED(CONFIG_TASK_PROFILING)) { + int total = 0; + int i; + + ccputs("IRQ counts by type:\n"); + cflush(); + for (i = 0; i < ARRAY_SIZE(irq_dist); i++) { + if (irq_dist[i]) { + ccprintf("%4d %8d\n", i, irq_dist[i]); + total += irq_dist[i]; + } } + ccprintf("Service calls: %11d\n", svc_calls); + ccprintf("Total exceptions: %11d\n", total + svc_calls); + ccprintf("Task switches: %11d\n", task_switches); + ccprintf("Task switching started: %11.6ld s\n", + task_start_time); + ccprintf("Time in tasks: %11.6ld s\n", + get_time().val - task_start_time); + ccprintf("Time in exceptions: %11.6ld s\n", exc_total_time); } - ccprintf("Service calls: %11d\n", svc_calls); - ccprintf("Total exceptions: %11d\n", total + svc_calls); - ccprintf("Task switches: %11d\n", task_switches); - ccprintf("Task switching started: %11.6ld s\n", task_start_time); - ccprintf("Time in tasks: %11.6ld s\n", - get_time().val - task_start_time); - ccprintf("Time in exceptions: %11.6ld s\n", exc_total_time); -#endif return EC_SUCCESS; } @@ -565,7 +562,7 @@ DECLARE_CONSOLE_COMMAND(taskinfo, command_task_info, NULL, "Print task info"); -#ifdef CONFIG_CMD_TASKREADY +__maybe_unused static int command_task_ready(int argc, char **argv) { if (argc < 2) { @@ -578,6 +575,8 @@ static int command_task_ready(int argc, char **argv) return EC_SUCCESS; } + +#ifdef CONFIG_CMD_TASKREADY DECLARE_CONSOLE_COMMAND(taskready, command_task_ready, "[setmask]", "Print/set ready tasks"); @@ -588,16 +587,6 @@ void task_pre_init(void) int i, cs; uint32_t *stack_next = (uint32_t *)task_stacks; -#ifdef CONFIG_FPU - static uint8_t default_fp_ctx[] = { /* Initial FP state */ - 0x7f, 0x00, /* Control[0-15] */ - 0xff, 0xff, /* unused */ - 0x00, 0x00, /* Status[0-15] */ - 0xff, 0xff, /* unused */ - 0xff, 0xff, /* Tag[0-15] */ - 0xff, 0xff};/* unused */ -#endif - __asm__ __volatile__ ("movl %%cs, %0":"=r" (cs)); /* Fill the task memory with initial values */ @@ -640,14 +629,24 @@ void task_pre_init(void) sp[14] = 0x00; sp[15] = 0x00; -#ifdef CONFIG_FPU - /* Copy default x86 FPU state for each task */ - memcpy(tasks[i].fp_ctx, default_fp_ctx, - sizeof(default_fp_ctx)); + if (IS_ENABLED(CONFIG_FPU)) { + static uint8_t default_fp_ctx[] = { + /* Initial FP state */ + 0x7f, 0x00, /* Control[0-15] */ + 0xff, 0xff, /* unused */ + 0x00, 0x00, /* Status[0-15] */ + 0xff, 0xff, /* unused */ + 0xff, 0xff, /* Tag[0-15] */ + 0xff, 0xff};/* unused */ + + /* Copy default x86 FPU state for each task */ + memcpy(tasks[i].fp_ctx, default_fp_ctx, + sizeof(default_fp_ctx)); + + if (tasks_init[i].flags & MIA_TASK_FLAG_USE_FPU) + tasks[i].use_fpu = 1; + } - if (tasks_init[i].flags & MIA_TASK_FLAG_USE_FPU) - tasks[i].use_fpu = 1; -#endif /* Fill unused stack; also used to detect stack overflow. */ for (sp = stack_next; sp < (uint32_t *)tasks[i].sp; sp++) *sp = STACK_UNUSED_VALUE; @@ -667,8 +666,8 @@ void task_clear_fp_used(void) int task_start(void) { -#ifdef CONFIG_TASK_PROFILING - task_start_time = exc_end_time = get_time().val; -#endif + if (IS_ENABLED(CONFIG_TASK_PROFILING)) + task_start_time = exc_end_time = get_time().val; + return __task_start(&start_called); } |