Patchwork [U-Boot,V5,03/10] DWMMC: Initialise dwmci and resolve EMMC read write issues

login
register
mail settings
Submitter Amar
Date Jan. 21, 2013, 11:43 a.m.
Message ID <1358768638-14187-4-git-send-email-amarendra.xt@samsung.com>
Download mbox | patch
Permalink /patch/214094/
State Changes Requested
Delegated to: Minkyu Kang
Headers show

Comments

Amar - Jan. 21, 2013, 11:43 a.m.
This patch enumerates dwmci and set auto stop command during
dwmci initialisation.
EMMC read/write is not happening in current implementation
due to improper fifo size computation. Hence Modified the fifo size
computation to resolve EMMC read write issues.

Signed-off-by: Amar <amarendra.xt@samsung.com>
---
Changes since V1:
        1)Created the macros RX_WMARK_SHIFT and RX_WMARK_MASK in header file.

Changes since V2:
        1)Updation of commit message and resubmition of proper patch set.

Changes since V3:
        1)Updated to use the macro DWMCI_CTRL_SEND_AS_CCSD instead of
        the hard coded value (1 << 10).

Changes since V4:
        1)Updated the function dwmci_send_cmd() to use get_timer() instead
        of using mdelay(1).

 drivers/mmc/dw_mmc.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)
Jaehoon Chung - Jan. 22, 2013, 2:44 a.m.
Hi Amar,

On 01/21/2013 08:43 PM, Amar wrote:
> This patch enumerates dwmci and set auto stop command during
> dwmci initialisation.
> EMMC read/write is not happening in current implementation
> due to improper fifo size computation. Hence Modified the fifo size
> computation to resolve EMMC read write issues.
> 
> Signed-off-by: Amar <amarendra.xt@samsung.com>
> ---
> Changes since V1:
>         1)Created the macros RX_WMARK_SHIFT and RX_WMARK_MASK in header file.
> 
> Changes since V2:
>         1)Updation of commit message and resubmition of proper patch set.
> 
> Changes since V3:
>         1)Updated to use the macro DWMCI_CTRL_SEND_AS_CCSD instead of
>         the hard coded value (1 << 10).
> 
> Changes since V4:
>         1)Updated the function dwmci_send_cmd() to use get_timer() instead
>         of using mdelay(1).
> 
>  drivers/mmc/dw_mmc.c | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
> index 4070d4e..391ed93 100644
> --- a/drivers/mmc/dw_mmc.c
> +++ b/drivers/mmc/dw_mmc.c
> @@ -129,13 +129,13 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
>  	unsigned int timeout = 100000;
We can remove the timeout value.
If you remove this, it looks good to me.

