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

mmc: atmel-mci: Set the timer per command rather than per request 



Setting the timer on a per request basis, is rather limiting as the timer
really depends on what commands that is to be sent as part of the request.

Therefore improve the behaviour by programming the timer per command basis
instead.

Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
Link: https://lore.kernel.org/r/20200414161413.3036-3-ulf.hansson@linaro.org


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

drivers/mmc/host/atmel-mci.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -169,6 +169,7 @@ 
#define	atmci_writel(port, reg, value)			\

#define	atmci_writel(port, reg, value)			\

	__raw_writel((value), (port)->regs + reg)

	__raw_writel((value), (port)->regs + reg)





#define ATMCI_CMD_TIMEOUT_MS	2000

#define AUTOSUSPEND_DELAY	50

#define AUTOSUSPEND_DELAY	50





#define ATMCI_DATA_ERROR_FLAGS	(ATMCI_DCRCE | ATMCI_DTOE | ATMCI_OVRE | ATMCI_UNRE)

#define ATMCI_DATA_ERROR_FLAGS	(ATMCI_DCRCE | ATMCI_DTOE | ATMCI_OVRE | ATMCI_UNRE)
@@ -817,6 +818,9 @@ static void atmci_send_command(struct atmel_mci *host, 




	atmci_writel(host, ATMCI_ARGR, cmd->arg);

	atmci_writel(host, ATMCI_ARGR, cmd->arg);

	atmci_writel(host, ATMCI_CMDR, cmd_flags);

	atmci_writel(host, ATMCI_CMDR, cmd_flags);



	mod_timer(&host->timer,

		  jiffies + msecs_to_jiffies(ATMCI_CMD_TIMEOUT_MS));

}

}





static void atmci_send_stop_cmd(struct atmel_mci *host, struct mmc_data *data)

static void atmci_send_stop_cmd(struct atmel_mci *host, struct mmc_data *data)
@@ -1314,8 +1318,6 @@ static void atmci_start_request(struct atmel_mci *host, 
	 * prepared yet.)

	 * prepared yet.)

	 */

	 */

	atmci_writel(host, ATMCI_IER, iflags);

	atmci_writel(host, ATMCI_IER, iflags);



	mod_timer(&host->timer, jiffies +  msecs_to_jiffies(2000));

}

}





static void atmci_queue_request(struct atmel_mci *host,

static void atmci_queue_request(struct atmel_mci *host,