mmc: sh_mmcif: rework sg_miter handling
PATCH v3 1/1 mmc: sh_mmcif: rework sg_miter handling
From: Arnd Bergmann <[email protected]>
This driver is the only one that uses sg_miter_next() to get a persistent mapping across interrupts, which prevents us from converting the internal kmap() to a local mapping using SG_MITER_LOCAL flag.
Linus previously attempted to use atomic mappings here, which failed for the same reason. I gave it another try, with a mapping that is only active during a single sh_mmcif_mread_block()/sh_mmcif_mwrite_block() call.
This is mainly a revert of the patch that fixed the command 18 timeout, but tries to solve the problem by updating and checking data->bytes_xfered to keep track of when the transfer is finished.
Instead of calling sg_miter_stop() on error or completion, this now always stops the iterator after the data transfer and restarts it during the following interrupt.
As sashiko-bot comments, there is an inconsistency with the size of each transfer: The mmc core expects a transfer of size data->blksz, but the actual transfer is host->blocksize, which is read from a hardware register. To keep the behavior as close as possible to what it was before, I still advance the data->bytes_xfered and sgm->consumed values by the requested transfer size for single-block read/write, but advance them by the actually copied number of bytes for the partial transfers in the multi-block requests.
---
v3: address error handling and (again) accounting,
by resetting byes_xfered=0 on any error or timeout [sashiko-bot]
v2: address incorrect accounting problem [sashiko-bot]
--- drivers/mmc/host/sh_mmcif.c | 68 +++++++++++++++---------------------- 1 file changed, 27 insertions(+), 41 deletions(-)
drivers/mmc/host/sh_mmcif.c +27 -41
@@ -604,7 +604,7 @@ static void sh_mmcif_single_read(struct sh_mmcif_host *host, BLOCK_SIZE_MASK) + 3;sg_miter_start (&host->sg_miter, data->sg, data->sg_len, -SG_MITER_TO_SG ); +SG_MITER_LOCAL |SG_MITER_TO_SG ); host->wait_for =MMCIF_WAIT_FOR_READ ;
@@ -621,7 +621,6 @@ static bool sh_mmcif_read_block(struct sh_mmcif_host *host)int i;if (host->sd_error) { -sg_miter_stop (sgm); data->error =sh_mmcif_error_manage (host);dev_dbg (dev,"%s(): %d\n" , __func__, data->error);return false;
@@ -629,7 +628,6 @@ static bool sh_mmcif_read_block(struct sh_mmcif_host *host)if (!sg_miter_next (sgm)) {/* This should not happen on single blocks */ -sg_miter_stop (sgm);return false; }
@@ -638,6 +636,8 @@ static bool sh_mmcif_read_block(struct sh_mmcif_host *host)for (i =0 ; i < host->blocksize /4 ; i++) *p++ =sh_mmcif_readl (host->addr,MMCIF_CE_DATA ); + data->bytes_xfered += data->blksz; + sgm->consumed = data->blksz;sg_miter_stop (&host->sg_miter);/* buffer read end */
@@ -650,7 +650,6 @@ static bool sh_mmcif_read_block(struct sh_mmcif_host *host)static void sh_mmcif_multi_read (struct sh_mmcif_host *host,struct mmc_request *mrq) { -struct sg_mapping_iter *sgm = &host->sg_miter;struct mmc_data *data = mrq->data;if (!data->sg_len || !data->sg->length)
@@ -659,14 +658,8 @@ static void sh_mmcif_multi_read(struct sh_mmcif_host *host, host->blocksize =sh_mmcif_readl (host->addr,MMCIF_CE_BLOCK_SET ) &BLOCK_SIZE_MASK ; -sg_miter_start (sgm, data->sg, data->sg_len, -SG_MITER_TO_SG ); - -/* Advance to the first sglist entry */ -if (!sg_miter_next (sgm)) { -sg_miter_stop (sgm); -return ; - } +sg_miter_start (&host->sg_miter, data->sg, data->sg_len, +SG_MITER_LOCAL |SG_MITER_TO_SG ); host->wait_for =MMCIF_WAIT_FOR_MREAD ;
@@ -682,27 +675,26 @@ static bool sh_mmcif_mread_block(struct sh_mmcif_host *host)int i;if (host->sd_error) { -sg_miter_stop (sgm); data->error =sh_mmcif_error_manage (host);dev_dbg (dev,"%s(): %d\n" , __func__, data->error);return false; } +if (!sg_miter_next (sgm)) +return false; + p = sgm->addr;for (i =0 ; i < host->blocksize /4 ; i++) *p++ =sh_mmcif_readl (host->addr,MMCIF_CE_DATA ); + data->bytes_xfered += host->blocksize; sgm->consumed = host->blocksize; +sg_miter_stop (sgm);sh_mmcif_bitset (host,MMCIF_CE_INT_MASK ,MASK_MBUFREN ); -if (!sg_miter_next (sgm)) { -sg_miter_stop (sgm); -return false; - } - -return true; +return data->bytes_xfered < data->blksz * data->blocks; } static void sh_mmcif_single_write(struct sh_mmcif_host *host,
@@ -714,7 +706,7 @@ static void sh_mmcif_single_write(struct sh_mmcif_host *host, BLOCK_SIZE_MASK) + 3;sg_miter_start (&host->sg_miter, data->sg, data->sg_len, -SG_MITER_FROM_SG ); +SG_MITER_LOCAL |SG_MITER_FROM_SG ); host->wait_for =MMCIF_WAIT_FOR_WRITE ;
@@ -731,7 +723,6 @@ static bool sh_mmcif_write_block(struct sh_mmcif_host *host)int i;if (host->sd_error) { -sg_miter_stop (sgm); data->error =sh_mmcif_error_manage (host);dev_dbg (dev,"%s(): %d\n" , __func__, data->error);return false;
@@ -739,7 +730,6 @@ static bool sh_mmcif_write_block(struct sh_mmcif_host *host)if (!sg_miter_next (sgm)) {/* This should not happen on single blocks */ -sg_miter_stop (sgm);return false; }
@@ -748,6 +738,8 @@ static bool sh_mmcif_write_block(struct sh_mmcif_host *host)for (i =0 ; i < host->blocksize /4 ; i++)sh_mmcif_writel (host->addr,MMCIF_CE_DATA , *p++); + data->bytes_xfered += data->blksz; + sgm->consumed = data->blksz;sg_miter_stop (&host->sg_miter);/* buffer write end */
@@ -760,7 +752,6 @@ static bool sh_mmcif_write_block(struct sh_mmcif_host *host)static void sh_mmcif_multi_write (struct sh_mmcif_host *host,struct mmc_request *mrq) { -struct sg_mapping_iter *sgm = &host->sg_miter;struct mmc_data *data = mrq->data;if (!data->sg_len || !data->sg->length)
@@ -769,14 +760,8 @@ static void sh_mmcif_multi_write(struct sh_mmcif_host *host, host->blocksize =sh_mmcif_readl (host->addr,MMCIF_CE_BLOCK_SET ) &BLOCK_SIZE_MASK ; -sg_miter_start (sgm, data->sg, data->sg_len, -SG_MITER_FROM_SG ); - -/* Advance to the first sglist entry */ -if (!sg_miter_next (sgm)) { -sg_miter_stop (sgm); -return ; - } +sg_miter_start (&host->sg_miter, data->sg, data->sg_len, +SG_MITER_LOCAL |SG_MITER_FROM_SG ); host->wait_for =MMCIF_WAIT_FOR_MWRITE ;
@@ -792,27 +777,26 @@ static bool sh_mmcif_mwrite_block(struct sh_mmcif_host *host)int i;if (host->sd_error) { -sg_miter_stop (sgm); data->error =sh_mmcif_error_manage (host);dev_dbg (dev,"%s(): %d\n" , __func__, data->error);return false; } +if (!sg_miter_next (sgm)) +return false; + p = sgm->addr;for (i =0 ; i < host->blocksize /4 ; i++)sh_mmcif_writel (host->addr,MMCIF_CE_DATA , *p++); + data->bytes_xfered += host->blocksize; sgm->consumed = host->blocksize; - -if (!sg_miter_next (sgm)) { -sg_miter_stop (sgm); -return false; - } +sg_miter_stop (sgm);sh_mmcif_bitset (host,MMCIF_CE_INT_MASK ,MASK_MBUFWEN ); -return true; +return data->bytes_xfered < data->blksz * data->blocks; } static void sh_mmcif_get_response(struct sh_mmcif_host *host,
@@ -1194,6 +1178,8 @@ static bool sh_mmcif_end_cmd(struct sh_mmcif_host *host)dmaengine_terminate_sync (host->chan_rx); else dmaengine_terminate_sync(host->chan_tx); + }else { + data->bytes_xfered = data->blksz * data->blocks; }/*
@@ -1269,6 +1255,7 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id)break ;case MMCIF_WAIT_FOR_STOP :if (host->sd_error) { + mrq->data->bytes_xfered =0 ; mrq->stop->error =sh_mmcif_error_manage (host);dev_dbg (dev,"%s(): %d\n" , __func__, mrq->stop->error);break ;
@@ -1279,6 +1266,7 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id)case MMCIF_WAIT_FOR_READ_END :case MMCIF_WAIT_FOR_WRITE_END :if (host->sd_error) { + mrq->data->bytes_xfered =0 ; mrq->data->error =sh_mmcif_error_manage (host);dev_dbg (dev,"%s(): %d\n" , __func__, mrq->data->error); }
@@ -1296,9 +1284,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id)if (host->wait_for !=MMCIF_WAIT_FOR_STOP ) {struct mmc_data *data = mrq->data; -if (!mrq->cmd->error && data && !data->error) - data->bytes_xfered = - data->blocks * data->blksz;if (mrq->stop && !mrq->cmd->error && (!data || !data->error)) {sh_mmcif_stop_cmd (host, mrq);
@@ -1403,6 +1388,7 @@ static void sh_mmcif_timeout_work(struct work_struct *work)BUG (); } + mrq->data->bytes_xfered =0 ; host->state =STATE_IDLE ; host->wait_for =MMCIF_WAIT_FOR_REQUEST ; host->mrq =NULL ;
Signature · 1 line
2.53.0
Hi Arnd,
Quoted 1 line
Cc Wolfram Sang <[email protected]>
I can surely do some testing next week on a Lager-board (HIMEM) and a Genmai board (non-HIMEM). Dunno how much code review I can provide. I have never dealt with that part of the driver and my bandwidth to dive into it is currently rather limited. Let's see what the testing brings.
Have a nice weekend,
Wolfram
Quoted 27 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
This driver is the only one that uses
sg_miter_next()to get a persistent mapping across interrupts, which prevents us from converting the internalkmap()to a local mapping usingSG_MITER_LOCALflag.Linus previously attempted to use atomic mappings here, which failed for the same reason. I gave it another try, with a mapping that is only active during a single sh_mmcif_mread_block()/sh_mmcif_mwrite_block() call.
This is mainly a revert of the patch that fixed the command 18 timeout, but tries to solve the problem by updating and checking
data->bytes_xferedto keep track of when the transfer is finished.Instead of calling
sg_miter_stop()on error or completion, this now always stops the iterator after the data transfer and restarts it during the following interrupt.As sashiko-bot comments, there is an inconsistency with the size of each transfer: The mmc core expects a transfer of size
data->blksz, but the actual transfer ishost->blocksize, which is read from a hardware register. To keep the behavior as close as possible to what it was before, I still advance thedata->bytes_xferedandsgm->consumedvalues by the requested transfer size for single-block read/write, but advance them by the actually copied number of bytes for the partial transfers in the multi-block requests.
Quoted 5 lines
Cc Linus Walleij <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Wolfram Sang <[email protected]>Fixes 4d4a2c71b862 ("mmc: sh_mmcif: Advance sg_miter before reading blocks")Signed-off-by Arnd Bergmann <[email protected]>
It looks right to me so:
Yours,
Linus Walleij