[U-Boot] [PATCH v2 1/3] mvsata: fix ide_preinit for missing disks

[Prafulla Wadaskar]

> -----Original Message-----
> From: Simon Guinot [mailto:simon at sequanux.org]
> Sent: Wednesday, November 09, 2011 10:32 PM
> To: Prafulla Wadaskar
> Cc: u-boot at lists.denx.de; Albert ARIBAUD; Simon Guinot
> Subject: [PATCH v2 1/3] mvsata: fix ide_preinit for missing
> disks
> 
> From: Simon Guinot <simon.guinot at sequanux.org>
> 
> Consider that ide_preinit() succeed if at least one port is
> successfully
> initialized. This allows to iniatialize IDE support on a board
> with two
> SATA ports but a single hard disk available.
> 
> Signed-off-by: Simon Guinot <simon.guinot at sequanux.org>
> ---
> Changes in v2:
>  - Use MVSATA_xxx defines for exit codes.
> 
>  drivers/block/mvsata_ide.c |   14 ++++++++------
>  1 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/block/mvsata_ide.c
> b/drivers/block/mvsata_ide.c
> index 1be395f..a88d0f7 100644
> --- a/drivers/block/mvsata_ide.c
> +++ b/drivers/block/mvsata_ide.c
> @@ -150,23 +150,25 @@ static int
> mvsata_ide_initialize_port(struct mvsata_port_registers *port)
> 
>  int ide_preinit(void)
>  {
> +	int ret = MVSATA_STATUS_TIMEOUT;
>  	int status;
> +
>  	/* Enable ATA port 0 (could be SATA port 0 or 1) if
> declared */
>  #if defined(CONFIG_SYS_ATA_IDE0_OFFSET)
>  	status = mvsata_ide_initialize_port(
>  		(struct mvsata_port_registers *)
>  		(CONFIG_SYS_ATA_BASE_ADDR +
> CONFIG_SYS_ATA_IDE0_OFFSET));
> -	if (status)
> -		return status;
> +	if (status == MVSATA_STATUS_OK)
> +		ret = MVSATA_STATUS_OK;
>  #endif
>  	/* Enable ATA port 1 (could be SATA port 0 or 1) if
> declared */
>  #if defined(CONFIG_SYS_ATA_IDE1_OFFSET)
>  	status = mvsata_ide_initialize_port(
>  		(struct mvsata_port_registers *)
>  		(CONFIG_SYS_ATA_BASE_ADDR +
> CONFIG_SYS_ATA_IDE1_OFFSET));
> -	if (status)
> -		return status;
> +	if (status == MVSATA_STATUS_OK)
> +		ret = MVSATA_STATUS_OK;
>  #endif
> -	/* return success if all ports initializations succeeded */
> -	return MVSATA_STATUS_OK;
> +	/* Return success if at least one port initialization
> succeeded */
> +	return ret;
>  }

Applied to u-boot-marvell.git master branch

Regards..
Prafulla . .

> --
> 1.7.5.1