mmc: card: Skip secure option for MoviNAND.

PATCH Superseded IAN CHEN 5 participants 6 messages Aug 14, 2012 – Aug 16, 2012 MMC, SD and SDIO

Share & tools

IAN CHEN

author

2012-08-14 07:10 UTC #0 lore raw

PATCH v3 1/1 mmc: card: Skip secure option for MoviNAND.

For several MoviNAND, there are some known issue with secure option. For these specific MoviNAND device, we skip secure option.

You could refer this discussion in XDA developers.
http://forum.xda-developers.com/showthread.php?t=1644364
https://plus.google.com/111398485184813224730/posts/21pTYfTsCkB#111398485184813224730/posts/21pTYfTsCkB

Signed-off-by Ian Chen <[email protected]>

---
 drivers/mmc/card/block.c |   24 +++++++++++++++++++++++-
 include/linux/mmc/card.h |    1 +
 2 files changed, 24 insertions(+), 1 deletions(-)

drivers/mmc/card/block.c +0 -0

index f1c84de..8d2de7e 100644
@@ -1411,7 +1411,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq,

struct request *req)
/* complete ongoing async transfer before issuing discard */ if (card->host->areq)
mmc_blk_issue_rw_rq(mq, NULL);
- if (req->cmd_flags & REQ_SECURE)
+ if (req->cmd_flags & REQ_SECURE &&
+ !(card->quirks & MMC_QUIRK_SECURE_MODE_BROKEN))
ret = mmc_blk_issue_secdiscard_rq(mq, req);
else
ret = mmc_blk_issue_discard_rq(mq, req);
@@ -1716,6 +1717,7 @@ force_ro_fail:
#define CID_MANFID_SANDISK 0x2
#define CID_MANFID_TOSHIBA 0x11
#define CID_MANFID_MICRON 0x13
+#define CID_MANFID_SAMSUNG 0x15

static const struct mmc_fixup blk_fixups[] =
{
@@ -1752,6 +1754,26 @@ static const struct mmc_fixup blk_fixups[] =
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc,
MMC_QUIRK_LONG_READ_TIME),