Acked-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
Jaehoon Chung
>  	u32 retry = 10000;
>  	u32 mask, ctrl;
> +	ulong start = get_timer(0);
>  
>  	while (dwmci_readl(host, DWMCI_STATUS) & DWMCI_BUSY) {
> -		if (timeout == 0) {
> +		if (get_timer(start) > timeout) {
>  			printf("Timeout on data busy\n");
>  			return TIMEOUT;
>  		}
> -		timeout--;
>  	}
>  
>  	dwmci_writel(host, DWMCI_RINTSTS, DWMCI_INTMSK_ALL);
> @@ -143,7 +143,6 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
>  	if (data)
>  		dwmci_prepare_data(host, data);
>  
> -
>  	dwmci_writel(host, DWMCI_CMDARG, cmd->cmdarg);
>  
>  	if (data)
> @@ -314,7 +313,7 @@ static void dwmci_set_ios(struct mmc *mmc)
>  static int dwmci_init(struct mmc *mmc)
>  {
>  	struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
> -	u32 fifo_size, fifoth_val;
> +	u32 fifo_size, fifoth_val, ier;
>  
>  	dwmci_writel(host, DWMCI_PWREN, 1);
>  
> @@ -323,6 +322,14 @@ static int dwmci_init(struct mmc *mmc)
>  		return -1;
>  	}
>  
> +	/* Enumerate at 400KHz */
> +	dwmci_setup_bus(host, mmc->f_min);
> +
> +	/* Set auto stop command */
> +	ier = dwmci_readl(host, DWMCI_CTRL);
> +	ier |= DWMCI_CTRL_SEND_AS_CCSD;
> +	dwmci_writel(host, DWMCI_CTRL, ier);
> +
>  	dwmci_writel(host, DWMCI_RINTSTS, 0xFFFFFFFF);
>  	dwmci_writel(host, DWMCI_INTMASK, 0);
>  
> @@ -332,11 +339,13 @@ static int dwmci_init(struct mmc *mmc)
>  	dwmci_writel(host, DWMCI_BMOD, 1);
>  
>  	fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
> +	fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
>  	if (host->fifoth_val)
>  		fifoth_val = host->fifoth_val;
> -	else
> -		fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size/2 -1) |
> -			TX_WMARK(fifo_size/2);
> +	else {
> +		fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
> +			TX_WMARK(fifo_size / 2);
> +	}
>  	dwmci_writel(host, DWMCI_FIFOTH, fifoth_val);
>  
>  	dwmci_writel(host, DWMCI_CLKENA, 0);
>
Amarendra Reddy - Jan. 22, 2013, 5:55 a.m.
Hi Jaehoon,
The 'timeout' value cant be removed as it is being used.

Thanks & Regards
Amarendra

On 22 January 2013 08:14, Jaehoon Chung <jh80.chung@samsung.com> wrote:

