On 04/09/2019 02:20 PM, Sergei Shtylyov wrote:
> [...]
>>>>>> + ret = rpc_spi_set_freq(rpc, desc->mem->spi->max_speed_hz);
>>>>>> + if (ret)
>>>>>> + return ret;
>>>>>> +
>>>>>> + rpc_spi_mem_set_prep_op_cfg(desc->mem->spi,
>>>>>> + &desc->info.op_tmpl, &offs, &len);
>>>>>> +
>>>>>> + regmap_update_bits(rpc->regmap, RPC_CMNCR, RPC_CMNCR_MD, 0);
>>>>>> + regmap_write(rpc->regmap, RPC_DRCR, RPC_DRCR_RBURST(32) |
>>>>>> + RPC_DRCR_RBE);
>>>>>> +
>>>>>> + regmap_write(rpc->regmap, RPC_DRCMR, rpc->cmd);
>>>>>> + regmap_write(rpc->regmap, RPC_DREAR, RPC_DREAR_EAC(1));
>>>>>
>>>>> So you're not even trying to support flashes larger than the
>>> read dirmap?
>>>>> Now I don't think it's acceptable (and I have rewritten this code
>>> internally).
>>>>
>>>> what about the size comes form mtd->size ?
>>>
>>> I'm not talking about size here; we should use the full address.
>>> I'm attaching
>>> my patch...
>>
>> okay,got it!
>> what about just
>> - regmap_write(rpc->mfd->regmap, RPC_DREAR, RPC_DREAR_EAC(1));
>> + regmap_write(rpc->mfd->regmap, RPC_DREAR,
>> + RPC_DREAR_EAV(offs >> 25) | RPC_DREAR_EAC(1));
>>
>> because only > 64MByte size make RPC_DREAR_EAV() work.
>
> Seems OK now, after Boris' reply.
Well, actually not. The 'len' check in the beginning is oversimplified.
Attached is the patch fixing up the dirmap read path (and making it handle
flashes > 64 MiB as well)...
>> thanks & best regards,
>> Mason
>
> [...]
MBR, Sergei
From: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>
Subject: spi: renesas-rpc: fix dirmap read
allow reading from large flashes.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>
---
drivers/spi/spi-renesas-rpc.c | 11 +++++++----
include/linux/mfd/renesas-rpc.h | 2 ++
2 files changed, 9 insertions(+), 4 deletions(-)
Index: renesas/drivers/spi/spi-renesas-rpc.c
===================================================================
--- renesas.orig/drivers/spi/spi-renesas-rpc.c
+++ renesas/drivers/spi/spi-renesas-rpc.c
@@ -264,13 +264,15 @@ static ssize_t rpc_spi_mem_dirmap_read(s
{
struct rpc_spi *rpc =
spi_controller_get_devdata(desc->mem->spi->controller);
+ loff_t from = offs & (RPC_DIRMAP_SIZE - 1);
+ size_t size = RPC_DIRMAP_SIZE - from;
int ret;
if (offs + desc->info.offset + len > U32_MAX)
return -EINVAL;
- if (len > 0x4000000)
- len = 0x4000000;
+ if (len > size)
+ len = size;
ret = rpc_spi_set_freq(rpc, desc->mem->spi->max_speed_hz);
if (ret)
@@ -284,13 +286,14 @@ static ssize_t rpc_spi_mem_dirmap_read(s
RPC_DRCR_RBE);
regmap_write(rpc->regmap, RPC_DRCMR, rpc->cmd);
- regmap_write(rpc->regmap, RPC_DREAR, RPC_DREAR_EAC(1));
+ regmap_write(rpc->regmap, RPC_DREAR,
+ RPC_DREAR_EAV(offs >> 25) | RPC_DREAR_EAC(1));
regmap_write(rpc->regmap, RPC_DROPR, 0);
regmap_write(rpc->regmap, RPC_DRENR, rpc->smenr);
regmap_write(rpc->regmap, RPC_DRDMCR, rpc->dummy);
regmap_write(rpc->regmap, RPC_DRDRENR, 0);
- memcpy_fromio(buf, rpc->dirmap + desc->info.offset + offs, len);
+ memcpy_fromio(buf, rpc->dirmap + desc->info.offset + from, len);
return len;
}
Index: renesas/include/linux/mfd/renesas-rpc.h
===================================================================
--- renesas.orig/include/linux/mfd/renesas-rpc.h
+++ renesas/include/linux/mfd/renesas-rpc.h
@@ -57,6 +57,7 @@
#define RPC_DRCMR_OCMD(c) (((c) & 0xFF) << 0)
#define RPC_DREAR 0x0014 // R/W
+#define RPC_DREAR_EAV(v) (((v) & 0xff) << 16)
#define RPC_DREAR_EAC(c) (((c) & 0x7) << 0)
#define RPC_DROPR 0x0018 // R/W
@@ -140,6 +141,7 @@
#define RPC_PHYOFFSET2 0x0084 // R/W
#define RPC_PHYOFFSET2_OCTTMG(v) (((v) & 0x7) << 8)
+#define RPC_DIRMAP_SIZE 0x4000000
#define RPC_WBUF_SIZE 256 // Write Buffer size
struct rpc {