+ /*
+ * Some issue about secure erase/secure trim for Samsung MoviNAND
+ */
+ MMC_FIXUP("M8G2FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+ MMC_QUIRK_SECURE_MODE_BROKEN),
+ MMC_FIXUP("MAG4FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+ MMC_QUIRK_SECURE_MODE_BROKEN),
+ MMC_FIXUP("MBG8FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+ MMC_QUIRK_SECURE_MODE_BROKEN),
+ MMC_FIXUP("MCGAFA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+ MMC_QUIRK_SECURE_MODE_BROKEN),
+ MMC_FIXUP("VAL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+ MMC_QUIRK_SECURE_MODE_BROKEN),
+ MMC_FIXUP("VYL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+ MMC_QUIRK_SECURE_MODE_BROKEN),
+ MMC_FIXUP("KYL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+ MMC_QUIRK_SECURE_MODE_BROKEN),
+ MMC_FIXUP("VZL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+ MMC_QUIRK_SECURE_MODE_BROKEN),
+
END_FIXUP
};

include/linux/mmc/card.h +0 -0

index 111aca5..e7ec522 100644
@@ -239,6 +239,7 @@ struct mmc_card {
 #define MMC_QUIRK_BLK_NO_CMD23	(1<<7)		/* Avoid CMD23 for regular

Signature · 1 line

1.7.0.4

Namjae Jeon

Reviewed-by on v3 1/1

2012-08-14 07:23 UTC #1 lore raw

2012/8/14, IAN CHEN <[email protected]>:

Quoted 9 lines

For several MoviNAND, there are some known issue with secure option. For these specific MoviNAND device, we skip secure option.
You could refer this discussion in XDA developers.
http://forum.xda-developers.com/showthread.php?t=1644364
https://plus.google.com/111398485184813224730/posts/21pTYfTsCkB#111398485184813224730/posts/21pTYfTsCkB
Signed-off-by Ian Chen <[email protected]>
---

Looks good.

Reviewed-by Namjae Jeon <[email protected]>

Linus Walleij

2012-08-14 08:06 UTC #2 lore raw

In reply to IAN CHEN

Quoted 2 lines · IAN CHEN

+#define MMC_QUIRK_SECURE_MODE_BROKEN (1<<10) /* Skip secure for
erase/trim */

OK this will work and sorry for being picky, but we are working with RPMB support and that's some other "secure mode" so to avoid any misuderstandings it's better to name the flag like I proposed, MMC_QUIRK_SEC_ERASE_TRIM_BROKEN

I won't die if this goes in though :-)

Yours,
Linus Walleij

IAN CHEN

author

2012-08-16 04:08 UTC #3 lore raw

MMC_QUIRK_SEC_ERASE_TRIM_BROKEN seems quite clear but I might not use "SEC" due to it could be Samsung Electronics Corporation.
So, how about MMC_QUIRK_SECDISCARD_BROKEN which was used in mmc_blk_issue_secdiscard_rq() naming, the function we skip.
Or, MMC_QUIRK_SECERASE_SECTRIM_BROKEN?

Regards,
Ian
-----Original Message-----
From: Linus Walleij [mailto:[email protected]]
Sent: Tuesday, August 14, 2012 5:07 PM
To: IAN CHEN
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v3] mmc: card: Skip secure option for MoviNAND.

Quoted 2 lines · IAN CHEN

+#define MMC_QUIRK_SECURE_MODE_BROKEN (1<<10) /* Skip secure for
erase/trim */

I won't die if this goes in though :-)

Yours,
Linus Walleij

Jaehoon Chung

2012-08-16 04:14 UTC #4 lore raw

Quoted 2 lines · IAN CHEN

MMC_QUIRK_SEC_ERASE_TRIM_BROKEN seems quite clear but I might not use "SEC" due to it could be Samsung Electronics Corporation.

I didn't think so.
MMC developers didn't think that SEC means Samsung Electronics Corporation. Already we used the flags with "_SEC_"
It's no problem.

Best Regards,
Jaehoon Chung

Quoted 36 lines

So, how about MMC_QUIRK_SECDISCARD_BROKEN which was used in mmc_blk_issue_secdiscard_rq() naming, the function we skip. Or, MMC_QUIRK_SECERASE_SECTRIM_BROKEN?
Regards,
Ian
-----Original Message-----
From: Linus Walleij [mailto:[email protected]]
Sent: Tuesday, August 14, 2012 5:07 PM
To: IAN CHEN
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v3] mmc: card: Skip secure option for MoviNAND.
Quoted 2 lines · IAN CHEN
+#define MMC_QUIRK_SECURE_MODE_BROKEN (1<<10) /* Skip secure for
erase/trim */
OK this will work and sorry for being picky, but we are working with RPMB support and that's some other "secure mode" so to avoid any misuderstandings it's better to name the flag like I proposed, MMC_QUIRK_SEC_ERASE_TRIM_BROKEN
I won't die if this goes in though :-)
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Jae hoon Chung

Acked-by Jaehoon Chung on v3 1/1

2012-08-14 19:07 UTC #5 lore raw

In reply to IAN CHEN

Looks good to me

Acked-by Jaehoon Chung <[email protected]>

2012/8/14 IAN CHEN <[email protected]>:

Quoted 84 lines

For several MoviNAND, there are some known issue with secure option. For these specific MoviNAND device, we skip secure option.

Signed-off-by Ian Chen <[email protected]>

---
 drivers/mmc/card/block.c |   24 +++++++++++++++++++++++-
 include/linux/mmc/card.h |    1 +
 2 files changed, 24 insertions(+), 1 deletions(-)

drivers/mmc/card/block.c +2 -1

index f1c84de..8d2de7e 100644
@@ -1411,7 +1411,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq,
 struct request *req)
                /* complete ongoing async transfer before issuing discard */
                if (card->host->areq)
                        mmc_blk_issue_rw_rq(mq, NULL);
-               if (req->cmd_flags & REQ_SECURE)
+               if (req->cmd_flags & REQ_SECURE &&
+                       !(card->quirks & MMC_QUIRK_SECURE_MODE_BROKEN))
                        ret = mmc_blk_issue_secdiscard_rq(mq, req);
                else

                        ret = mmc_blk_issue_discard_rq(mq, req);

drivers/mmc/card/block.c +21 -0

@@ -1716,6 +1717,7 @@ force_ro_fail:
 #define CID_MANFID_SANDISK     0x2
 #define CID_MANFID_TOSHIBA     0x11
 #define CID_MANFID_MICRON      0x13
+#define CID_MANFID_SAMSUNG     0x15
 
 static const struct mmc_fixup blk_fixups[] =
 {

@@ -1752,6 +1754,26 @@ static const struct mmc_fixup blk_fixups[] =
        MMC_FIXUP(CID_NAME_ANY, CID_MANFID_MICRON, 0x200, add_quirk_mmc,
                  MMC_QUIRK_LONG_READ_TIME),
 
+       /*
+        * Some issue about secure erase/secure trim for Samsung MoviNAND
+        */
+       MMC_FIXUP("M8G2FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+                 MMC_QUIRK_SECURE_MODE_BROKEN),
+       MMC_FIXUP("MAG4FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+                 MMC_QUIRK_SECURE_MODE_BROKEN),
+       MMC_FIXUP("MBG8FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+                 MMC_QUIRK_SECURE_MODE_BROKEN),
+       MMC_FIXUP("MCGAFA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+                 MMC_QUIRK_SECURE_MODE_BROKEN),
+       MMC_FIXUP("VAL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+                 MMC_QUIRK_SECURE_MODE_BROKEN),
+       MMC_FIXUP("VYL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+                 MMC_QUIRK_SECURE_MODE_BROKEN),
+       MMC_FIXUP("KYL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+                 MMC_QUIRK_SECURE_MODE_BROKEN),
+       MMC_FIXUP("VZL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc,
+                 MMC_QUIRK_SECURE_MODE_BROKEN),
+
        END_FIXUP
 };

include/linux/mmc/card.h +0 -0

index 111aca5..e7ec522 100644
@@ -239,6 +239,7 @@ struct mmc_card {
 #define MMC_QUIRK_BLK_NO_CMD23 (1<<7)          /* Avoid CMD23 for regular

multiblock */
#define MMC_QUIRK_BROKEN_BYTE_MODE_512 (1<<8) /* Avoid sending 512
bytes in */
#define MMC_QUIRK_LONG_READ_TIME (1<<9) /* Data read time > CSD says */
+#define MMC_QUIRK_SECURE_MODE_BROKEN (1<<10) /* Skip secure for
erase/trim */
/* byte mode */
unsigned int poweroff_notify_state; /* eMMC4.5 notify feature */
#define MMC_NO_POWER_NOTIFICATION 0
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html