> Hi Amar,
>
> On 01/21/2013 08:43 PM, Amar wrote:
> > This patch enumerates dwmci and set auto stop command during
> > dwmci initialisation.
> > EMMC read/write is not happening in current implementation
> > due to improper fifo size computation. Hence Modified the fifo size
> > computation to resolve EMMC read write issues.
> >
> > Signed-off-by: Amar <amarendra.xt@samsung.com>
> > ---
> > Changes since V1:
> >         1)Created the macros RX_WMARK_SHIFT and RX_WMARK_MASK in header
> file.
> >
> > Changes since V2:
> >         1)Updation of commit message and resubmition of proper patch set.
> >
> > Changes since V3:
> >         1)Updated to use the macro DWMCI_CTRL_SEND_AS_CCSD instead of
> >         the hard coded value (1 << 10).
> >
> > Changes since V4:
> >         1)Updated the function dwmci_send_cmd() to use get_timer()
> instead
> >         of using mdelay(1).
> >
> >  drivers/mmc/dw_mmc.c | 23 ++++++++++++++++-------
> >  1 file changed, 16 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
> > index 4070d4e..391ed93 100644
> > --- a/drivers/mmc/dw_mmc.c
> > +++ b/drivers/mmc/dw_mmc.c
> > @@ -129,13 +129,13 @@ static int dwmci_send_cmd(struct mmc *mmc, struct
> mmc_cmd *cmd,
> >       unsigned int timeout = 100000;
> We can remove the timeout value.
> If you remove this, it looks good to me.
>
> Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
>
> Best Regards,
> Jaehoon Chung
>  >       u32 retry = 10000;
> >       u32 mask, ctrl;
> > +     ulong start = get_timer(0);
> >
> >       while (dwmci_readl(host, DWMCI_STATUS) & DWMCI_BUSY) {
> > -             if (timeout == 0) {
> > +             if (get_timer(start) > timeout) {
> >                       printf("Timeout on data busy\n");
> >                       return TIMEOUT;
> >               }
> > -             timeout--;
> >       }
> >
> >       dwmci_writel(host, DWMCI_RINTSTS, DWMCI_INTMSK_ALL);
> > @@ -143,7 +143,6 @@ static int dwmci_send_cmd(struct mmc *mmc, struct
> mmc_cmd *cmd,
> >       if (data)
> >               dwmci_prepare_data(host, data);
> >
> > -
> >       dwmci_writel(host, DWMCI_CMDARG, cmd->cmdarg);
> >
> >       if (data)
> > @@ -314,7 +313,7 @@ static void dwmci_set_ios(struct mmc *mmc)
> >  static int dwmci_init(struct mmc *mmc)
> >  {
> >       struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
> > -     u32 fifo_size, fifoth_val;
> > +     u32 fifo_size, fifoth_val, ier;
> >
> >       dwmci_writel(host, DWMCI_PWREN, 1);
> >
> > @@ -323,6 +322,14 @@ static int dwmci_init(struct mmc *mmc)
> >               return -1;
> >       }
> >
> > +     /* Enumerate at 400KHz */
> > +     dwmci_setup_bus(host, mmc->f_min);
> > +
> > +     /* Set auto stop command */
> > +     ier = dwmci_readl(host, DWMCI_CTRL);
> > +     ier |= DWMCI_CTRL_SEND_AS_CCSD;
> > +     dwmci_writel(host, DWMCI_CTRL, ier);
> > +
> >       dwmci_writel(host, DWMCI_RINTSTS, 0xFFFFFFFF);
> >       dwmci_writel(host, DWMCI_INTMASK, 0);
> >
> > @@ -332,11 +339,13 @@ static int dwmci_init(struct mmc *mmc)
> >       dwmci_writel(host, DWMCI_BMOD, 1);
> >
> >       fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
> > +     fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
> >       if (host->fifoth_val)
> >               fifoth_val = host->fifoth_val;
> > -     else
> > -             fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size/2 -1) |
> > -                     TX_WMARK(fifo_size/2);
> > +     else {
> > +             fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
> > +                     TX_WMARK(fifo_size / 2);
> > +     }
> >       dwmci_writel(host, DWMCI_FIFOTH, fifoth_val);
> >
> >       dwmci_writel(host, DWMCI_CLKENA, 0);
> >
>
>  _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
Jaehoon Chung - Jan. 22, 2013, 6:54 a.m.
On 01/22/2013 02:55 PM, Amarendra Reddy wrote:
> Hi Jaehoon,
> The 'timeout' value cant be removed as it is being used.
Sorry..i missed it.
> 
> Thanks & Regards
> Amarendra
> 
> On 22 January 2013 08:14, Jaehoon Chung <jh80.chung@samsung.com> wrote:
> 
>> Hi Amar,
>>
>> On 01/21/2013 08:43 PM, Amar wrote:
>>> This patch enumerates dwmci and set auto stop command during
>>> dwmci initialisation.
>>> EMMC read/write is not happening in current implementation
>>> due to improper fifo size computation. Hence Modified the fifo size
>>> computation to resolve EMMC read write issues.
>>>
>>> Signed-off-by: Amar <amarendra.xt@samsung.com>
>>> ---
>>> Changes since V1:
>>>         1)Created the macros RX_WMARK_SHIFT and RX_WMARK_MASK in header
>> file.
>>>
>>> Changes since V2:
>>>         1)Updation of commit message and resubmition of proper patch set.
>>>
>>> Changes since V3:
>>>         1)Updated to use the macro DWMCI_CTRL_SEND_AS_CCSD instead of
>>>         the hard coded value (1 << 10).
>>>
>>> Changes since V4:
>>>         1)Updated the function dwmci_send_cmd() to use get_timer()
>> instead
>>>         of using mdelay(1).
>>>
>>>  drivers/mmc/dw_mmc.c | 23 ++++++++++++++++-------
>>>  1 file changed, 16 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
>>> index 4070d4e..391ed93 100644
>>> --- a/drivers/mmc/dw_mmc.c
>>> +++ b/drivers/mmc/dw_mmc.c
>>> @@ -129,13 +129,13 @@ static int dwmci_send_cmd(struct mmc *mmc, struct
>> mmc_cmd *cmd,
>>>       unsigned int timeout = 100000;
>> We can remove the timeout value.
>> If you remove this, it looks good to me.
>>
>> Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
>>
>> Best Regards,
>> Jaehoon Chung
>>  >       u32 retry = 10000;
>>>       u32 mask, ctrl;
>>> +     ulong start = get_timer(0);
>>>
>>>       while (dwmci_readl(host, DWMCI_STATUS) & DWMCI_BUSY) {
>>> -             if (timeout == 0) {
>>> +             if (get_timer(start) > timeout) {
>>>                       printf("Timeout on data busy\n");
>>>                       return TIMEOUT;
>>>               }
>>> -             timeout--;
>>>       }
>>>
>>>       dwmci_writel(host, DWMCI_RINTSTS, DWMCI_INTMSK_ALL);
>>> @@ -143,7 +143,6 @@ static int dwmci_send_cmd(struct mmc *mmc, struct
>> mmc_cmd *cmd,
>>>       if (data)
>>>               dwmci_prepare_data(host, data);
>>>
>>> -
>>>       dwmci_writel(host, DWMCI_CMDARG, cmd->cmdarg);
>>>
>>>       if (data)
>>> @@ -314,7 +313,7 @@ static void dwmci_set_ios(struct mmc *mmc)
>>>  static int dwmci_init(struct mmc *mmc)
>>>  {
>>>       struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
>>> -     u32 fifo_size, fifoth_val;
>>> +     u32 fifo_size, fifoth_val, ier;
>>>
>>>       dwmci_writel(host, DWMCI_PWREN, 1);
>>>
>>> @@ -323,6 +322,14 @@ static int dwmci_init(struct mmc *mmc)
>>>               return -1;
>>>       }
>>>
>>> +     /* Enumerate at 400KHz */
>>> +     dwmci_setup_bus(host, mmc->f_min);
>>> +
>>> +     /* Set auto stop command */
>>> +     ier = dwmci_readl(host, DWMCI_CTRL);
>>> +     ier |= DWMCI_CTRL_SEND_AS_CCSD;
>>> +     dwmci_writel(host, DWMCI_CTRL, ier);
>>> +
>>>       dwmci_writel(host, DWMCI_RINTSTS, 0xFFFFFFFF);
>>>       dwmci_writel(host, DWMCI_INTMASK, 0);
>>>
>>> @@ -332,11 +339,13 @@ static int dwmci_init(struct mmc *mmc)
>>>       dwmci_writel(host, DWMCI_BMOD, 1);
>>>
>>>       fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
>>> +     fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
>>>       if (host->fifoth_val)
>>>               fifoth_val = host->fifoth_val;
>>> -     else
>>> -             fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size/2 -1) |
>>> -                     TX_WMARK(fifo_size/2);
>>> +     else {
>>> +             fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
>>> +                     TX_WMARK(fifo_size / 2);
>>> +     }
>>>       dwmci_writel(host, DWMCI_FIFOTH, fifoth_val);
>>>
>>>       dwmci_writel(host, DWMCI_CLKENA, 0);
>>>
>>
>>  _______________________________________________
>> U-Boot mailing list
>> U-Boot@lists.denx.de
>> http://lists.denx.de/mailman/listinfo/u-boot
>>
> 
> 
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
Simon Glass - Jan. 23, 2013, 12:25 a.m.
On Mon, Jan 21, 2013 at 3:43 AM, Amar <amarendra.xt@samsung.com> wrote:
> This patch enumerates dwmci and set auto stop command during
> dwmci initialisation.
> EMMC read/write is not happening in current implementation
> due to improper fifo size computation. Hence Modified the fifo size
> computation to resolve EMMC read write issues.
>
> Signed-off-by: Amar <amarendra.xt@samsung.com>

Acked-by: Simon Glass <sjg@chromium.org>

(nit below if you resend for other reason)

> ---
> Changes since V1:
>         1)Created the macros RX_WMARK_SHIFT and RX_WMARK_MASK in header file.
>
> Changes since V2:
>         1)Updation of commit message and resubmition of proper patch set.
>
> Changes since V3:
>         1)Updated to use the macro DWMCI_CTRL_SEND_AS_CCSD instead of
>         the hard coded value (1 << 10).
>
> Changes since V4:
>         1)Updated the function dwmci_send_cmd() to use get_timer() instead
>         of using mdelay(1).
>
>  drivers/mmc/dw_mmc.c | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
> index 4070d4e..391ed93 100644
> --- a/drivers/mmc/dw_mmc.c
> +++ b/drivers/mmc/dw_mmc.c

