From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
To: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
Rob Herring <robh+dt@kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Vignesh Raghavendra <vigneshr@ti.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Mark Brown <broonie@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
Sergei Shtylyov <sergei.shtylyov@gmail.com>,
devicetree@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-spi@vger.kernel.org,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
Prabhakar <prabhakar.csengg@gmail.com>,
Biju Das <biju.das.jz@bp.renesas.com>,
Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Subject: [PATCH 5/6] memory: renesas-rpc-if: Drop usage of RPCIF_DIRMAP_SIZE macro
Date: Tue, 28 Sep 2021 15:07:20 +0100 [thread overview]
Message-ID: <20210928140721.8805-6-prabhakar.mahadev-lad.rj@bp.renesas.com> (raw)
In-Reply-To: <20210928140721.8805-1-prabhakar.mahadev-lad.rj@bp.renesas.com>
RPCIF_DIRMAP_SIZE may differ on various SoC's. Instead of using
RPCIF_DIRMAP_SIZE macro use resource size to get dirmap size
which is already part of struct rpcif.
Also make sure we return error in case devm_ioremap_resource()
fails for dirmap.
Fixes: ca7d8b980b67 ("memory: add Renesas RPC-IF driver")
Fixes: 59e27d7c94aa ("memory: renesas-rpc-if: fix possible NULL pointer dereference of resource")
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
---
drivers/memory/renesas-rpc-if.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index 77a011d5ff8c..140cb4e2b789 100644
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -147,8 +147,6 @@
#define RPCIF_PHYINT 0x0088 /* R/W */
#define RPCIF_PHYINT_WPVAL BIT(1)
-#define RPCIF_DIRMAP_SIZE 0x4000000
-
static const struct regmap_range rpcif_volatile_ranges[] = {
regmap_reg_range(RPCIF_SMRDR0, RPCIF_SMRDR1),
regmap_reg_range(RPCIF_SMWDR0, RPCIF_SMWDR1),
@@ -244,7 +242,7 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dirmap");
rpc->dirmap = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(rpc->dirmap))
- rpc->dirmap = NULL;
+ return PTR_ERR(rpc->dirmap);
rpc->size = resource_size(res);
rpc->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
@@ -547,8 +545,8 @@ EXPORT_SYMBOL(rpcif_manual_xfer);
ssize_t rpcif_dirmap_read(struct rpcif *rpc, u64 offs, size_t len, void *buf)
{
- loff_t from = offs & (RPCIF_DIRMAP_SIZE - 1);
- size_t size = RPCIF_DIRMAP_SIZE - from;
+ loff_t from = offs & (rpc->size - 1);
+ size_t size = rpc->size - from;
if (len > size)
len = size;
--
2.17.1
next prev parent reply other threads:[~2021-09-28 14:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 14:07 [PATCH 0/6] Add SPI Multi I/O Bus Controller support for RZ/G2L Lad Prabhakar
2021-09-28 14:07 ` [PATCH 1/6] dt-bindings: memory: renesas,rpc-if: Add support for the R9A07G044 Lad Prabhakar
2021-10-04 18:30 ` Rob Herring
2021-10-05 14:46 ` Geert Uytterhoeven
2021-09-28 14:07 ` [PATCH 2/6] dt-bindings: memory: renesas,rpc-if: Add optional interrupts property Lad Prabhakar
2021-09-30 13:39 ` Wolfram Sang
2021-10-04 18:30 ` Rob Herring
2021-10-05 15:11 ` Geert Uytterhoeven
2021-09-28 14:07 ` [PATCH 3/6] spi: spi-rpc-if: Check return value of rpcif_sw_init() Lad Prabhakar
2021-09-30 13:41 ` Wolfram Sang
2021-10-05 15:25 ` Geert Uytterhoeven
2021-09-28 14:07 ` [PATCH 4/6] mtd: hyperbus: rpc-if: " Lad Prabhakar
2021-09-30 13:42 ` Wolfram Sang
2021-10-08 9:27 ` Geert Uytterhoeven
2021-09-28 14:07 ` Lad Prabhakar [this message]
2021-09-30 13:55 ` [PATCH 5/6] memory: renesas-rpc-if: Drop usage of RPCIF_DIRMAP_SIZE macro Wolfram Sang
2021-09-30 14:14 ` Lad, Prabhakar
2021-09-30 14:43 ` Wolfram Sang
2021-09-28 14:07 ` [PATCH 6/6] memory: renesas-rpc-if: Add support for RZ/G2L Lad Prabhakar
2021-09-30 14:40 ` Wolfram Sang
2021-10-01 8:02 ` Lad, Prabhakar
2021-10-01 8:54 ` Wolfram Sang
2021-10-01 9:06 ` Lad, Prabhakar
2021-10-01 12:04 ` Wolfram Sang
2021-10-01 12:53 ` Lad, Prabhakar
2021-10-05 9:14 ` Wolfram Sang
2021-09-30 15:01 ` [PATCH 0/6] Add SPI Multi I/O Bus Controller " Wolfram Sang
2021-10-01 8:03 ` Lad, Prabhakar
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=20210928140721.8805-6-prabhakar.mahadev-lad.rj@bp.renesas.com \
--to=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=biju.das.jz@bp.renesas.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=geert+renesas@glider.be \
--cc=krzysztof.kozlowski@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=p.zabel@pengutronix.de \
--cc=prabhakar.csengg@gmail.com \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
--cc=sergei.shtylyov@gmail.com \
--cc=vigneshr@ti.com \
--cc=wsa+renesas@sang-engineering.com \
/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).