Commit 1e63d297 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Centralize CMD and DATA reset handling 



Centralize CMD and DATA reset handling so that is more obvious how reset
is handled in different situations.

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-5-adrian.hunter@intel.com


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

drivers/mmc/host/sdhci.c

+39 −13
Original line number Diff line number Diff line
@@ -259,6 +259,36 @@ static void sdhci_reset_for_all(struct sdhci_host *host) 
	}

}



enum sdhci_reset_reason {

	SDHCI_RESET_FOR_INIT,

	SDHCI_RESET_FOR_REQUEST_ERROR,

	SDHCI_RESET_FOR_REQUEST_ERROR_DATA_ONLY,

	SDHCI_RESET_FOR_TUNING_ABORT,

	SDHCI_RESET_FOR_CARD_REMOVED,

	SDHCI_RESET_FOR_CQE_RECOVERY,

};



static void sdhci_reset_for_reason(struct sdhci_host *host, enum sdhci_reset_reason reason)

{

	switch (reason) {

	case SDHCI_RESET_FOR_INIT:

		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);

		break;

	case SDHCI_RESET_FOR_REQUEST_ERROR:

	case SDHCI_RESET_FOR_TUNING_ABORT:

	case SDHCI_RESET_FOR_CARD_REMOVED:

	case SDHCI_RESET_FOR_CQE_RECOVERY:

		sdhci_do_reset(host, SDHCI_RESET_CMD);

		sdhci_do_reset(host, SDHCI_RESET_DATA);

		break;

	case SDHCI_RESET_FOR_REQUEST_ERROR_DATA_ONLY:

		sdhci_do_reset(host, SDHCI_RESET_DATA);

		break;

	}

}



#define sdhci_reset_for(h, r) sdhci_reset_for_reason((h), SDHCI_RESET_FOR_##r)



static void sdhci_set_default_irqs(struct sdhci_host *host)

{

	host->ier = SDHCI_INT_BUS_POWER | SDHCI_INT_DATA_END_BIT |
@@ -327,7 +357,7 @@ static void sdhci_init(struct sdhci_host *host, int soft) 
	unsigned long flags;



	if (soft)

		sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);

		sdhci_reset_for(host, INIT);

	else

		sdhci_reset_for_all(host);
@@ -1542,8 +1572,9 @@ static void __sdhci_finish_data(struct sdhci_host *host, bool sw_data_timeout) 
	 */

	if (data->error) {

		if (!host->cmd || host->cmd == data_cmd)

			sdhci_do_reset(host, SDHCI_RESET_CMD);

		sdhci_do_reset(host, SDHCI_RESET_DATA);

			sdhci_reset_for(host, REQUEST_ERROR);

		else

			sdhci_reset_for(host, REQUEST_ERROR_DATA_ONLY);

	}



	if ((host->flags & (SDHCI_REQ_USE_DMA | SDHCI_USE_ADMA)) ==
@@ -2714,8 +2745,7 @@ void sdhci_abort_tuning(struct sdhci_host *host, u32 opcode) 
{

	sdhci_reset_tuning(host);



	sdhci_do_reset(host, SDHCI_RESET_CMD);

	sdhci_do_reset(host, SDHCI_RESET_DATA);

	sdhci_reset_for(host, TUNING_ABORT);



	sdhci_end_tuning(host);
@@ -2983,8 +3013,7 @@ static void sdhci_card_event(struct mmc_host *mmc) 
		pr_err("%s: Resetting controller.\n",

			mmc_hostname(mmc));



		sdhci_do_reset(host, SDHCI_RESET_CMD);

		sdhci_do_reset(host, SDHCI_RESET_DATA);

		sdhci_reset_for(host, CARD_REMOVED);



		sdhci_error_out_mrqs(host, -ENOMEDIUM);

	}
@@ -3055,8 +3084,7 @@ static bool sdhci_request_done(struct sdhci_host *host) 
			/* This is to force an update */

			host->ops->set_clock(host, host->clock);



		sdhci_do_reset(host, SDHCI_RESET_CMD);

		sdhci_do_reset(host, SDHCI_RESET_DATA);

		sdhci_reset_for(host, REQUEST_ERROR);



		host->pending_reset = false;

	}
@@ -3897,10 +3925,8 @@ void sdhci_cqe_disable(struct mmc_host *mmc, bool recovery) 


	host->cqe_on = false;



	if (recovery) {

		sdhci_do_reset(host, SDHCI_RESET_CMD);

		sdhci_do_reset(host, SDHCI_RESET_DATA);

	}

	if (recovery)

		sdhci_reset_for(host, CQE_RECOVERY);



	pr_debug("%s: sdhci: CQE off, IRQ mask %#x, IRQ status %#x\n",

		 mmc_hostname(mmc), host->ier,