> @@ -323,6 +322,14 @@ static int dwmci_init(struct mmc *mmc)
>                 return -1;
>         }
>
> +       /* Enumerate at 400KHz */
> +       dwmci_setup_bus(host, mmc->f_min);
> +
> +       /* Set auto stop command */
> +       ier = dwmci_readl(host, DWMCI_CTRL);
> +       ier |= DWMCI_CTRL_SEND_AS_CCSD;
> +       dwmci_writel(host, DWMCI_CTRL, ier);
> +
>         dwmci_writel(host, DWMCI_RINTSTS, 0xFFFFFFFF);
>         dwmci_writel(host, DWMCI_INTMASK, 0);
>
> @@ -332,11 +339,13 @@ static int dwmci_init(struct mmc *mmc)
>         dwmci_writel(host, DWMCI_BMOD, 1);
>
>         fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
> +       fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
>         if (host->fifoth_val)
>                 fifoth_val = host->fifoth_val;

should be {} around this I think.

> -       else
> -               fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size/2 -1) |
> -                       TX_WMARK(fifo_size/2);
> +       else {
> +               fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
> +                       TX_WMARK(fifo_size / 2);
> +       }
>         dwmci_writel(host, DWMCI_FIFOTH, fifoth_val);
>
>         dwmci_writel(host, DWMCI_CLKENA, 0);
> --
> 1.8.0
>
Amarendra Reddy - Jan. 28, 2013, 9:25 a.m.
Hi Simon,

