Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99bb5e56 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: host: add support to allow SANITIZE operation"

parents 5d251fe0 d217a615

drivers/mmc/card/block.c

+5 −4
Original line number Diff line number Diff line
@@ -567,7 +567,8 @@ static int ioctl_do_sanitize(struct mmc_card *card) 
{

	int err;



	if (!mmc_can_sanitize(card)) {

	if (!mmc_can_sanitize(card) &&

			(card->host->caps2 & MMC_CAP2_SANITIZE)) {

		pr_warn("%s: %s - SANITIZE is not supported\n",

				mmc_hostname(card->host), __func__);

		err = -EOPNOTSUPP;

drivers/mmc/host/sdhci-msm.c

+1 −0
Original line number Diff line number Diff line
@@ -3421,6 +3421,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	msm_host->mmc->caps2 |= MMC_CAP2_ASYNC_SDIO_IRQ_4BIT_MODE;

	msm_host->mmc->caps2 |= MMC_CAP2_HS400_POST_TUNING;

	msm_host->mmc->caps2 |= MMC_CAP2_CLK_SCALE;

	msm_host->mmc->caps2 |= MMC_CAP2_SANITIZE;



	if (msm_host->pdata->nonremovable)

		msm_host->mmc->caps |= MMC_CAP_NONREMOVABLE;

include/linux/mmc/host.h

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ struct mmc_host { 
#define MMC_CAP2_HS400_POST_TUNING	(1 << 21)

#define MMC_CAP2_NONHOTPLUG	(1 << 25)	/*Don't support hotplug*/

#define MMC_CAP2_CMD_QUEUE	(1 << 26)	/* support eMMC command queue */



#define MMC_CAP2_SANITIZE       (1 << 27)               /* Support Sanitize */

	mmc_pm_flag_t		pm_caps;	/* supported pm features */



#ifdef CONFIG_MMC_CLKGATE