diff options
Diffstat (limited to 'drivers/mmc/card/block.c')
| -rw-r--r-- | drivers/mmc/card/block.c | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index a47f1ea..7406c4b 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1015,7 +1015,8 @@ static int mmc_blk_err_check(struct mmc_card *card, if (brq->sbc.error || brq->cmd.error || brq->stop.error || brq->data.error) { #if defined(CONFIG_MACH_M0) || defined(CONFIG_MACH_P4NOTE) || \ - defined(CONFIG_MACH_C1_USA_ATT) + defined(CONFIG_MACH_C1_USA_ATT) \ + || defined(CONFIG_MACH_GRANDE) || defined(CONFIG_MACH_IRON) if (mmc_card_mmc(card)) { pr_err("brq->sbc.opcode=%d," "brq->cmd.opcode=%d.\n", @@ -1354,6 +1355,11 @@ static u8 mmc_blk_prep_packed_list(struct mmc_queue *mq, struct request *req) } while (reqs < max_packed_rw - 1) { + /* We should stop no-more packing its nopacked_period */ + if ((card->host->caps2 & MMC_CAP2_ADAPT_PACKED) + && mmc_is_nopacked_period(mq)) + break; + spin_lock_irq(q->queue_lock); next = blk_fetch_request(q); spin_unlock_irq(q->queue_lock); @@ -1939,7 +1945,8 @@ snd_packed_rd: } } #if defined(CONFIG_MACH_M0) || defined(CONFIG_MACH_P4NOTE) || \ - defined(CONFIG_MACH_C1_USA_ATT) + defined(CONFIG_MACH_C1_USA_ATT) \ + || defined(CONFIG_MACH_GRANDE) || defined(CONFIG_MACH_IRON) /* * It's for Engineering DEBUGGING only * This has to be removed before PVR(guessing) @@ -2016,7 +2023,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_MOVINAND_SECURE)) ret = mmc_blk_issue_secdiscard_rq(mq, req); else ret = mmc_blk_issue_discard_rq(mq, req); @@ -2289,6 +2297,8 @@ static int mmc_add_disk(struct mmc_blk_data *md) return ret; } +#define CID_MANFID_SAMSUNG 0x15 + static const struct mmc_fixup blk_fixups[] = { MMC_FIXUP("SEM02G", 0x2, 0x100, add_quirk, MMC_QUIRK_INAND_CMD38), @@ -2311,6 +2321,28 @@ static const struct mmc_fixup blk_fixups[] = MMC_QUIRK_BLK_NO_CMD23), MMC_FIXUP("MMC32G", 0x11, CID_OEMID_ANY, add_quirk_mmc, MMC_QUIRK_BLK_NO_CMD23), + + /* + * Some issue about secure erase/secure trim for Samsung MoviNAND + */ + + MMC_FIXUP("M8G2FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_MOVINAND_SECURE), + MMC_FIXUP("MAG4FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_MOVINAND_SECURE), + MMC_FIXUP("MBG8FA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_MOVINAND_SECURE), + MMC_FIXUP("MCGAFA", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_MOVINAND_SECURE), + MMC_FIXUP("VAL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_MOVINAND_SECURE), + MMC_FIXUP("VYL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_MOVINAND_SECURE), + MMC_FIXUP("KYL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_MOVINAND_SECURE), + MMC_FIXUP("VZL00M", CID_MANFID_SAMSUNG, CID_OEMID_ANY, add_quirk_mmc, + MMC_QUIRK_MOVINAND_SECURE), + END_FIXUP }; @@ -2458,7 +2490,11 @@ static void __exit mmc_blk_exit(void) unregister_blkdev(MMC_BLOCK_MAJOR, "mmc"); } +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(mmc_blk_init); +#else module_init(mmc_blk_init); +#endif module_exit(mmc_blk_exit); MODULE_LICENSE("GPL"); |