On 24.02.2020 19:59, Sergei Shtylyov wrote:
From d72b805cc461ab1e9747c973e9be84e7abb8f828 Mon Sep 17 00:00:00 2001
From: Dirk Behme <dirk.behme@xxxxxxxxxxxx>
Date: Tue, 4 Feb 2020 08:39:31 +0100
Subject: [PATCH] memory: renesas-rpc-if: Correct the STRTIM and some other
clean up
This is required to make the driver work correctly in my M3 environment.
Signed-off-by: Dirk Behme <dirk.behme@xxxxxxxxxxxx>
---
drivers/memory/renesas-rpc-if.c | 42 ++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 17 deletions(-)
diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index 04be92b64bfa..f4356b066384 100644
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
[...]
@@ -513,19 +525,15 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpc, u64 offs, size_t len, void *buf)
pm_runtime_get_sync(rpc->dev);
regmap_update_bits(rpc->regmap, RPCIF_CMNCR, RPCIF_CMNCR_MD, 0);
- regmap_write(rpc->regmap, RPCIF_DRCR,
- RPCIF_DRCR_RBURST(32) | RPCIF_DRCR_RBE);
- regmap_write(rpc->regmap, RPCIF_DRCMR, rpc->command);
- regmap_write(rpc->regmap, RPCIF_DREAR,
- RPCIF_DREAR_EAV(offs >> 25) | RPCIF_DREAR_EAC(1));
- regmap_write(rpc->regmap, RPCIF_DROPR, rpc->option);
- regmap_write(rpc->regmap, RPCIF_DRENR,
- rpc->enable & ~RPCIF_SMENR_SPIDE(0xF));
- regmap_write(rpc->regmap, RPCIF_DRDMCR, rpc->dummy);
- regmap_write(rpc->regmap, RPCIF_DRDRENR, rpc->ddr);
The driver somehow works only with this left in place (with 2 bytes eaten
as before), otherwise all the flash reads all 0xff (via dirmap).
Do you boot from hyperflash?
No, I have arewto say 'cpld write 30 1' in U-Boot before a boot a kernel.
Normally, the V3x Starter Kit boards are wired for the QSPI flash chips.
The system I'm using for testing boots from hyperflash. So most probably all registers
I don't touch in the driver are put into a reasonable state by the boot code, already.
If you don't boot from hyperflash, that at least would explain our different behavior.
Yes. Mind dumping the registers and sending to me?
Using the attached debug patch
(0001-memory-renesas-rpc-if-DEBUG-Dump-register-content.patch) on a
r8a7796 system booting from Hyperflash with above register dropping
reverted (i.e. including touching these registers) I get
Before:
RPCIF_DRCR: 0x00000000
RPCIF_DRCMR: 0x00a00000
RPCIF_DREAR: 0x00000000
RPCIF_DROPR: 0x00000000
RPCIF_DRENR: 0xa222d400
RPCIF_DRDMCR: 0x0000000e
RPCIF_DRDRENR: 0x00005101
After:
RPCIF_DRCR: 0x001f0100
RPCIF_DRCMR: 0x00a00000
RPCIF_DREAR: 0x00010001
RPCIF_DROPR: 0x00000000
RPCIF_DRENR: 0xa202d400
RPCIF_DRDMCR: 0x0000000e
RPCIF_DRDRENR: 0x00005101
Comparing that, just 3 registers are different between my working
version ("Before") and the version which shows the 2-byte offset
("After"): RPCIF_DRCR, RPCIF_DREAR and RPCIF_DRENR. With try & error, at
least in my setup, I was able to reduce this to just RPCIF_DRCR.
Dropping the burst mode I was able to 'fix' the two byte offset issue.
Do you like to give the attached
0001-memory-renesas-rpc-if-Don-t-use-burst-mode-on-read.patch a try in
your setup?
Best regards
Dirk
From 8942c771f8ea8957a14fc6f6e4443675c4b6b260 Mon Sep 17 00:00:00 2001
From: Dirk Behme <dirk.behme@xxxxxxxxxxxx>
Date: Tue, 25 Feb 2020 07:57:12 +0100
Subject: [PATCH] memory: renesas-rpc-if: DEBUG: Dump register content
Dump register content before and after being modified by the driver.
Signed-off-by: Dirk Behme <dirk.behme@xxxxxxxxxxxx>
---
drivers/memory/renesas-rpc-if.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index 4853e7f78985..4486de0b517b 100644
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -517,12 +517,23 @@ 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;
+ u32 data;
if (len > size)
len = size;
pm_runtime_get_sync(rpc->dev);
+ pr_err("Before:\n");
+ regmap_read(rpc->regmap, RPCIF_CMNCR, &data); pr_err("RPCIF_CMNCR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRCR, &data); pr_err("RPCIF_DRCR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRCMR, &data); pr_err("RPCIF_DRCMR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DREAR, &data); pr_err("RPCIF_DREAR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DROPR, &data); pr_err("RPCIF_DROPR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRENR, &data); pr_err("RPCIF_DRENR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRDMCR, &data); pr_err("RPCIF_DRDMCR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRDRENR, &data); pr_err("RPCIF_DRDRENR: 0x%08x\n", data);
+
regmap_update_bits(rpc->regmap, RPCIF_CMNCR, RPCIF_CMNCR_MD, 0);
regmap_write(rpc->regmap, RPCIF_DRCR,
RPCIF_DRCR_RBURST(32) | RPCIF_DRCR_RBE);
@@ -535,6 +546,16 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpc, u64 offs, size_t len, void *buf)
regmap_write(rpc->regmap, RPCIF_DRDMCR, rpc->dummy);
regmap_write(rpc->regmap, RPCIF_DRDRENR, rpc->ddr);
+ pr_err("After:\n");
+ regmap_read(rpc->regmap, RPCIF_CMNCR, &data); pr_err("RPCIF_CMNCR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRCR, &data); pr_err("RPCIF_DRCR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRCMR, &data); pr_err("RPCIF_DRCMR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DREAR, &data); pr_err("RPCIF_DREAR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DROPR, &data); pr_err("RPCIF_DROPR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRENR, &data); pr_err("RPCIF_DRENR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRDMCR, &data); pr_err("RPCIF_DRDMCR: 0x%08x\n", data);
+ regmap_read(rpc->regmap, RPCIF_DRDRENR, &data); pr_err("RPCIF_DRDRENR: 0x%08x\n", data);
+
memcpy_fromio(buf, rpc->dirmap + from, len);
pm_runtime_put(rpc->dev);
--
2.20.0
From 189d30a8e9670f1a5a1e9d3b257f14b7df7bc172 Mon Sep 17 00:00:00 2001
From: Dirk Behme <dirk.behme@xxxxxxxxxxxx>
Date: Tue, 25 Feb 2020 08:41:06 +0100
Subject: [PATCH] memory: renesas-rpc-if: Don't use burst mode on read
Testing shows that enabling the burst mode results in a "2-byte offset"
in read data. Dropping the burst mode seems to fix this.
Signed-off-by: Dirk Behme <dirk.behme@xxxxxxxxxxxx>
---
drivers/memory/renesas-rpc-if.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index 4853e7f78985..2d77eca7aaa5 100644
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -524,8 +524,7 @@ ssize_t rpcif_dirmap_read(struct rpcif *rpc, u64 offs, size_t len, void *buf)
pm_runtime_get_sync(rpc->dev);
regmap_update_bits(rpc->regmap, RPCIF_CMNCR, RPCIF_CMNCR_MD, 0);
- regmap_write(rpc->regmap, RPCIF_DRCR,
- RPCIF_DRCR_RBURST(32) | RPCIF_DRCR_RBE);
+ regmap_write(rpc->regmap, RPCIF_DRCR, 0);
regmap_write(rpc->regmap, RPCIF_DRCMR, rpc->command);
regmap_write(rpc->regmap, RPCIF_DREAR,
RPCIF_DREAR_EAV(offs >> 25) | RPCIF_DREAR_EAC(1));
--
2.20.0
