mmc: core: allow detection of locked cards
PATCH 1/1 mmc: core: allow detection of locked cards
From: Daniel Kucera <[email protected]>
--- drivers/mmc/core/sd.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/mmc/core/sd.c +16 -3
@@ -1475,9 +1475,22 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, goto free_card; } - err =mmc_sd_setup_card (host, card, oldcard !=NULL ); -if (err) - goto free_card; +u32 card_status; + + err =mmc_send_status (card, &card_status); +if (err){ +pr_err ("%s: unable to get card status\n" , +mmc_hostname (host)); + goto free_card; + } + +if (card_status &R1_CARD_IS_LOCKED ){ +pr_warn ("%s: card is locked\n" ,mmc_hostname (host)); + }else { + err =mmc_sd_setup_card (host, card, oldcard !=NULL ); +if (err) + goto free_card; + }/* * If the card has not been power cycled, it may still be using 1.8V
Signature · 1 line
2.34.1
Quoted 2 lines
From: Daniel Kucera <[email protected]>
Please don't leave the commit log empty.
drivers/mmc/core/sd.c static int mmc_sd_init_card(struct mmc_host · line 1475
Quoted 12 lines
Signed-off-by Daniel Kucera <[email protected]>--- drivers/mmc/core/sd.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)drivers/mmc/core/sd.c index renamed from drivers/mmc/core/sd.c +0
-0
1c8148cdd..b22c30348100644drivers/mmc/core/sd.c +0
-0@@ -1475,9 +1475,22 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
Aren't you be needing a similar handling for the eMMC side as well?
Thanks,
Avri
Quoted 28 lines
drivers/mmc/core/sd.c +16
-3goto free_card; } - err =mmc_sd_setup_card (host, card, oldcard !=NULL ); -if (err) - goto free_card; +u32 card_status; + + err =mmc_send_status (card, &card_status); +if (err){ +pr_err ("%s: unable to get card status\n" , +mmc_hostname (host)); + goto free_card; + } + +if (card_status &R1_CARD_IS_LOCKED ){ +pr_warn ("%s: card is locked\n" ,mmc_hostname (host)); + }else { + err =mmc_sd_setup_card (host, card, oldcard !=NULL ); +if (err) + goto free_card; + }/* * If the card has not been power cycled, it may still be using 1.8V
--
2.34.1
Quoted 27 lines · On 5/21/24 22:04, [email protected] wrote:
From: Daniel Kucera <[email protected]>
Signed-off-by Daniel Kucera <[email protected]>--- drivers/mmc/core/sd.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)drivers/mmc/core/sd.c +9
-3@@ -1475,9 +1475,22 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, goto free_card; } - err =mmc_sd_setup_card (host, card, oldcard !=NULL ); -if (err) - goto free_card; +u32 card_status; + + err =mmc_send_status (card, &card_status); +if (err){ +pr_err ("%s: unable to get card status\n" , +mmc_hostname (host)); + goto free_card; + } +
drivers/mmc/core/sd.c static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, · line 1496
Quoted 10 lines
drivers/mmc/core/sd.c +7
-0+if (card_status &R1_CARD_IS_LOCKED ){ +pr_warn ("%s: card is locked\n" ,mmc_hostname (host)); + }else { + err =mmc_sd_setup_card (host, card, oldcard !=NULL ); +if (err) + goto free_card; + }/* * If the card has not been power cycled, it may still be using 1.8V
Does that work for you?
I vaguely remember adding some checks before the block device setup and some recovery as well since the partition scan (will fail) already triggered resets.
Quoted 37 lines · Christian Loehle
Quoted 36 lines · On 5/21/24 22:04, [email protected] wrote:
From: Daniel Kucera <[email protected]>
Signed-off-by Daniel Kucera <[email protected]>--- drivers/mmc/core/sd.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)drivers/mmc/core/sd.c +16
-3@@ -1475,9 +1475,22 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, goto free_card; } - err =mmc_sd_setup_card (host, card, oldcard !=NULL ); -if (err) - goto free_card; +u32 card_status; + + err =mmc_send_status (card, &card_status); +if (err){ +pr_err ("%s: unable to get card status\n" , +mmc_hostname (host)); + goto free_card; + } + +if (card_status &R1_CARD_IS_LOCKED ){ +pr_warn ("%s: card is locked\n" ,mmc_hostname (host)); + }else { + err =mmc_sd_setup_card (host, card, oldcard !=NULL ); +if (err) + goto free_card; + }
Quoted 6 lines
Quoted 2 lines
drivers/mmc/core/sd.c +0
-0/* * If the card has not been power cycled, it may still be using 1.8V
Does that work for you?
I vaguely remember adding some checks before the block device setup and some recovery as well since the partition scan (will fail) already triggered resets.
Yes, it does, it shows a few read errors but then I run the unlock and mount without problems. See:
[819348.273781] mmc1: card is locked [819348.275379] mmc1: new SD card at address 0001 [819348.276149] mmcblk1: mmc1:0001 00000 1.89 GiB [819351.379473] mmc1: card is locked [819351.983845] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819351.983861] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819355.631723] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819355.631734] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819359.279802] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819359.279813] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819359.279827] ldm_validate_partition_table(): Disk read failed. [819362.927837] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819362.927863] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819366.575712] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819366.575724] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819370.223933] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819370.223958] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819373.875932] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819373.875952] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819373.875978] Dev mmcblk1: unable to read RDB block 0 [819377.520037] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819377.520062] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819381.167907] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819381.167933] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819384.815750] I/O error, dev mmcblk1, sector 24 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819384.815776] Buffer I/O error on dev mmcblk1, logical block 3, async page read [819388.463981] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819388.464007] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819392.111760] I/O error, dev mmcblk1, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819392.111770] Buffer I/O error on dev mmcblk1, logical block 0, async page read [819392.111786] mmcblk1: unable to read partition table [819395.759713] I/O error, dev mmcblk1, sector 3964800 op 0x0:(READ) flags 0x80700 phys_seg 1 prio class 2 [819399.408666] I/O error, dev mmcblk1, sector 3964800 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 2 [819399.408691] Buffer I/O error on dev mmcblk1, logical block 495600, async page read
I waited several minutes and then I run the unlock and the partition is detected automatically:
[820514.276616] mmcblk1: p1
Quoted 37 lines · On 5/21/24 22:04, [email protected] wrote:
From: Daniel Kucera <[email protected]>
Signed-off-by Daniel Kucera <[email protected]>--- drivers/mmc/core/sd.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)drivers/mmc/core/sd.c +16
-3@@ -1475,9 +1475,22 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, goto free_card; } - err =mmc_sd_setup_card (host, card, oldcard !=NULL ); -if (err) - goto free_card; +u32 card_status; + + err =mmc_send_status (card, &card_status); +if (err){ +pr_err ("%s: unable to get card status\n" , +mmc_hostname (host)); + goto free_card; + } + +if (card_status &R1_CARD_IS_LOCKED ){ +pr_warn ("%s: card is locked\n" ,mmc_hostname (host)); + }else { + err =mmc_sd_setup_card (host, card, oldcard !=NULL ); +if (err) + goto free_card; + }/* * If the card has not been power cycled, it may still be using 1.8V