diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2013-03-16 11:46:41 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:18:11 -0700 |
| commit | 0a5f19cf303ea9cc9bf89a42960a69db4ea3c35b (patch) | |
| tree | e315ee7a92d5fa1e076d5cfca66e778572776d71 | |
| parent | 275b5d2061c20749582060be68b6ec4692736d28 (diff) | |
| download | linux-0a5f19cf303ea9cc9bf89a42960a69db4ea3c35b.tar.bz2 | |
memory: emif: Fix the lpmode timeout calculation
The driver tries to round up the specified timeout cycles to
the next power of 2 value. This should be done defore updating
timeout variable.
Correcting this here.
Reported-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>
| -rw-r--r-- | drivers/memory/emif.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index ecbc1a996eb6..897c39a8db86 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -728,13 +728,17 @@ static u32 get_pwr_mgmt_ctrl(u32 freq, struct emif_data *emif, u32 ip_rev) /* Timeout based on DDR frequency */ timeout = freq >= freq_threshold ? timeout_perf : timeout_pwr; - /* The value to be set in register is "log2(timeout) - 3" */ + /* + * The value to be set in register is "log2(timeout) - 3" + * if timeout < 16 load 0 in register + * if timeout is not a power of 2, round to next highest power of 2 + */ if (timeout < 16) { timeout = 0; } else { - timeout = __fls(timeout) - 3; if (timeout & (timeout - 1)) - timeout++; + timeout <<= 1; + timeout = __fls(timeout) - 3; } switch (lpmode) { |