From: Christoph Hellwig <hch@lst.de> To: Ulf Hansson <ulf.hansson@linaro.org> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>, Nicolas Pitre <nico@fluxnic.net>, linux-mmc@vger.kernel.org, Russell King <linux@armlinux.org.uk>, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Ben Dooks <ben-linux@fluff.org>, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/14] mmc: omap: handle chained sglists Date: Tue, 12 Feb 2019 08:25:21 +0100 [thread overview] Message-ID: <20190212072528.13167-8-hch@lst.de> (raw) In-Reply-To: <20190212072528.13167-1-hch@lst.de> Use the proper sg_next() helper to move to the next scatterlist element to support chained scatterlists. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/mmc/host/omap.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 6741c95f2281..8cd39bc087fa 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -147,7 +147,7 @@ struct mmc_omap_host { struct mmc_data *stop_data; unsigned int sg_len; - int sg_idx; + struct scatterlist *cur_sg; u32 buffer_offset; u32 buffer_bytes_left; u32 total_bytes_left; @@ -645,11 +645,8 @@ mmc_omap_cmd_timer(struct timer_list *t) static void mmc_omap_sg_to_buf(struct mmc_omap_host *host) { - struct scatterlist *sg; - - sg = host->data->sg + host->sg_idx; - host->buffer_bytes_left = sg->length; - host->buffer_offset = sg->offset; + host->buffer_bytes_left = host->cur_sg->length; + host->buffer_offset = host->cur_sg->offset; if (host->buffer_bytes_left > host->total_bytes_left) host->buffer_bytes_left = host->total_bytes_left; } @@ -666,13 +663,12 @@ mmc_omap_clk_timer(struct timer_list *t) static void mmc_omap_xfer_data(struct mmc_omap_host *host, int write) { - struct scatterlist *sg = host->data->sg + host->sg_idx; + struct scatterlist *sg = host->cur_sg; int n, nwords; void *p; if (host->buffer_bytes_left == 0) { - host->sg_idx++; - BUG_ON(host->sg_idx == host->sg_len); + host->cur_sg = sg_next(host->cur_sg); mmc_omap_sg_to_buf(host); } n = 64; @@ -984,7 +980,7 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req) } } - host->sg_idx = 0; + host->cur_sg = host->data->sg; if (use_dma) { enum dma_data_direction dma_data_dir; struct dma_async_tx_descriptor *tx; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-12 7:27 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-12 7:25 remove block layer bounce buffering for MMC v2 Christoph Hellwig 2019-02-12 7:25 ` [PATCH 01/14] scatterlist: add sg_kmap_atomic / sg_kunmap_atomic helpers Christoph Hellwig 2019-02-12 7:25 ` [PATCH 02/14] mmc: remove the unused use_blk_mq field from struct mmc_host Christoph Hellwig 2019-02-12 7:25 ` [PATCH 03/14] mmc: add a need_kmap flag to " Christoph Hellwig 2019-02-12 7:25 ` [PATCH 04/14] mmc: davinci: handle highmem pages Christoph Hellwig 2019-02-12 7:25 ` [PATCH 05/14] mmc: moxart: " Christoph Hellwig 2019-02-12 7:25 ` [PATCH 06/14] mmc: omap: " Christoph Hellwig 2019-02-12 18:39 ` Tony Lindgren 2019-02-12 7:25 ` Christoph Hellwig [this message] 2019-02-12 7:25 ` [PATCH 08/14] mmc: s3cmci: " Christoph Hellwig 2019-02-12 7:25 ` [PATCH 09/14] mmc: s3cmci: handle chained sglists Christoph Hellwig 2019-02-12 7:25 ` [PATCH 10/14] mmc: mvsdio: handle highmem pages Christoph Hellwig 2019-02-12 7:25 ` [PATCH 11/14] mmc: sh_mmcif: " Christoph Hellwig 2019-02-12 7:25 ` [PATCH 12/14] mmc: sh_mmcif: handle chained sglists Christoph Hellwig 2019-02-12 7:25 ` [PATCH 13/14] mmc: core: don't use block layer bounce buffers Christoph Hellwig 2019-02-12 7:25 ` [PATCH 14/14] dma-mapping: remove dma_max_pfn Christoph Hellwig 2019-02-25 13:54 ` remove block layer bounce buffering for MMC v2 Ulf Hansson 2019-03-08 9:18 ` Christoph Hellwig 2019-03-08 9:43 ` Ulf Hansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190212072528.13167-8-hch@lst.de \ --to=hch@lst.de \ --cc=aaro.koskinen@iki.fi \ --cc=ben-linux@fluff.org \ --cc=iommu@lists.linux-foundation.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=nico@fluxnic.net \ --cc=ulf.hansson@linaro.org \ --subject='Re: [PATCH 07/14] mmc: omap: handle chained sglists' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).