diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-01-10 19:39:17 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-10 19:39:17 +0000 |
| commit | 436367966f3aa9699cbe54394f69d7c8cc70c010 (patch) | |
| tree | 63270bd7d9087b76960afd11ef51b30890004407 /drivers | |
| parent | 1522958fcd4ab2f17f7b284f4bb674fc7a584ce8 (diff) | |
| parent | 5b33ad174a03a5ccdcd6321c64d69167361dc21a (diff) | |
| download | platform_external_arm-trusted-firmware-436367966f3aa9699cbe54394f69d7c8cc70c010.tar.gz platform_external_arm-trusted-firmware-436367966f3aa9699cbe54394f69d7c8cc70c010.tar.bz2 platform_external_arm-trusted-firmware-436367966f3aa9699cbe54394f69d7c8cc70c010.zip | |
Merge "Unify type of "cpu_idx" across PSCI module." into integration
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/css/scp/css_pm_scmi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/arm/css/scp/css_pm_scmi.c b/drivers/arm/css/scp/css_pm_scmi.c index 8dbefa16b..b945cda78 100644 --- a/drivers/arm/css/scp/css_pm_scmi.c +++ b/drivers/arm/css/scp/css_pm_scmi.c @@ -186,7 +186,7 @@ void css_scp_off(const struct psci_power_state *target_state) void css_scp_on(u_register_t mpidr) { unsigned int lvl = 0; - int ret, core_pos; + int core_pos, ret; uint32_t scmi_pwr_state = 0; for (; lvl <= PLAT_MAX_PWR_LVL; lvl++) @@ -196,7 +196,8 @@ void css_scp_on(u_register_t mpidr) SCMI_SET_PWR_STATE_MAX_PWR_LVL(scmi_pwr_state, lvl - 1); core_pos = plat_core_pos_by_mpidr(mpidr); - assert(core_pos >= 0 && core_pos < PLATFORM_CORE_COUNT); + assert((core_pos >= 0) && + (((unsigned int)core_pos) < PLATFORM_CORE_COUNT)); ret = scmi_pwr_state_set(scmi_handle, plat_css_core_pos_to_scmi_dmn_id_map[core_pos], |