Commit 6fbde9e9 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Get rid of SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS 



SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS is used by only ENE controllers but can
be replaced by driver code.

Amend the ENE code to hook the ->set_ios() mmc host operation and do the
reset there.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20220926192022.85660-4-adrian.hunter@intel.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent bd980df9

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

+22 −1
Original line number Diff line number Diff line
@@ -297,6 +297,27 @@ static const struct sdhci_pci_fixes sdhci_ricoh_mmc = { 
			  SDHCI_QUIRK_MISSING_CAPS

};



static void ene_714_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)

{

	struct sdhci_host *host = mmc_priv(mmc);



	sdhci_set_ios(mmc, ios);



	/*

	 * Some (ENE) controllers misbehave on some ios operations,

	 * signalling timeout and CRC errors even on CMD0. Resetting

	 * it on each ios seems to solve the problem.

	 */

	if (!(host->flags & SDHCI_DEVICE_DEAD))

		sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);

}



static int ene_714_probe_slot(struct sdhci_pci_slot *slot)

{

	slot->host->mmc_host_ops.set_ios = ene_714_set_ios;

	return 0;

}



static const struct sdhci_pci_fixes sdhci_ene_712 = {

	.quirks		= SDHCI_QUIRK_SINGLE_POWER_WRITE |

			  SDHCI_QUIRK_BROKEN_DMA,
@@ -304,8 +325,8 @@ static const struct sdhci_pci_fixes sdhci_ene_712 = { 


static const struct sdhci_pci_fixes sdhci_ene_714 = {

	.quirks		= SDHCI_QUIRK_SINGLE_POWER_WRITE |

			  SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS |

			  SDHCI_QUIRK_BROKEN_DMA,

	.probe_slot	= ene_714_probe_slot,

};



static const struct sdhci_pci_fixes sdhci_cafe = {

drivers/mmc/host/sdhci.c

+0 −8
Original line number Diff line number Diff line
@@ -2407,14 +2407,6 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		host->ops->set_clock(host, host->clock);

	} else

		sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);



	/*

	 * Some (ENE) controllers go apeshit on some ios operation,

	 * signalling timeout and CRC errors even on CMD0. Resetting

	 * it on each ios seems to solve the problem.

	 */

	if (host->quirks & SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS)

		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);

}

EXPORT_SYMBOL_GPL(sdhci_set_ios);

drivers/mmc/host/sdhci.h

+0 −2
Original line number Diff line number Diff line
@@ -379,8 +379,6 @@ struct sdhci_host { 
#define SDHCI_QUIRK_NO_CARD_NO_RESET			(1<<2)

/* Controller doesn't like clearing the power reg before a change */

#define SDHCI_QUIRK_SINGLE_POWER_WRITE			(1<<3)

/* Controller has flaky internal state so reset it on each ios change */

#define SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS		(1<<4)

/* Controller has an unusable DMA engine */

#define SDHCI_QUIRK_BROKEN_DMA				(1<<5)

/* Controller has an unusable ADMA engine */