Please find the response below.

Thanks & Regards
Amarendra

On 23 January 2013 05:55, Simon Glass <sjg@chromium.org> wrote:

> On Mon, Jan 21, 2013 at 3:43 AM, Amar <amarendra.xt@samsung.com> wrote:
> > This patch enumerates dwmci and set auto stop command during
> > dwmci initialisation.
> > EMMC read/write is not happening in current implementation
> > due to improper fifo size computation. Hence Modified the fifo size
> > computation to resolve EMMC read write issues.
> >
> > Signed-off-by: Amar <amarendra.xt@samsung.com>
>
> Acked-by: Simon Glass <sjg@chromium.org>
>
> (nit below if you resend for other reason)
>
> > ---
> > Changes since V1:
> >         1)Created the macros RX_WMARK_SHIFT and RX_WMARK_MASK in header
> file.
> >
> > Changes since V2:
> >         1)Updation of commit message and resubmition of proper patch set.
> >
> > Changes since V3:
> >         1)Updated to use the macro DWMCI_CTRL_SEND_AS_CCSD instead of
> >         the hard coded value (1 << 10).
> >
> > Changes since V4:
> >         1)Updated the function dwmci_send_cmd() to use get_timer()
> instead
> >         of using mdelay(1).
> >
> >  drivers/mmc/dw_mmc.c | 23 ++++++++++++++++-------
> >  1 file changed, 16 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
> > index 4070d4e..391ed93 100644
> > --- a/drivers/mmc/dw_mmc.c
> > +++ b/drivers/mmc/dw_mmc.c
>
> > @@ -323,6 +322,14 @@ static int dwmci_init(struct mmc *mmc)
> >                 return -1;
> >         }
> >
> > +       /* Enumerate at 400KHz */
> > +       dwmci_setup_bus(host, mmc->f_min);
> > +
> > +       /* Set auto stop command */
> > +       ier = dwmci_readl(host, DWMCI_CTRL);
> > +       ier |= DWMCI_CTRL_SEND_AS_CCSD;
> > +       dwmci_writel(host, DWMCI_CTRL, ier);
> > +
> >         dwmci_writel(host, DWMCI_RINTSTS, 0xFFFFFFFF);
> >         dwmci_writel(host, DWMCI_INTMASK, 0);
> >
> > @@ -332,11 +339,13 @@ static int dwmci_init(struct mmc *mmc)
> >         dwmci_writel(host, DWMCI_BMOD, 1);
> >
> >         fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
> > +       fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
> >         if (host->fifoth_val)
> >                 fifoth_val = host->fifoth_val;
>
> should be {} around this I think.
>
Ok will be updated in next version patchset.

