Re: [patch 3/4 2.6.23-rc2 + mm2-git-mmc] MMC core learns about SPI

[David Brownell <david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>]

This wasn't merged correctly into 2.6.23-rc2-mm2's version of git-mmc,
and that goof guarantees oopsing while enumerating at least SD-cards.

When the merge botch is fixed, that version of git-mmc.patch passes
sanity testing with MMC-over-SPI.


On Wednesday 08 August 2007, David Brownell wrote:
>
>	...
>
> --- g26.orig/drivers/mmc/core/mmc_ops.c 2007-08-08 09:07:48.000000000 -0700
> +++ g26/drivers/mmc/core/mmc_ops.c      2007-08-08 09:07:57.000000000 -0700
>
>	...
>
> @@ -206,21 +229,31 @@ int mmc_send_ext_csd(struct mmc_card *ca
>         mrq.cmd = &cmd;
>         mrq.data = &data;
>  
> -       cmd.opcode = MMC_SEND_EXT_CSD;
> +       cmd.opcode = opcode;
>         cmd.arg = 0;
> -       cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
>  
> -       data.blksz = 512;
> +       /* NOTE HACK:  the MMC_RSP_SPI_R1 is always correct here, but we
> +        * rely on callers to never use this with "native" calls for reading
> +        * CSD or CID.  Native versions of those commands use the R2 type,
> +        * not R1 plus a data block.
> +        */
> +       cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
> +
> +       data.blksz = len;
>         data.blocks = 1;
>         data.flags = MMC_DATA_READ;
>         data.sg = &sg;
>         data.sg_len = 1;
>  
> -       sg_init_one(&sg, ext_csd, 512);
> +       sg_init_one(&sg, data_buf, len);
>  
> -       mmc_set_data_timeout(&data, card);
> +       if (card)
> +               mmc_set_data_timeout(&data, card);
>  
> -       mmc_wait_for_req(card->host, &mrq);
> +       mmc_wait_for_req(host, &mrq);

The line above was merged as "mmc_wait_for_req(card->host, &mrq);" ...

Note the preceding "if (card) ...".  When "card" is null, as it
usually is during SPI enumeration, this always oopses.


> +
> +       memcpy(buf, data_buf, len);
> +       kfree(data_buf);
>  
>         if (cmd.error)
>                 return cmd.error;



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/