From: Adam Ford <aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Han Xu <han.xu-3arQi8VN3Tc@public.gmane.org>,
Adam Ford <aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Yogesh Gaur
<yogeshgaur.83-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Ashish Kumar <ashish.kumar-3arQi8VN3Tc@public.gmane.org>,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
Pengutronix Kernel Team
<kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
NXP Linux Team <linux-imx-3arQi8VN3Tc@public.gmane.org>,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: [PATCH V2 2/5] spi: fspi: dynamically alloc AHB memory
Date: Sun, 2 Feb 2020 06:59:47 -0600 [thread overview]
Message-ID: <20200202125950.1825013-2-aford173@gmail.com> (raw)
In-Reply-To: <20200202125950.1825013-1-aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
From: Han Xu <han.xu-3arQi8VN3Tc@public.gmane.org>
Apply patch from NXP upstream repo to
dynamically allocate AHB memory as needed.
Signed-off-by: Han Xu <han.xu-3arQi8VN3Tc@public.gmane.org>
Signed-off-by: Adam Ford <aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
V2: Reorder s-o-b lines to give credit in proper order.
diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c
index 00c7899428a1..23abf5ae318e 100644
--- a/drivers/spi/spi-nxp-fspi.c
+++ b/drivers/spi/spi-nxp-fspi.c
@@ -307,6 +307,7 @@
#define POLL_TOUT 5000
#define NXP_FSPI_MAX_CHIPSELECT 4
+#define NXP_FSPI_MIN_IOMAP SZ_4M
struct nxp_fspi_devtype_data {
unsigned int rxfifo;
@@ -345,6 +346,8 @@ struct nxp_fspi {
void __iomem *ahb_addr;
u32 memmap_phy;
u32 memmap_phy_size;
+ u32 memmap_start;
+ u32 memmap_len;
struct clk *clk, *clk_en;
struct device *dev;
struct completion c;
@@ -657,12 +660,35 @@ static void nxp_fspi_select_mem(struct nxp_fspi *f, struct spi_device *spi)
f->selected = spi->chip_select;
}
-static void nxp_fspi_read_ahb(struct nxp_fspi *f, const struct spi_mem_op *op)
+static int nxp_fspi_read_ahb(struct nxp_fspi *f, const struct spi_mem_op *op)
{
+ u32 start = op->addr.val;
u32 len = op->data.nbytes;
+ /* if necessary, ioremap before AHB read */
+ if ((!f->ahb_addr) || start < f->memmap_start ||
+ start + len > f->memmap_start + f->memmap_len) {
+ if (f->ahb_addr)
+ iounmap(f->ahb_addr);
+
+ f->memmap_start = start;
+ f->memmap_len = len > NXP_FSPI_MIN_IOMAP ?
+ len : NXP_FSPI_MIN_IOMAP;
+
+ f->ahb_addr = ioremap_wc(f->memmap_phy + f->memmap_start,
+ f->memmap_len);
+
+ if (!f->ahb_addr) {
+ dev_err(f->dev, "failed to alloc memory\n");
+ return -ENOMEM;
+ }
+ }
+
/* Read out the data directly from the AHB buffer. */
- memcpy_fromio(op->data.buf.in, (f->ahb_addr + op->addr.val), len);
+ memcpy_fromio(op->data.buf.in,
+ f->ahb_addr + start - f->memmap_start, len);
+
+ return 0;
}
static void nxp_fspi_fill_txfifo(struct nxp_fspi *f,
@@ -822,7 +848,7 @@ static int nxp_fspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op)
*/
if (op->data.nbytes > (f->devtype_data->rxfifo - 4) &&
op->data.dir == SPI_MEM_DATA_IN) {
- nxp_fspi_read_ahb(f, op);
+ err = nxp_fspi_read_ahb(f, op);
} else {
if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT)
nxp_fspi_fill_txfifo(f, op);
@@ -992,9 +1018,8 @@ static int nxp_fspi_probe(struct platform_device *pdev)
/* find the resources - controller memory mapped space */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap");
- f->ahb_addr = devm_ioremap_resource(dev, res);
- if (IS_ERR(f->ahb_addr)) {
- ret = PTR_ERR(f->ahb_addr);
+ if (IS_ERR(res)) {
+ ret = PTR_ERR(res);
goto err_put_ctrl;
}
@@ -1073,6 +1098,9 @@ static int nxp_fspi_remove(struct platform_device *pdev)
mutex_destroy(&f->lock);
+ if (f->ahb_addr)
+ iounmap(f->ahb_addr);
+
return 0;
}
--
2.24.0
next prev parent reply other threads:[~2020-02-02 12:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-02 12:59 [PATCH V2 1/5] spi: fspi: enable fspi on imx8qxp and imx8mm Adam Ford
[not found] ` <20200202125950.1825013-1-aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-02-02 12:59 ` Adam Ford [this message]
[not found] ` <20200202125950.1825013-2-aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-02-02 16:39 ` [PATCH V2 2/5] spi: fspi: dynamically alloc AHB memory Fabio Estevam
[not found] ` <CAOMZO5D3emrAk84wDS04qJC-3AyvFnqodhoMsXO-ukHnYsU+PQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2020-02-03 10:53 ` Adam Ford
[not found] ` <CAHCN7xJyZRwJhnWW2mAbOeGyrMsB7Au_e6AvwiNmNS8gFUfSyw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2020-02-12 12:07 ` Mark Brown
[not found] ` <20200212120753.GF4028-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2020-02-12 13:08 ` Adam Ford
[not found] ` <CAHCN7x+5bACfYVX49Lib+fmNq-dEOkcyi0gXt7rtYxrGaYbH1Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2020-02-13 18:46 ` Mark Brown
[not found] ` <20200213184624.GK4333-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2020-02-15 16:14 ` [EXT] " Han Xu
2020-02-02 12:59 ` [PATCH V2 4/5] dt-bindings: spi: spi-nxp-fspi: Add support for imx8mm, imx8qxp Adam Ford
[not found] ` <20200202125950.1825013-4-aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-02-06 18:40 ` Rob Herring
2020-02-11 10:49 ` Adam Ford
[not found] ` <CAHCN7x+uCwyJ60ZG_0m5SgNmqUAyEwxqXVTL7nQzJLXxXrh+Tw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2020-02-11 18:05 ` Rob Herring
2020-02-02 12:59 ` [PATCH V2 5/5] arm64: dts: enable fspi in imx8mm dts Adam Ford
[not found] ` <20200202125950.1825013-5-aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-02-14 3:36 ` Shawn Guo
2020-02-02 12:59 ` [PATCH V2 3/5] spi: spi-nxp-fspi: Enable the Octal Mode in MCR0 Adam Ford
[not found] ` <20200202125950.1825013-3-aford173-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2020-02-12 12:04 ` Mark Brown
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=20200202125950.1825013-2-aford173@gmail.com \
--to=aford173-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=ashish.kumar-3arQi8VN3Tc@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=han.xu-3arQi8VN3Tc@public.gmane.org \
--cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-imx-3arQi8VN3Tc@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
--cc=shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=yogeshgaur.83-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).