renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 16:53:54 +08:00
Code

memory: emif: handle overflow for timing for LP mode

Browse Source 
In case the custom timings provide values which overflow
the maximum possible field value, warn and use maximum
permissible value.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nishanth Menon 2013-03-16 11:46:43 +05:30 committed by Greg Kroah-Hartman
parent 9ea03dec38
commit 25aaacd283
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/memory/emif.c
View File

@ -715,6 +715,8 @@ static u32 get_pwr_mgmt_ctrl(u32 freq, struct emif_data *emif, u32 ip_rev)
u32 timeout_perf = EMIF_LP_MODE_TIMEOUT_PERFORMANCE; u32 timeout_perf = EMIF_LP_MODE_TIMEOUT_PERFORMANCE;
u32 timeout_pwr = EMIF_LP_MODE_TIMEOUT_POWER; u32 timeout_pwr = EMIF_LP_MODE_TIMEOUT_POWER;
u32 freq_threshold = EMIF_LP_MODE_FREQ_THRESHOLD; u32 freq_threshold = EMIF_LP_MODE_FREQ_THRESHOLD;
u32 mask;
u8 shift;
struct emif_custom_configs *cust_cfgs = emif->plat_data->custom_configs; struct emif_custom_configs *cust_cfgs = emif->plat_data->custom_configs;
@ -743,26 +745,44 @@ static u32 get_pwr_mgmt_ctrl(u32 freq, struct emif_data *emif, u32 ip_rev)
switch (lpmode) { switch (lpmode) {
case EMIF_LP_MODE_CLOCK_STOP: case EMIF_LP_MODE_CLOCK_STOP:
pwr_mgmt_ctrl = (timeout << CS_TIM_SHIFT) | shift = CS_TIM_SHIFT;
SR_TIM_MASK | PD_TIM_MASK; mask = CS_TIM_MASK;
break; break;
case EMIF_LP_MODE_SELF_REFRESH: case EMIF_LP_MODE_SELF_REFRESH:
/* Workaround for errata i735 */ /* Workaround for errata i735 */
if (timeout < 6) if (timeout < 6)
timeout = 6; timeout = 6;
pwr_mgmt_ctrl = (timeout << SR_TIM_SHIFT) | shift = SR_TIM_SHIFT;
CS_TIM_MASK | PD_TIM_MASK; mask = SR_TIM_MASK;
break; break;
case EMIF_LP_MODE_PWR_DN: case EMIF_LP_MODE_PWR_DN:
pwr_mgmt_ctrl = (timeout << PD_TIM_SHIFT) | shift = PD_TIM_SHIFT;
CS_TIM_MASK | SR_TIM_MASK; mask = PD_TIM_MASK;
break; break;
case EMIF_LP_MODE_DISABLE: case EMIF_LP_MODE_DISABLE:
default: default:
pwr_mgmt_ctrl = CS_TIM_MASK | mask = 0;
PD_TIM_MASK | SR_TIM_MASK; shift = 0;
break;
} }
/* Round to maximum in case of overflow, BUT warn! */
if (lpmode != EMIF_LP_MODE_DISABLE && timeout > mask >> shift) {
pr_err("TIMEOUT Overflow - lpmode=%d perf=%d pwr=%d freq=%d\n",
lpmode,
timeout_perf,
timeout_pwr,
freq_threshold);
WARN(1, "timeout=0x%02x greater than 0x%02x. Using max\n",
timeout, mask >> shift);
timeout = mask >> shift;
}
/* Setup required timing */
pwr_mgmt_ctrl = (timeout << shift) & mask;
/* setup a default mask for rest of the modes */
pwr_mgmt_ctrl |= (SR_TIM_MASK | CS_TIM_MASK | PD_TIM_MASK) &
~mask;
/* No CS_TIM in EMIF_4D5 */ /* No CS_TIM in EMIF_4D5 */
if (ip_rev == EMIF_4D5) if (ip_rev == EMIF_4D5)