On Tue, Apr 14, 2020 at 06:13:56PM +0200, Ulf Hansson wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 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@xxxxxxxxxxxxx> > Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx> > Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx> Makes sense. Acked-by: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> Thanks > --- > drivers/mmc/host/atmel-mci.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index 0472df8391b5..7292970065b6 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -169,6 +169,7 @@ > #define atmci_writel(port, reg, value) \ > __raw_writel((value), (port)->regs + reg) > > +#define ATMCI_CMD_TIMEOUT_MS 2000 > #define AUTOSUSPEND_DELAY 50 > > #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_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) > @@ -1314,8 +1318,6 @@ static void atmci_start_request(struct atmel_mci *host, > * prepared yet.) > */ > atmci_writel(host, ATMCI_IER, iflags); > - > - mod_timer(&host->timer, jiffies + msecs_to_jiffies(2000)); > } > > static void atmci_queue_request(struct atmel_mci *host, > -- > 2.20.1 >
