From: Christoph Hellwig <hch@lst.de> To: Ulf Hansson <ulf.hansson@linaro.org> Cc: Russell King <linux@armlinux.org.uk>, Nicolas Pitre <nico@fluxnic.net>, Aaro Koskinen <aaro.koskinen@iki.fi>, Ben Dooks <ben-linux@fluff.org>, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/14] mmc: s3cmci: handle chained sglists Date: Tue, 12 Feb 2019 08:25:23 +0100 [thread overview] Message-ID: <20190212072528.13167-10-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/s3cmci.c | 19 +++++++++---------- drivers/mmc/host/s3cmci.h | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 989fefea19f1..df7c27f78abf 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -319,20 +319,19 @@ static void s3cmci_check_sdio_irq(struct s3cmci_host *host) static inline int get_data_buffer(struct s3cmci_host *host) { - if (host->pio_sgptr >= host->mrq->data->sg_len) { - dbg(host, dbg_debug, "no more buffers (%i/%i)\n", - host->pio_sgptr, host->mrq->data->sg_len); + if (!host->next_sg) { + dbg(host, dbg_debug, "no more buffers (%i)\n", + host->mrq->data->sg_len); return -EBUSY; } - host->cur_sg = &host->mrq->data->sg[host->pio_sgptr]; + host->cur_sg = host->next_sg; + host->next_sg = sg_next(host->next_sg); host->pio_bytes = host->cur_sg->length; host->pio_offset = host->cur_sg->offset; - host->pio_sgptr++; - - dbg(host, dbg_sg, "new buffer (%i/%i)\n", - host->pio_sgptr, host->mrq->data->sg_len); + dbg(host, dbg_sg, "new buffer (%i)\n", + host->mrq->data->sg_len); return 0; } @@ -1051,8 +1050,8 @@ static int s3cmci_prepare_pio(struct s3cmci_host *host, struct mmc_data *data) BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR); - host->pio_sgptr = 0; - host->cur_sg = &host->mrq->data->sg[host->pio_sgptr]; + host->cur_sg = host->mrq->data->sg; + host->next_sg = sg_next(host->cur_sg); host->pio_bytes = 0; host->pio_count = 0; host->pio_active = rw ? XFER_WRITE : XFER_READ; diff --git a/drivers/mmc/host/s3cmci.h b/drivers/mmc/host/s3cmci.h index 4320f7d832dc..caf1078d07d1 100644 --- a/drivers/mmc/host/s3cmci.h +++ b/drivers/mmc/host/s3cmci.h @@ -51,7 +51,7 @@ struct s3cmci_host { int dma_complete; struct scatterlist *cur_sg; - u32 pio_sgptr; + struct scatterlist *next_sg; u32 pio_bytes; u32 pio_count; u32 pio_offset; -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
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 09/14] mmc: s3cmci: handle chained sglists Date: Tue, 12 Feb 2019 08:25:23 +0100 [thread overview] Message-ID: <20190212072528.13167-10-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/s3cmci.c | 19 +++++++++---------- drivers/mmc/host/s3cmci.h | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 989fefea19f1..df7c27f78abf 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -319,20 +319,19 @@ static void s3cmci_check_sdio_irq(struct s3cmci_host *host) static inline int get_data_buffer(struct s3cmci_host *host) { - if (host->pio_sgptr >= host->mrq->data->sg_len) { - dbg(host, dbg_debug, "no more buffers (%i/%i)\n", - host->pio_sgptr, host->mrq->data->sg_len); + if (!host->next_sg) { + dbg(host, dbg_debug, "no more buffers (%i)\n", + host->mrq->data->sg_len); return -EBUSY; } - host->cur_sg = &host->mrq->data->sg[host->pio_sgptr]; + host->cur_sg = host->next_sg; + host->next_sg = sg_next(host->next_sg); host->pio_bytes = host->cur_sg->length; host->pio_offset = host->cur_sg->offset; - host->pio_sgptr++; - - dbg(host, dbg_sg, "new buffer (%i/%i)\n", - host->pio_sgptr, host->mrq->data->sg_len); + dbg(host, dbg_sg, "new buffer (%i)\n", + host->mrq->data->sg_len); return 0; } @@ -1051,8 +1050,8 @@ static int s3cmci_prepare_pio(struct s3cmci_host *host, struct mmc_data *data) BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR); - host->pio_sgptr = 0; - host->cur_sg = &host->mrq->data->sg[host->pio_sgptr]; + host->cur_sg = host->mrq->data->sg; + host->next_sg = sg_next(host->cur_sg); host->pio_bytes = 0; host->pio_count = 0; host->pio_active = rw ? XFER_WRITE : XFER_READ; diff --git a/drivers/mmc/host/s3cmci.h b/drivers/mmc/host/s3cmci.h index 4320f7d832dc..caf1078d07d1 100644 --- a/drivers/mmc/host/s3cmci.h +++ b/drivers/mmc/host/s3cmci.h @@ -51,7 +51,7 @@ struct s3cmci_host { int dma_complete; struct scatterlist *cur_sg; - u32 pio_sgptr; + struct scatterlist *next_sg; u32 pio_bytes; u32 pio_count; u32 pio_offset; -- 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:26 UTC|newest] Thread overview: 41+ 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 ` 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 ` Christoph Hellwig 2019-02-12 7:25 ` 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 ` Christoph Hellwig 2019-02-12 7:25 ` [PATCH 03/14] mmc: add a need_kmap flag to " Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-12 7:25 ` [PATCH 04/14] mmc: davinci: handle highmem pages Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-12 7:25 ` [PATCH 05/14] mmc: moxart: " Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-12 7:25 ` [PATCH 06/14] mmc: omap: " Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-12 18:39 ` Tony Lindgren 2019-02-12 18:39 ` Tony Lindgren 2019-02-12 7:25 ` [PATCH 07/14] mmc: omap: handle chained sglists Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-12 7:25 ` [PATCH 08/14] mmc: s3cmci: handle highmem pages Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig [this message] 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 ` Christoph Hellwig 2019-02-12 7:25 ` [PATCH 11/14] mmc: sh_mmcif: " Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-12 7:25 ` [PATCH 12/14] mmc: sh_mmcif: handle chained sglists Christoph Hellwig 2019-02-12 7:25 ` 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 ` Christoph Hellwig 2019-02-12 7:25 ` [PATCH 14/14] dma-mapping: remove dma_max_pfn Christoph Hellwig 2019-02-12 7:25 ` Christoph Hellwig 2019-02-25 13:54 ` remove block layer bounce buffering for MMC v2 Ulf Hansson 2019-02-25 13:54 ` Ulf Hansson 2019-03-08 9:18 ` Christoph Hellwig 2019-03-08 9:18 ` Christoph Hellwig 2019-03-08 9:18 ` Christoph Hellwig 2019-03-08 9:43 ` Ulf Hansson 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-10-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 \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.