Commit d2a47176 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Remove MMC_CAP2_HC_ERASE_SZ 



The MMC_CAP2_HC_ERASE_SZ is used only by a few mmc host drivers. Its intent
is to enable eMMC's high-capacity erase size, as to improve the behaviour
of the erase operations.

We should strive to avoid software configuration options that aren't
necessary, but instead deploy common behaviours. For these reasons, let's
remove the capability bit for MMC_CAP2_HC_ERASE_SZ and make it the default
behaviour.

Note that this change doesn't affect eMMCs supporting trim/discard, because
these commands operates on sectors and takes precedence over erase
commands.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Tested-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
parent 9820a5b1

drivers/mmc/core/mmc.c

+2 −6
Original line number Diff line number Diff line
@@ -1651,12 +1651,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
		mmc_set_erase_size(card);

	}



	/*

	 * If enhanced_area_en is TRUE, host needs to enable ERASE_GRP_DEF

	 * bit.  This bit will be lost every time after a reset or power off.

	 */

	if (card->ext_csd.partition_setting_completed ||

	    (card->ext_csd.rev >= 3 && (host->caps2 & MMC_CAP2_HC_ERASE_SZ))) {

	/* Enable ERASE_GRP_DEF. This bit is lost after a reset or power off. */

	if (card->ext_csd.rev >= 3) {

		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				 EXT_CSD_ERASE_GROUP_DEF, 1,

				 card->ext_csd.generic_cmd6_time);

drivers/mmc/host/sdhci-acpi.c

+0 −1
Original line number Diff line number Diff line
@@ -274,7 +274,6 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = { 
	.caps    = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |

		   MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR |

		   MMC_CAP_CMD_DURING_TFR | MMC_CAP_WAIT_WHILE_BUSY,

	.caps2   = MMC_CAP2_HC_ERASE_SZ,

	.flags   = SDHCI_ACPI_RUNTIME_PM,

	.quirks  = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,

	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |

drivers/mmc/host/sdhci-brcmstb.c

+0 −3
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev) 
		goto err_clk;

	}



	/* Enable MMC_CAP2_HC_ERASE_SZ for better max discard calculations */

	host->mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ;



	sdhci_get_of_property(pdev);

	mmc_of_parse(host->mmc);

drivers/mmc/host/sdhci-pci-core.c

+1 −3
Original line number Diff line number Diff line
@@ -347,8 +347,7 @@ static inline void sdhci_pci_remove_own_cd(struct sdhci_pci_slot *slot) 
static int mfd_emmc_probe_slot(struct sdhci_pci_slot *slot)

{

	slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE;

	slot->host->mmc->caps2 |= MMC_CAP2_BOOTPART_NOACC |

				  MMC_CAP2_HC_ERASE_SZ;

	slot->host->mmc->caps2 |= MMC_CAP2_BOOTPART_NOACC;

	return 0;

}
@@ -587,7 +586,6 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) 
				 MMC_CAP_HW_RESET | MMC_CAP_1_8V_DDR |

				 MMC_CAP_CMD_DURING_TFR |

				 MMC_CAP_WAIT_WHILE_BUSY;

	slot->host->mmc->caps2 |= MMC_CAP2_HC_ERASE_SZ;

	slot->hw_reset = sdhci_pci_int_hw_reset;

	if (slot->chip->pdev->device == PCI_DEVICE_ID_INTEL_BSW_EMMC)

		slot->host->timeout_clk = 1000; /* 1000 kHz i.e. 1 MHz */

include/linux/mmc/host.h

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ struct mmc_host { 
#define MMC_CAP2_HS200_1_2V_SDR	(1 << 6)        /* can support */

#define MMC_CAP2_HS200		(MMC_CAP2_HS200_1_8V_SDR | \

				 MMC_CAP2_HS200_1_2V_SDR)

#define MMC_CAP2_HC_ERASE_SZ	(1 << 9)	/* High-capacity erase size */

#define MMC_CAP2_CD_ACTIVE_HIGH	(1 << 10)	/* Card-detect signal active high */

#define MMC_CAP2_RO_ACTIVE_HIGH	(1 << 11)	/* Write-protect signal active high */

#define MMC_CAP2_PACKED_RD	(1 << 12)	/* Allow packed read */

CRA Git | Maintained and supported by SUSTech CRA and CCSE