History

memory: renesas-rpc-if: Correct QSPI data transfer in Manual mode

This patch fixes 2 problems: [1] The output warning logs and data loss when performing mount/umount then remount the device with jffs2 format. [2] The access width of SMWDR[0:1]/SMRDR[0:1] register is wrong. This is the sample warning logs when performing mount/umount then remount the device with jffs2 format: jffs2: jffs2_scan_inode_node(): CRC failed on node at 0x031c51d4: Read 0x00034e00, calculated 0xadb272a7 The reason for issue [1] is that the writing data seems to get messed up. Data is only completed when the number of bytes is divisible by 4. If you only have 3 bytes of data left to write, 1 garbage byte is inserted after the end of the write stream. If you only have 2 bytes of data left to write, 2 bytes of '00' are added into the write stream. If you only have 1 byte of data left to write, 2 bytes of '00' are added into the write stream. 1 garbage byte is inserted after the end of the write stream. To solve problem [1], data must be written continuously in serial and the write stream ends when data is out. Following HW manual 62.2.15, access to SMWDR0 register should be in the same size as the transfer size specified in the SPIDE[3:0] bits in the manual mode enable setting register (SMENR). Be sure to access from address 0. So, in 16-bit transfer (SPIDE[3:0]=b'1100), SMWDR0 should be accessed by 16-bit width. Similar to SMWDR1, SMDDR0/1 registers. In current code, SMWDR0 register is accessed by regmap_write() that only set up to do 32-bit width. To solve problem [2], data must be written 16-bit or 8-bit when transferring 1-byte or 2-byte.

Wolfram Sang committed 5 years ago

Commit fff53a51 parent 797f0822 files · +79 −35Browse files

Unified · Split

2 files
  1. drivers/memory/renesas-rpc-if.c +78 −35
  2. include/memory/renesas-rpc-if.h +1 −0
drivers/memory/renesas-rpc-if.c+78−35
@@ -160,10 +160,62 @@ static const struct regmap_access_table rpcif_volatile_table = { · 159 unmodified lines
160160 .n_yes_ranges = ARRAY_SIZE(rpcif_volatile_ranges),
161161 };
162162
163+
164+/*
165+ * Custom accessor functions to ensure SMRDR0 and SMWDR0 are always accessed
166+ * with proper width. Requires SMENR_SPIDE to be correctly set before!
167+ */
168+static int rpcif_reg_read(void *context, unsigned int reg, unsigned int *val)
169+{
170+ struct rpcif *rpc = context;
171+
172+ if (reg == RPCIF_SMRDR0 || reg == RPCIF_SMWDR0) {
173+ u32 spide = readl(rpc->base + RPCIF_SMENR) & RPCIF_SMENR_SPIDE(0xF);
174+
175+ if (spide == 0x8) {
176+ *val = readb(rpc->base + reg);
177+ return 0;
178+ } else if (spide == 0xC) {
179+ *val = readw(rpc->base + reg);
180+ return 0;
181+ } else if (spide != 0xF) {
182+ return -EILSEQ;
183+ }
184+ }
185+
186+ *val = readl(rpc->base + reg);
187+ return 0;
188+
189+}
190+
191+static int rpcif_reg_write(void *context, unsigned int reg, unsigned int val)
192+{
193+ struct rpcif *rpc = context;
194+
195+ if (reg == RPCIF_SMRDR0 || reg == RPCIF_SMWDR0) {
196+ u32 spide = readl(rpc->base + RPCIF_SMENR) & RPCIF_SMENR_SPIDE(0xF);
197+
198+ if (spide == 0x8) {
199+ writeb(val, rpc->base + reg);
200+ return 0;
201+ } else if (spide == 0xC) {
202+ writew(val, rpc->base + reg);
203+ return 0;
204+ } else if (spide != 0xF) {
205+ return -EILSEQ;
206+ }
207+ }
208+
209+ writel(val, rpc->base + reg);
210+ return 0;
211+}
212+
163213 static const struct regmap_config rpcif_regmap_config = {
164214 .reg_bits = 32,
165215 .val_bits = 32,
166216 .reg_stride = 4,
217+ .reg_read = rpcif_reg_read,
218+ .reg_write = rpcif_reg_write,
167219 .fast_io = true,
168220 .max_register = RPCIF_PHYINT,
169221 .volatile_table = &rpcif_volatile_table,
@@ -173,17 +225,15 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev) · 3 unmodified lines
173225 {
174226 struct platform_device *pdev = to_platform_device(dev);
175227 struct resource *res;
176− void __iomem *base;
177228
178229 rpc->dev = dev;
179230
180231 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
181− base = devm_ioremap_resource(&pdev->dev, res);
182− if (IS_ERR(base))
183− return PTR_ERR(base);
232+ rpc->base = devm_ioremap_resource(&pdev->dev, res);
233+ if (IS_ERR(rpc->base))
234+ return PTR_ERR(rpc->base);
184235
185− rpc->regmap = devm_regmap_init_mmio(&pdev->dev, base,
186− &rpcif_regmap_config);
236+ rpc->regmap = devm_regmap_init(&pdev->dev, NULL, rpc, &rpcif_regmap_config);
187237 if (IS_ERR(rpc->regmap)) {
188238 dev_err(&pdev->dev,
189239 "failed to init regmap for rpcif, error %ld\n",
@@ -354,20 +404,16 @@ void rpcif_prepare(struct rpcif *rpc, const struct rpcif_op *op, u64 *offs, · 164 unmodified lines
354404 nbytes = op->data.nbytes;
355405 rpc->xferlen = nbytes;
356406
357− rpc->enable |= RPCIF_SMENR_SPIDE(rpcif_bits_set(rpc, nbytes)) |
358− RPCIF_SMENR_SPIDB(rpcif_bit_size(op->data.buswidth));
407+ rpc->enable |= RPCIF_SMENR_SPIDB(rpcif_bit_size(op->data.buswidth));
359408 }
360409 }
361410 EXPORT_SYMBOL(rpcif_prepare);
362411
363412 int rpcif_manual_xfer(struct rpcif *rpc)
364413 {
365− u32 smenr, smcr, pos = 0, max = 4;
414+ u32 smenr, smcr, pos = 0, max = rpc->bus_size == 2 ? 8 : 4;
366415 int ret = 0;
367416
368− if (rpc->bus_size == 2)
369− max = 8;
370−
371417 pm_runtime_get_sync(rpc->dev);
372418
373419 regmap_update_bits(rpc->regmap, RPCIF_PHYCNT,
@@ -378,37 +424,36 @@ int rpcif_manual_xfer(struct rpcif *rpc) · 4 unmodified lines
378424 regmap_write(rpc->regmap, RPCIF_SMOPR, rpc->option);
379425 regmap_write(rpc->regmap, RPCIF_SMDMCR, rpc->dummy);
380426 regmap_write(rpc->regmap, RPCIF_SMDRENR, rpc->ddr);
427+ regmap_write(rpc->regmap, RPCIF_SMADR, rpc->smadr);
381428 smenr = rpc->enable;
382429
383430 switch (rpc->dir) {
384431 case RPCIF_DATA_OUT:
385432 while (pos < rpc->xferlen) {
386− u32 nbytes = rpc->xferlen - pos;
387− u32 data[2];
433+ u32 bytes_left = rpc->xferlen - pos;
434+ u32 nbytes, data[2];
388435
389436 smcr = rpc->smcr | RPCIF_SMCR_SPIE;
390− if (nbytes > max) {
391− nbytes = max;
437+
438+ /* nbytes may only be 1, 2, 4, or 8 */
439+ nbytes = bytes_left >= max ? max : (1 << ilog2(bytes_left));
440+ if (bytes_left > nbytes)
392441 smcr |= RPCIF_SMCR_SSLKP;
393− }
442+
443+ smenr |= RPCIF_SMENR_SPIDE(rpcif_bits_set(rpc, nbytes));
444+ regmap_write(rpc->regmap, RPCIF_SMENR, smenr);
394445
395446 memcpy(data, rpc->buffer + pos, nbytes);
396− if (nbytes > 4) {
447+ if (nbytes == 8) {
397448 regmap_write(rpc->regmap, RPCIF_SMWDR1,
398449 data[0]);
399450 regmap_write(rpc->regmap, RPCIF_SMWDR0,
400451 data[1]);
401− } else if (nbytes > 2) {
452+ } else {
402453 regmap_write(rpc->regmap, RPCIF_SMWDR0,
403454 data[0]);
404− } else {
405− regmap_write(rpc->regmap, RPCIF_SMWDR0,
406− data[0] << 16);
407455 }
408456
409− regmap_write(rpc->regmap, RPCIF_SMADR,
410− rpc->smadr + pos);
411− regmap_write(rpc->regmap, RPCIF_SMENR, smenr);
412457 regmap_write(rpc->regmap, RPCIF_SMCR, smcr);
413458 ret = wait_msg_xfer_end(rpc);
414459 if (ret)
@@ -448,14 +493,16 @@ int rpcif_manual_xfer(struct rpcif *rpc) · 33 unmodified lines
448493 break;
449494 }
450495 while (pos < rpc->xferlen) {
451− u32 nbytes = rpc->xferlen - pos;
452− u32 data[2];
496+ u32 bytes_left = rpc->xferlen - pos;
497+ u32 nbytes, data[2];
453498
454− if (nbytes > max)
455− nbytes = max;
499+ /* nbytes may only be 1, 2, 4, or 8 */
500+ nbytes = bytes_left >= max ? max : (1 << ilog2(bytes_left));
456501
457502 regmap_write(rpc->regmap, RPCIF_SMADR,
458503 rpc->smadr + pos);
504+ smenr &= ~RPCIF_SMENR_SPIDE(0xF);
505+ smenr |= RPCIF_SMENR_SPIDE(rpcif_bits_set(rpc, nbytes));
459506 regmap_write(rpc->regmap, RPCIF_SMENR, smenr);
460507 regmap_write(rpc->regmap, RPCIF_SMCR,
461508 rpc->smcr | RPCIF_SMCR_SPIE);
@@ -463,18 +510,14 @@ int rpcif_manual_xfer(struct rpcif *rpc) · 1 unmodified line
463510 if (ret)
464511 goto err_out;
465512
466− if (nbytes > 4) {
513+ if (nbytes == 8) {
467514 regmap_read(rpc->regmap, RPCIF_SMRDR1,
468515 &data[0]);
469516 regmap_read(rpc->regmap, RPCIF_SMRDR0,
470517 &data[1]);
471− } else if (nbytes > 2) {
472− regmap_read(rpc->regmap, RPCIF_SMRDR0,
473− &data[0]);
474− } else {
518+ } else {
475519 regmap_read(rpc->regmap, RPCIF_SMRDR0,
476520 &data[0]);
477− data[0] >>= 16;
478521 }
479522 memcpy(rpc->buffer + pos, data, nbytes);
480523
include/memory/renesas-rpc-if.h+1−0
@@ -59,6 +59,7 @@ struct rpcif_op { · 58 unmodified lines
5959
6060 struct rpcif {
6161 struct device *dev;
62+ void __iomem *base;
6263 void __iomem *dirmap;
6364 struct regmap *regmap;
6465 struct reset_control *rstc;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t