ddr: socfpga: Fix EMIF clear timeout
PATCH v2 1/1 ddr: socfpga: Fix EMIF clear timeout
The current EMIF clear timeout handling code was applying bitwise operations to signed data types and as it was, was extremely hard to read. Replace it with simple wait_for_bit(). Expand the error handling to make it more readable too.
This patch also changes the timeout for emif_clear() from 14 hours to 1 second.
---
V2: Subject should read ddr: socfpga: , fix this
--- drivers/ddr/altera/sdram_arria10.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/ddr/altera/sdram_arria10.c +11 -13
@@ -133,22 +133,16 @@ static unsigned char ddr_wait_bit(u32 ereg, u32 bit,static int emif_clear (void ) { -u32 i =DDR_MAX_TRIES ; -u8 ret =0 ; -writel (0 ,DDR_REG_CORE2SEQ ); -do { - ret = !wait_for_bit_le32 ((u32 *)DDR_REG_SEQ2CORE , -SEQ2CORE_MASK ,1 ,50 ,0 ); - }while (ret && (--i >0 )); - -return !i; +return wait_for_bit_le32 ((u32 *)DDR_REG_SEQ2CORE , +SEQ2CORE_MASK ,0 ,1000 ,0 ); }static int emif_reset (void ) {u32 c2s, s2c; +int ret; c2s =readl (DDR_REG_CORE2SEQ ); s2c =readl (DDR_REG_SEQ2CORE );
@@ -159,9 +153,12 @@ static int emif_reset(void)readl (IO48_MMR_NIOS2_RESERVE2 ), readl(IO48_MMR_DRAMSTS)); -if ((s2c &SEQ2CORE_MASK ) &&emif_clear ()) { -debug ("failed emif_clear()\n" ); -return -EPERM ; +if (s2c &SEQ2CORE_MASK ) { + ret =emif_clear (); +if (ret) { +debug ("failed emif_clear()\n" ); +return -EPERM ; + } }writel (CORE2SEQ_INT_REQ ,DDR_REG_CORE2SEQ );
@@ -173,7 +170,8 @@ static int emif_reset(void)debug ("emif_reset interrupt acknowledged\n" ); } -if (emif_clear ()) { + ret =emif_clear (); +if (ret) {debug ("emif_clear() failed\n" );return -EPERM ; }
Signature · 1 line
2.20.1
PATCH v2 1/1 ddr: socfpga: Fix EMIF clear timeout
Quoted 24 lines · Marek Vasut
The current EMIF clear timeout handling code was applying bitwise operations to signed data types and as it was, was extremely hard to read. Replace it with simple
wait_for_bit(). Expand the error handling to make it more readable too.This patch also changes the timeout for
emif_clear()from 14 hours to 1 second.Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>---
V2: Subject should read ddr: socfpga: , fix this--- drivers/ddr/altera/sdram_arria10.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)drivers/ddr/altera/sdram_arria10.c +0
-0
drivers/ddr/altera/sdram_arria10.c static unsigned char ddr_wait_bit(u32 ereg, u32 bit, · line 136
Quoted 4 lines
drivers/ddr/altera/sdram_arria10.c +0
-1@@ -133,22 +133,16 @@ static unsigned char ddr_wait_bit(u32 ereg, u32 bit,static int emif_clear (void ) { -u32 i =DDR_MAX_TRIES ;
Wasn't this the last usage of this define?
Other than that:
Quoted 48 lines
drivers/ddr/altera/sdram_arria10.c +11
-12-u8 ret =0 ; -writel (0 ,DDR_REG_CORE2SEQ ); -do { - ret = !wait_for_bit_le32 ((u32 *)DDR_REG_SEQ2CORE , -SEQ2CORE_MASK ,1 ,50 ,0 ); - }while (ret && (--i >0 )); - -return !i; +return wait_for_bit_le32 ((u32 *)DDR_REG_SEQ2CORE , +SEQ2CORE_MASK ,0 ,1000 ,0 ); }static int emif_reset (void ) {u32 c2s, s2c; +int ret; c2s =readl (DDR_REG_CORE2SEQ ); s2c =readl (DDR_REG_SEQ2CORE );@@ -159,9 +153,12 @@ static int emif_reset(void)readl (IO48_MMR_NIOS2_RESERVE2 ), readl(IO48_MMR_DRAMSTS)); -if ((s2c &SEQ2CORE_MASK ) &&emif_clear ()) { -debug ("failed emif_clear()\n" ); -return -EPERM ; +if (s2c &SEQ2CORE_MASK ) { + ret =emif_clear (); +if (ret) { +debug ("failed emif_clear()\n" ); +return -EPERM ; + } }writel (CORE2SEQ_INT_REQ ,DDR_REG_CORE2SEQ );@@ -173,7 +170,8 @@ static int emif_reset(void)debug ("emif_reset interrupt acknowledged\n" ); } -if (emif_clear ()) { + ret =emif_clear (); +if (ret) {debug ("emif_clear() failed\n" );return -EPERM ; }