On Tue, 25 May 2010 18:10:28 +0200 (CEST)
Micha__ Miros__aw <mirq-linux@xxxxxxxxxxxx> wrote:
> ---
There's really nothing at all to be said? I don't even know what
"SD-combo" _is_. Help us out here!
Why do we need this patch? What happens if we don't have it? Where's
the value to our users? etcetera.
>
> ...
>
> @@ -144,10 +145,10 @@ static int sdio_enable_wide(struct mmc_card *card)
> u8 ctrl;
>
> if (!(card->host->caps & MMC_CAP_4_BIT_DATA))
> - return 0;
> + return -EOPNOTSUPP;
grr.
"The requested operation is not supported on this type of object.
This usually occurs if you are trying to accept(2) a non SOCK_STREAM
socket."
So if this EOPNOTSUPP gets propagated back to userspace, our poor user
will be looking at his networking code wondering what he did wrong!
Please, just because an error code sounds appropriate, that doesn't
mean that it was the correct thing to use. ENXIO might be appropriate,
but when in doubt, plain old EIO is good.
> +static int sdio_enable_hs(struct mmc_card *card)
> +{
> + int err;
> +
> + err = mmc_sdio_switch_hs(card, true);
> + if (err)
> + return err;
> +
> + if (card->type == MMC_TYPE_SD_COMBO) {
> + err = mmc_sd_switch_hs(card);
> + if (err == -EOPNOTSUPP)
> + mmc_sdio_switch_hs(card, false);
> + }
Now, if the EOPNOTSUPP is purely for internal use and never gets
propagated back to userspace then I _guess_ that's acceptable. It's a
kind of internal overloading of an inappropriate identifier for MMC's
own usage.
But it would be clearer and cleaner to not borrow the Unix errnos in
this fashion. Better to define a set of MMC-specific error codes and
put them in an MMC-specific header file.
> @@ -295,6 +356,34 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
>
> card->type = MMC_TYPE_SDIO;
>
> + if (!oldcard || oldcard->type == MMC_TYPE_SDIO) {
> + u32 cid[4];
> +
> + err = mmc_sd_get_cid(host, host->ocr & ocr, cid);
> + if (!err) {
> + /* this is SD-combo card */
> + if (oldcard && oldcard->type == MMC_TYPE_SDIO) {
> + err = -ENOENT;
> + goto remove;
> + }
> + card->type = MMC_TYPE_SD_COMBO;
> + memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
> + }
> + } else if (oldcard->type == MMC_TYPE_SD_COMBO) {
> + u32 cid[4];
> +
> + err = mmc_sd_get_cid(host, host->ocr & ocr, cid);
> + if (err) {
> + /* this is SDIO-only card */
> + goto remove;
> + }
> +
> + if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0) {
> + err = -ENOENT;
> + goto remove;
> + }
> + }
Be aware that gcc has a habit of being inefficient with local
variables. It will probably allocate 32 bytes of stack for the above
two cid[] arrays. But it could have allocated just 16 bytes.
It's not a big problem in this particular case, but it should be
remembered. Unfortunately any C-level workaround for this involves
making the source code nastier :(
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
