Re: [patch 1/5] Add MMC password protection (lock/unlock) support V3

[Russell King <rmk+lkml@arm.linux.org.uk>]

Please send patches as text/plain - it makes it difficult to reply to
them otherwise.

On Mon, Jan 09, 2006 at 06:15:00PM -0400, Anderson Briglia wrote:
> When a card is locked, only commands from the "basic" and "lock card" classes
> are accepted. To be able to use the other commands, the card must be unlocked
> first.

I don't think this works as you intend.

When a card is initially inserted, we discover the cards via mmc_setup()
and mmc_discover_cards().  This means that we'll never set the locked
status for newly inserted cards.

> ===================================================================
> --- linux-2.6.15-rc4.orig/drivers/mmc/mmc.c	2005-12-15 14:06:52.000000000 -0400
> +++ linux-2.6.15-rc4/drivers/mmc/mmc.c	2005-12-15 17:00:37.000000000 -0400
> @@ -986,10 +986,15 @@ static void mmc_check_cards(struct mmc_h
>  		cmd.flags = MMC_RSP_R1;
>  
>  		err = mmc_wait_for_cmd(host, &cmd, CMD_RETRIES);
> -		if (err == MMC_ERR_NONE)
> +		if (err != MMC_ERR_NONE) {
> +			mmc_card_set_dead(card);
>  			continue;
> +		}
>  
> -		mmc_card_set_dead(card);
> +		if (cmd.resp[0] & R1_CARD_IS_LOCKED)
> +			mmc_card_set_locked(card);
> +		else
> +			card->state &= ~MMC_STATE_LOCKED;

We need a mmc_card_clear_locked() here.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core