>
> > -       else
> > -               fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size/2 -1) |
> > -                       TX_WMARK(fifo_size/2);
> > +       else {
> > +               fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
> > +                       TX_WMARK(fifo_size / 2);
> > +       }
> >         dwmci_writel(host, DWMCI_FIFOTH, fifoth_val);
> >
> >         dwmci_writel(host, DWMCI_CLKENA, 0);
> > --
> > 1.8.0
> >
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

Patch

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 4070d4e..391ed93 100644
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -129,13 +129,13 @@  static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
 	unsigned int timeout = 100000;
 	u32 retry = 10000;
 	u32 mask, ctrl;
+	ulong start = get_timer(0);
 
 	while (dwmci_readl(host, DWMCI_STATUS) & DWMCI_BUSY) {
-		if (timeout == 0) {
+		if (get_timer(start) > timeout) {
 			printf("Timeout on data busy\n");
 			return TIMEOUT;
 		}
-		timeout--;
 	}
 
 	dwmci_writel(host, DWMCI_RINTSTS, DWMCI_INTMSK_ALL);
@@ -143,7 +143,6 @@  static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
 	if (data)
 		dwmci_prepare_data(host, data);
 
-
 	dwmci_writel(host, DWMCI_CMDARG, cmd->cmdarg);
 
 	if (data)
@@ -314,7 +313,7 @@  static void dwmci_set_ios(struct mmc *mmc)
 static int dwmci_init(struct mmc *mmc)
 {
 	struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
-	u32 fifo_size, fifoth_val;
+	u32 fifo_size, fifoth_val, ier;
 
 	dwmci_writel(host, DWMCI_PWREN, 1);
 
@@ -323,6 +322,14 @@  static int dwmci_init(struct mmc *mmc)
 		return -1;
 	}
 
+	/* Enumerate at 400KHz */
+	dwmci_setup_bus(host, mmc->f_min);
+
+	/* Set auto stop command */
+	ier = dwmci_readl(host, DWMCI_CTRL);
+	ier |= DWMCI_CTRL_SEND_AS_CCSD;
+	dwmci_writel(host, DWMCI_CTRL, ier);
+
 	dwmci_writel(host, DWMCI_RINTSTS, 0xFFFFFFFF);
 	dwmci_writel(host, DWMCI_INTMASK, 0);
 
@@ -332,11 +339,13 @@  static int dwmci_init(struct mmc *mmc)
 	dwmci_writel(host, DWMCI_BMOD, 1);
 
 	fifo_size = dwmci_readl(host, DWMCI_FIFOTH);
+	fifo_size = ((fifo_size & RX_WMARK_MASK) >> RX_WMARK_SHIFT) + 1;
 	if (host->fifoth_val)
 		fifoth_val = host->fifoth_val;
-	else
-		fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size/2 -1) |
-			TX_WMARK(fifo_size/2);
+	else {
+		fifoth_val = MSIZE(0x2) | RX_WMARK(fifo_size / 2 - 1) |
+			TX_WMARK(fifo_size / 2);
+	}
 	dwmci_writel(host, DWMCI_FIFOTH, fifoth_val);
 
 	dwmci_writel(host, DWMCI_CLKENA, 0);