memory: emif: Fix the lpmode timeout calculation (0a5f19cf) · Commits · 戴 / test

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>

drivers/memory/emif.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message