diff options
| author | singhome_lee <singhome_lee@asus.com> | 2012-09-20 13:54:43 +0800 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-02-03 16:46:22 +0100 |
| commit | ba18f86d405f3188eb2656dbf629845aa5b4759f (patch) | |
| tree | 6d43e07781936dd4fbe06910bf92af4f2a1060d0 /drivers/mmc/core/mmc.c | |
| parent | dadec4519ba16fa9fd4d95270d009f08a1811577 (diff) | |
mmc: core: new discard feature support at Samsung eMMC v4.41+.
Support discard feature if MID field in the CID register is 0x15, EXT.CSD[192]
(device version) is 5 and Bit 0 in the EXT.CSD[64] is 1. Also removed REQ_SECURE flag
check to avoid kernel hang.
This patch is released from samsung.
Change-Id: I4023a900680e9bca10c40311b09ed077a22617db
(cherry picked from commit 4acc227edfb631d377e14911287c1b73682fc9c2)
Conflicts:
drivers/mmc/card/block.c
Diffstat (limited to 'drivers/mmc/core/mmc.c')
| -rwxr-xr-x[-rw-r--r--] | drivers/mmc/core/mmc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index a5e09b8ee068..9af23fe2ae8f 100644..100755 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -443,6 +443,9 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) else card->erased_byte = 0x0; + if ((card->cid.manfid == 0x15) && (ext_csd[64] & 0x01)) + card->ext_csd.feature_support |= MMC_DISCARD_FEATURE; + out: return err; } |