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 03/11] mmc: omap: handle highmem pages Date: Mon, 14 Jan 2019 10:57:56 +0100 [thread overview] Message-ID: <20190114095804.27978-4-hch@lst.de> (raw) In-Reply-To: <20190114095804.27978-1-hch@lst.de> Instead of setting up a kernel pointer to track the current PIO address, track the offset in the current page, and do an atomic kmap for the page while doing the actual PIO operations. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/mmc/host/omap.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index c60a7625b1fa..0377ac6194a0 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/highmem.h> #include <linux/init.h> #include <linux/ioport.h> #include <linux/platform_device.h> @@ -148,7 +149,7 @@ struct mmc_omap_host { unsigned int sg_len; int sg_idx; - u16 * buffer; + u32 buffer_offset; u32 buffer_bytes_left; u32 total_bytes_left; @@ -649,7 +650,7 @@ mmc_omap_sg_to_buf(struct mmc_omap_host *host) sg = host->data->sg + host->sg_idx; host->buffer_bytes_left = sg->length; - host->buffer = sg_virt(sg); + host->buffer_offset = sg->offset; if (host->buffer_bytes_left > host->total_bytes_left) host->buffer_bytes_left = host->total_bytes_left; } @@ -666,7 +667,9 @@ 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; int n, nwords; + void *p; if (host->buffer_bytes_left == 0) { host->sg_idx++; @@ -684,15 +687,17 @@ mmc_omap_xfer_data(struct mmc_omap_host *host, int write) host->total_bytes_left -= n; host->data->bytes_xfered += n; + p = kmap_atomic(sg_page(sg)); if (write) { __raw_writesw(host->virt_base + OMAP_MMC_REG(host, DATA), - host->buffer, nwords); + p + host->buffer_offset, nwords); } else { __raw_readsw(host->virt_base + OMAP_MMC_REG(host, DATA), - host->buffer, nwords); + p + host->buffer_offset, nwords); } + kunmap_atomic(p); - host->buffer += nwords; + host->buffer_offset += nwords; } #ifdef CONFIG_MMC_DEBUG -- 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 03/11] mmc: omap: handle highmem pages Date: Mon, 14 Jan 2019 10:57:56 +0100 [thread overview] Message-ID: <20190114095804.27978-4-hch@lst.de> (raw) In-Reply-To: <20190114095804.27978-1-hch@lst.de> Instead of setting up a kernel pointer to track the current PIO address, track the offset in the current page, and do an atomic kmap for the page while doing the actual PIO operations. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/mmc/host/omap.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index c60a7625b1fa..0377ac6194a0 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/highmem.h> #include <linux/init.h> #include <linux/ioport.h> #include <linux/platform_device.h> @@ -148,7 +149,7 @@ struct mmc_omap_host { unsigned int sg_len; int sg_idx; - u16 * buffer; + u32 buffer_offset; u32 buffer_bytes_left; u32 total_bytes_left; @@ -649,7 +650,7 @@ mmc_omap_sg_to_buf(struct mmc_omap_host *host) sg = host->data->sg + host->sg_idx; host->buffer_bytes_left = sg->length; - host->buffer = sg_virt(sg); + host->buffer_offset = sg->offset; if (host->buffer_bytes_left > host->total_bytes_left) host->buffer_bytes_left = host->total_bytes_left; } @@ -666,7 +667,9 @@ 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; int n, nwords; + void *p; if (host->buffer_bytes_left == 0) { host->sg_idx++; @@ -684,15 +687,17 @@ mmc_omap_xfer_data(struct mmc_omap_host *host, int write) host->total_bytes_left -= n; host->data->bytes_xfered += n; + p = kmap_atomic(sg_page(sg)); if (write) { __raw_writesw(host->virt_base + OMAP_MMC_REG(host, DATA), - host->buffer, nwords); + p + host->buffer_offset, nwords); } else { __raw_readsw(host->virt_base + OMAP_MMC_REG(host, DATA), - host->buffer, nwords); + p + host->buffer_offset, nwords); } + kunmap_atomic(p); - host->buffer += nwords; + host->buffer_offset += nwords; } #ifdef CONFIG_MMC_DEBUG -- 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-01-14 9:58 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-14 9:57 remove block layer bounce buffering for MMC Christoph Hellwig 2019-01-14 9:57 ` Christoph Hellwig 2019-01-14 9:57 ` Christoph Hellwig 2019-01-14 9:57 ` [PATCH 01/11] mmc: davinci: handle highmem pages Christoph Hellwig 2019-01-14 9:57 ` Christoph Hellwig 2019-01-14 9:57 ` [PATCH 02/11] mmc: moxart: " Christoph Hellwig 2019-01-14 9:57 ` Christoph Hellwig 2019-01-14 9:57 ` Christoph Hellwig [this message] 2019-01-14 9:57 ` [PATCH 03/11] mmc: omap: " Christoph Hellwig 2019-01-14 9:57 ` [PATCH 04/11] mmc: omap: handle chained sglists Christoph Hellwig 2019-01-14 9:57 ` Christoph Hellwig 2019-01-14 9:57 ` [PATCH 05/11] mmc: s3cmci: handle highmem pages Christoph Hellwig 2019-01-14 9:57 ` Christoph Hellwig 2019-01-30 7:57 ` Ulf Hansson 2019-01-30 7:57 ` Ulf Hansson 2019-01-30 8:04 ` Christoph Hellwig 2019-01-30 8:04 ` Christoph Hellwig 2019-01-30 8:16 ` Ulf Hansson 2019-01-30 8:16 ` Ulf Hansson 2019-01-14 9:57 ` [PATCH 06/11] mmc: s3cmci: handle chained sglists Christoph Hellwig 2019-01-14 9:57 ` Christoph Hellwig 2019-01-14 9:58 ` [PATCH 07/11] mmc: mvsdio: handle highmem pages Christoph Hellwig 2019-01-14 9:58 ` Christoph Hellwig 2019-01-14 16:29 ` Nicolas Pitre 2019-01-14 16:29 ` Nicolas Pitre 2019-01-30 7:55 ` Ulf Hansson 2019-01-30 7:55 ` Ulf Hansson 2019-01-14 9:58 ` [PATCH 08/11] mmc: sh_mmcif: " Christoph Hellwig 2019-01-14 9:58 ` Christoph Hellwig 2019-01-14 9:58 ` [PATCH 09/11] mmc: sh_mmcif: handle chained sglists Christoph Hellwig 2019-01-14 9:58 ` Christoph Hellwig 2019-01-14 9:58 ` [PATCH 10/11] mmc: core: don't use block layer bounce buffers Christoph Hellwig 2019-01-14 9:58 ` Christoph Hellwig 2019-01-14 9:58 ` [PATCH 11/11] dma-mapping: remove dma_max_pfn Christoph Hellwig 2019-01-14 9:58 ` Christoph Hellwig 2019-01-14 10:26 ` remove block layer bounce buffering for MMC Ulf Hansson 2019-01-14 10:26 ` Ulf Hansson 2019-01-16 10:24 ` Arnd Bergmann 2019-01-16 10:24 ` Arnd Bergmann 2019-01-16 13:51 ` Linus Walleij 2019-01-16 13:51 ` Linus Walleij 2019-01-16 13:54 ` Arnd Bergmann 2019-01-16 13:54 ` Arnd Bergmann 2019-01-14 16:52 ` Robin Murphy 2019-01-14 16:52 ` Robin Murphy 2019-01-14 16:57 ` Christoph Hellwig 2019-01-14 16:57 ` Christoph Hellwig
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=20190114095804.27978-4-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.