Commit 03ea84c3 authored by Alexei Fedorov's avatar Alexei Fedorov Committed by TrustedFirmware Code Review
Browse files

Merge "driver/arm/css: minor bug fix" into integration

parents d95f7a72 cc7f89de
...@@ -224,8 +224,8 @@ void css_scp_on(u_register_t mpidr) ...@@ -224,8 +224,8 @@ void css_scp_on(u_register_t mpidr)
SCMI_SET_PWR_STATE_MAX_PWR_LVL(scmi_pwr_state, lvl - 1); SCMI_SET_PWR_STATE_MAX_PWR_LVL(scmi_pwr_state, lvl - 1);
core_pos = plat_core_pos_by_mpidr(mpidr); core_pos = (unsigned int)plat_core_pos_by_mpidr(mpidr);
assert(core_pos >= 0 && (core_pos < PLATFORM_CORE_COUNT)); assert(core_pos < PLATFORM_CORE_COUNT);
css_scp_core_pos_to_scmi_channel(core_pos, &domain_id, css_scp_core_pos_to_scmi_channel(core_pos, &domain_id,
&channel_id); &channel_id);
...@@ -256,8 +256,8 @@ int css_scp_get_power_state(u_register_t mpidr, unsigned int power_level) ...@@ -256,8 +256,8 @@ int css_scp_get_power_state(u_register_t mpidr, unsigned int power_level)
return PSCI_E_INVALID_PARAMS; return PSCI_E_INVALID_PARAMS;
} }
cpu_idx = plat_core_pos_by_mpidr(mpidr); cpu_idx = (unsigned int)plat_core_pos_by_mpidr(mpidr);
assert(cpu_idx > -1); assert(cpu_idx < PLATFORM_CORE_COUNT);
css_scp_core_pos_to_scmi_channel(cpu_idx, &domain_id, &channel_id); css_scp_core_pos_to_scmi_channel(cpu_idx, &domain_id, &channel_id);
ret = scmi_pwr_state_get(scmi_handles[channel_id], ret = scmi_pwr_state_get(scmi_handles[channel_id],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment