Skip to contentSkip to conversation

mvsata_ide: adjust port init sequence

PATCH Superseded Albert Aribaud 4 participants 9 messages Sep 6, 2010 – Sep 7, 2010 Block layer

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

mvsata_ide_initialize_port(): adjust init sequence (SStatus should be checked only after all writes to SControl) and return success/failure to ide_preinit().

Also, as some tests showed init durations in the hundreds of us, raise the time-out to 10 ms to be on the safe side.

---
PATCH HISTORY

V1 Initial patch.
V2 Fixed wrong placement of comment.
Fixed wrong description (was 01 ms, should have been 10). Added Signed-off-by.

 drivers/block/mvsata_ide.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
drivers/block/mvsata_ide.c +14 -8
index 077b278..470659d 100644
@@ -97,23 +97,27 @@ struct mvsata_port_registers {
  * DET back to "no action".
  */
 
-static void mvsata_ide_initialize_port(struct mvsata_port_registers *port)
+static int mvsata_ide_initialize_port(struct mvsata_port_registers *port)
 {
 	u32 control;
 	u32 status;
-	u32 tout = 50; /* wait at most 50 us for SATA reset to complete */
+	u32 tout = 10000; /* wait at most 10 ms for SATA reset to complete */
 
+	/* Set control IPM to 3 (no low power) and DET to 1 (initialize) */
 	control = readl(&port->scontrol);
 	control = (control & ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_INIT;
 	writel(control, &port->scontrol);
+	/* Toggle control DET back to 0 (normal operation) */
+	control = (control & ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_USE;
+	writel(control, &port->scontrol);
+	/* wait for status DET to become 3 (device and communication OK) */
 	while (--tout) {
 		status = readl(&port->sstatus) & MVSATA_SSTATUS_DET_MASK;
 		if (status == MVSATA_SSTATUS_DET_DEVCOMM)
 			break;
 		udelay(1);
 	}
-	control = (control & ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_USE;
-	writel(control, &port->scontrol);
+	return (tout? 0: 1);
 }
 
 /*
@@ -125,15 +129,17 @@ int ide_preinit(void)
 {
 	/* Enable ATA port 0 (could be SATA port 0 or 1) if declared */
 #if defined(CONFIG_SYS_ATA_IDE0_OFFSET)
-	mvsata_ide_initialize_port(
+	if (mvsata_ide_initialize_port(
 		(struct mvsata_port_registers *)
-		(CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_IDE0_OFFSET));
+		(CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_IDE0_OFFSET)))
+		return 1;
 #endif
 	/* Enable ATA port 1 (could be SATA port 0 or 1) if declared */
 #if defined(CONFIG_SYS_ATA_IDE1_OFFSET)
-	mvsata_ide_initialize_port(
+	if (mvsata_ide_initialize_port(
 		(struct mvsata_port_registers *)
-		(CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_IDE1_OFFSET));
+		(CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_IDE1_OFFSET)))
+		return 1;
 #endif
 	/* return 0 as we always succeed */
 	return 0;
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

Quoted 61 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Albert Aribaud
Sent: Tuesday, September 07, 2010 4:33 AM
To: u-boot at lists.denx.de
Subject: [U-Boot] [PATCH V2] mvsata_ide: adjust port init sequence

mvsata_ide_initialize_port(): adjust init sequence (SStatus should be checked only after all writes to SControl) and return success/failure to ide_preinit().

Also, as some tests showed init durations in the hundreds of us, raise the time-out to 10 ms to be on the safe side.

---
PATCH HISTORY

V1 Initial patch.
V2 Fixed wrong placement of comment.
Fixed wrong description (was 01 ms, should have been 10). Added Signed-off-by.

 drivers/block/mvsata_ide.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
drivers/block/mvsata_ide.c +1 -2
index 077b278..470659d 100644
@@ -97,23 +97,27 @@ struct mvsata_port_registers {
  * DET back to "no action".
  */
 
-static void mvsata_ide_initialize_port(struct 
 mvsata_port_registers *port)
+static int mvsata_ide_initialize_port(struct 
 mvsata_port_registers *port)
 {
 	u32 control;
 	u32 status;
-	u32 tout = 50; /* wait at most 50 us for SATA reset to 

complete */

drivers/block/mvsata_ide.c +1 -0
+	u32 tout = 10000; /* wait at most 10 ms for SATA reset 

to complete */

drivers/block/mvsata_ide.c +1 -0
+	/* Set control IPM to 3 (no low power) and DET to 1 

(initialize) */

drivers/block/mvsata_ide.c +4 -0
 	control = readl(&port->scontrol);
 	control = (control & ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_INIT;
 	writel(control, &port->scontrol);
+	/* Toggle control DET back to 0 (normal operation) */
+	control = (control & ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_USE;
+	writel(control, &port->scontrol);
+	/* wait for status DET to become 3 (device and 

communication OK) */

drivers/block/mvsata_ide.c +0 -0
 	while (--tout) {
 		status = readl(&port->sstatus) & 

MVSATA_SSTATUS_DET_MASK;

drivers/block/mvsata_ide.c struct mvsata_port_registers { · line 120

Quoted 7 lines
drivers/block/mvsata_ide.c +1 -2
 		if (status == MVSATA_SSTATUS_DET_DEVCOMM)
 			break;
 		udelay(1);
 	}
-	control = (control & ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_USE;
-	writel(control, &port->scontrol);
+	return (tout? 0: 1);

As suggested in earlier review, can you pls use !tout instead. Or please add a space for ":0"

Quoted 5 lines

}

/*

drivers/block/mvsata_ide.c +0 -0
@@ -125,15 +129,17 @@ int ide_preinit(void)
 {

drivers/block/mvsata_ide.c int ide_preinit(void) · line 137

Quoted 10 lines
drivers/block/mvsata_ide.c +3 -2
 	/* Enable ATA port 0 (could be SATA port 0 or 1) if declared */
 #if defined(CONFIG_SYS_ATA_IDE0_OFFSET)
-	mvsata_ide_initialize_port(
+	if (mvsata_ide_initialize_port(
 		(struct mvsata_port_registers *)
-		(CONFIG_SYS_ATA_BASE_ADDR + 
 CONFIG_SYS_ATA_IDE0_OFFSET));
+		(CONFIG_SYS_ATA_BASE_ADDR + 
 CONFIG_SYS_ATA_IDE0_OFFSET)))
+		return 1;

How about returning negative values for errors ?

drivers/block/mvsata_ide.c

Quoted 11 lines
drivers/block/mvsata_ide.c +2 -2
 #endif
 	/* Enable ATA port 1 (could be SATA port 0 or 1) if declared */
 #if defined(CONFIG_SYS_ATA_IDE1_OFFSET)
-	mvsata_ide_initialize_port(
+	if (mvsata_ide_initialize_port(
 		(struct mvsata_port_registers *)
-		(CONFIG_SYS_ATA_BASE_ADDR + 
 CONFIG_SYS_ATA_IDE1_OFFSET));
+		(CONFIG_SYS_ATA_BASE_ADDR + 

CONFIG_SYS_ATA_IDE1_OFFSET)))

drivers/block/mvsata_ide.c +1 -0
+		return 1;

Same here

Regards..
Prafulla . .

Quoted 11 lines

#endif

drivers/block/mvsata_ide.c +0 -0
 	/* return 0 as we always succeed */
 	return 0;
Signature · 6 lines
1.7.0.4

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
#2 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

Le 07/09/2010 08:42, Prafulla Wadaskar a ?crit :

Quoted 7 lines

drivers/block/mvsata_ide.c int ide_preinit(void) · line 130

Quoted 5 lines
drivers/block/mvsata_ide.c +1 -0
@@ -125,15 +129,17 @@ int ide_preinit(void)
 
+		return 1;

How about returning negative values for errors ?

Function ide_preinit() is called from cmd_ide.c:ide_init(), which does not distinguish positive vs negative return values, ony zero vs non-zero. So what would be the point of returning negative rather than positive values?

Amicalement,

Signature · 1 line
Albert.
#3 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

Quoted 19 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.aribaud at free.fr]
Sent: Tuesday, September 07, 2010 4:53 PM
To: Prafulla Wadaskar
Cc: u-boot at lists.denx.de; Prabhanjan Sarnaik; Ashish Karkare
Subject: Re: [PATCH V2] mvsata_ide: adjust port init sequence

Le 07/09/2010 08:42, Prafulla Wadaskar a ?crit :

Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/block/mvsata_ide.c

Quoted 5 lines

Review int ide_preinit(void) · line 130

Quoted 3 lines
(quoted diff) +1 -0
@@ -125,15 +129,17 @@ int ide_preinit(void)
 
+		return 1;

How about returning negative values for errors ?

Quoted 6 lines

Function ide_preinit() is called from cmd_ide.c:ide_init(), which does
not distinguish positive vs negative return values, ony zero vs non-zero. So what would be the point of returning negative rather than
positive values?

Negative always represents errors,
whereas positive may represent some valid return state. In this case it may not be that important.

Regards..
Prafulla . .

Quoted 5 lines

Amicalement,

Signature · 1 line
Albert.
#4 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

Dear Prafulla Wadaskar,

Quoted 3 lines · In message <[email protected]>…

Negative always represents errors,
whereas positive may represent some valid return state.

He. This is _not_quite_ correct. Not in U-Boot, and not in genreal.

[But your comment asking for a negative return code is valid, of course.]

Best regards,

Wolfgang Denk

Signature · 12 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Zero is an enigmatic value. It can mean success (fclose)  or  failure
(scanf).  It  can  mean  black  or  white. It can mean no permissions
(chmod) or all permissions (umask). It can mean now (setjmp) or later
(atexit). It can mean the beginning (lseek) or the end (read). It can
mean myself (getpgrp) or child (fork). It can mean  all  (kill's  1st
argument)  or  nothing  (kill's  2nd argument). It can mean `default'
(SIG_IGN) or `I don't care' (waitpid) or  `try  to  guess'  (strtol).
Indeed 0 lets you talk to God (setuid).
Verily is 0 all things to all people.
#5 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

Le 07/09/2010 16:06, Wolfgang Denk a ?crit :

Quoted 7 lines
Quoted 2 lines

Negative always represents errors,
whereas positive may represent some valid return state.

He. This is _not_quite_ correct. Not in U-Boot, and not in genreal.

[But your comment asking for a negative return code is valid, of course.]

I'm a bit lost at the logic of this last sentence. If errors are not always represented as negative return values, and especially so in U-boot, then what is the rationale for supporting a request for specifically negative error return values, rather than positive, here? Not that I mind much -- as I said, ide_init() does not mind, and that's my reference -- and I'll happily put negative error codes in V3, but I like to understand why people want things.

Amicalement,

Signature · 1 line
Albert.
#6 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

Dear Albert ARIBAUD,

Quoted 5 lines · In message <[email protected]> you wrote:

I'm a bit lost at the logic of this last sentence. If errors are not always represented as negative return values, and especially so in U-boot, then what is the rationale for supporting a request for specifically negative error return values, rather than positive, here?

Even though ther eis lots of code that could need improvement, we should not take such bad examples, but rather try to apply standard techniques instead.

Quoted 3 lines

Not that I mind much -- as I said, ide_init() does not mind, and that's my reference -- and I'll happily put negative error codes in V3, but I like to understand why people want things.

It's just a pretty common thing to do, and instead of doing the same thing in many different ways it makes some sense to use a standard way.

Best regards,

Wolfgang Denk

Signature · 9 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Absolute: Independent, irresponsible. An absolute monarchy is one  in
which  the  sovereign  does  as  he pleases so long as he pleases the
assassins. Not many absolute monarchies are left, most of them having
been replaced by limited monarchies, where the soverign's  power  for
evil (and for good) is greatly curtailed, and by republics, which are
governed by chance.                                  - Ambrose Bierce
#7 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

Le 07/09/2010 21:00, Wolfgang Denk a ?crit :

Quoted 13 lines

Dear Albert ARIBAUD,

Quoted 5 lines · In message<[email protected]> you wrote:

I'm a bit lost at the logic of this last sentence. If errors are not always represented as negative return values, and especially so in U-boot, then what is the rationale for supporting a request for specifically negative error return values, rather than positive, here?

Even though ther eis lots of code that could need improvement, we should not take such bad examples, but rather try to apply standard techniques instead.

Quoted 7 lines
Quoted 3 lines

Not that I mind much -- as I said, ide_init() does not mind, and that's my reference -- and I'll happily put negative error codes in V3, but I like to understand why people want things.

It's just a pretty common thing to do, and instead of doing the same thing in many different ways it makes some sense to use a standard way.

Understood.

Amicalement,

Signature · 1 line
Albert.
#8 lore raw

PATCH v2 1/1 mvsata_ide: adjust port init sequence

In reply to Albert Aribaud

Hello.

Quoted 8 lines · Albert Aribaud

mvsata_ide_initialize_port(): adjust init sequence (SStatus should be checked only after all writes to SControl) and return success/failure to ide_preinit().

Also, as some tests showed init durations in the hundreds of us, raise the time-out to 10 ms to be on the safe side.

[...]

Quoted 23 lines
drivers/block/mvsata_ide.c +6 -2
index 077b278..470659d 100644
@@ -97,23 +97,27 @@ struct mvsata_port_registers {
   * DET back to "no action".
   */
 
-static void mvsata_ide_initialize_port(struct mvsata_port_registers *port)
+static int mvsata_ide_initialize_port(struct mvsata_port_registers *port)
  {
  	u32 control;
  	u32 status;
-	u32 tout = 50; /* wait at most 50 us for SATA reset to complete */
+	u32 tout = 10000; /* wait at most 10 ms for SATA reset to complete */
 
+	/* Set control IPM to 3 (no low power) and DET to 1 (initialize) */
  	control = readl(&port->scontrol);
  	control = (control&  ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_INIT;
  	writel(control,&port->scontrol);
+	/* Toggle control DET back to 0 (normal operation) */
+	control = (control&  ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_USE;
+	writel(control,&port->scontrol);

drivers/block/mvsata_ide.c struct mvsata_port_registers { · line 120

Quoted 10 lines
drivers/block/mvsata_ide.c +2 -2
+	/* wait for status DET to become 3 (device and communication OK) */
  	while (--tout) {
  		status = readl(&port->sstatus)&  MVSATA_SSTATUS_DET_MASK;
  		if (status == MVSATA_SSTATUS_DET_DEVCOMM)
  			break;
  		udelay(1);
  	}
-	control = (control&  ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_USE;
-	writel(control,&port->scontrol);
+	return (tout? 0: 1);

Weren't you going to replace this with '!tout'? And anyway, you omitted
space before '?' this time, not only before ':'.

WBR, Sergei