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
160 .n_yes_ranges = ARRAY_SIZE(rpcif_volatile_ranges),160 .n_yes_ranges = ARRAY_SIZE(rpcif_volatile_ranges),
161};161};
162 162
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 */
168static 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
191static 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
163static const struct regmap_config rpcif_regmap_config = {213static const struct regmap_config rpcif_regmap_config = {
164 .reg_bits = 32,214 .reg_bits = 32,
165 .val_bits = 32,215 .val_bits = 32,
166 .reg_stride = 4,216 .reg_stride = 4,
217 .reg_read = rpcif_reg_read,
218 .reg_write = rpcif_reg_write,
167 .fast_io = true,219 .fast_io = true,
168 .max_register = RPCIF_PHYINT,220 .max_register = RPCIF_PHYINT,
169 .volatile_table = &rpcif_volatile_table,221 .volatile_table = &rpcif_volatile_table,
@@ -173,17 +225,15 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev) · 3 unmodified lines
173{225{
174 struct platform_device *pdev = to_platform_device(dev);226 struct platform_device *pdev = to_platform_device(dev);
175 struct resource *res;227 struct resource *res;
176 void __iomem *base;
177 228
178 rpc->dev = dev;229 rpc->dev = dev;
179 230
180 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");231 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
181 base = devm_ioremap_resource(&pdev->dev, res);232 rpc->base = devm_ioremap_resource(&pdev->dev, res);
182 if (IS_ERR(base))233 if (IS_ERR(rpc->base))
183 return PTR_ERR(base);234 return PTR_ERR(rpc->base);
184 235
185 rpc->regmap = devm_regmap_init_mmio(&pdev->dev, base,236 rpc->regmap = devm_regmap_init(&pdev->dev, NULL, rpc, &rpcif_regmap_config);
186 &rpcif_regmap_config);
187 if (IS_ERR(rpc->regmap)) {237 if (IS_ERR(rpc->regmap)) {
188 dev_err(&pdev->dev,238 dev_err(&pdev->dev,
189 "failed to init regmap for rpcif, error %ld\n",239 "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
354 nbytes = op->data.nbytes;404 nbytes = op->data.nbytes;
355 rpc->xferlen = nbytes;405 rpc->xferlen = nbytes;
356 406
357 rpc->enable |= RPCIF_SMENR_SPIDE(rpcif_bits_set(rpc, nbytes)) |407 rpc->enable |= RPCIF_SMENR_SPIDB(rpcif_bit_size(op->data.buswidth));
358 RPCIF_SMENR_SPIDB(rpcif_bit_size(op->data.buswidth));
359 }408 }
360}409}
361EXPORT_SYMBOL(rpcif_prepare);410EXPORT_SYMBOL(rpcif_prepare);
362 411
363int rpcif_manual_xfer(struct rpcif *rpc)412int rpcif_manual_xfer(struct rpcif *rpc)
364{413{
365 u32 smenr, smcr, pos = 0, max = 4;414 u32 smenr, smcr, pos = 0, max = rpc->bus_size == 2 ? 8 : 4;
366 int ret = 0;415 int ret = 0;
367 416
368 if (rpc->bus_size == 2)
369 max = 8;
370
371 pm_runtime_get_sync(rpc->dev);417 pm_runtime_get_sync(rpc->dev);
372 418
373 regmap_update_bits(rpc->regmap, RPCIF_PHYCNT,419 regmap_update_bits(rpc->regmap, RPCIF_PHYCNT,
@@ -378,37 +424,36 @@ int rpcif_manual_xfer(struct rpcif *rpc) · 4 unmodified lines
378 regmap_write(rpc->regmap, RPCIF_SMOPR, rpc->option);424 regmap_write(rpc->regmap, RPCIF_SMOPR, rpc->option);
379 regmap_write(rpc->regmap, RPCIF_SMDMCR, rpc->dummy);425 regmap_write(rpc->regmap, RPCIF_SMDMCR, rpc->dummy);
380 regmap_write(rpc->regmap, RPCIF_SMDRENR, rpc->ddr);426 regmap_write(rpc->regmap, RPCIF_SMDRENR, rpc->ddr);
427 regmap_write(rpc->regmap, RPCIF_SMADR, rpc->smadr);
381 smenr = rpc->enable;428 smenr = rpc->enable;
382 429
383 switch (rpc->dir) {430 switch (rpc->dir) {
384 case RPCIF_DATA_OUT:431 case RPCIF_DATA_OUT:
385 while (pos < rpc->xferlen) {432 while (pos < rpc->xferlen) {
386 u32 nbytes = rpc->xferlen - pos;433 u32 bytes_left = rpc->xferlen - pos;
387 u32 data[2];434 u32 nbytes, data[2];
388 435
389 smcr = rpc->smcr | RPCIF_SMCR_SPIE;436 smcr = rpc->smcr | RPCIF_SMCR_SPIE;
390 if (nbytes > max) {437
391 nbytes = max;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)
392 smcr |= RPCIF_SMCR_SSLKP;441 smcr |= RPCIF_SMCR_SSLKP;
393 }442
443 smenr |= RPCIF_SMENR_SPIDE(rpcif_bits_set(rpc, nbytes));
444 regmap_write(rpc->regmap, RPCIF_SMENR, smenr);
394 445
395 memcpy(data, rpc->buffer + pos, nbytes);446 memcpy(data, rpc->buffer + pos, nbytes);
396 if (nbytes > 4) {447 if (nbytes == 8) {
397 regmap_write(rpc->regmap, RPCIF_SMWDR1,448 regmap_write(rpc->regmap, RPCIF_SMWDR1,
398 data[0]);449 data[0]);
399 regmap_write(rpc->regmap, RPCIF_SMWDR0,450 regmap_write(rpc->regmap, RPCIF_SMWDR0,
400 data[1]);451 data[1]);
401 } else if (nbytes > 2) {452 } else {
402 regmap_write(rpc->regmap, RPCIF_SMWDR0,453 regmap_write(rpc->regmap, RPCIF_SMWDR0,
403 data[0]);454 data[0]);
404 } else {
405 regmap_write(rpc->regmap, RPCIF_SMWDR0,
406 data[0] << 16);
407 }455 }
408 456
409 regmap_write(rpc->regmap, RPCIF_SMADR,
410 rpc->smadr + pos);
411 regmap_write(rpc->regmap, RPCIF_SMENR, smenr);
412 regmap_write(rpc->regmap, RPCIF_SMCR, smcr);457 regmap_write(rpc->regmap, RPCIF_SMCR, smcr);
413 ret = wait_msg_xfer_end(rpc);458 ret = wait_msg_xfer_end(rpc);
414 if (ret)459 if (ret)
@@ -448,14 +493,16 @@ int rpcif_manual_xfer(struct rpcif *rpc) · 33 unmodified lines
448 break;493 break;
449 }494 }
450 while (pos < rpc->xferlen) {495 while (pos < rpc->xferlen) {
451 u32 nbytes = rpc->xferlen - pos;496 u32 bytes_left = rpc->xferlen - pos;
452 u32 data[2];497 u32 nbytes, data[2];
453 498
454 if (nbytes > max)499 /* nbytes may only be 1, 2, 4, or 8 */
455 nbytes = max;500 nbytes = bytes_left >= max ? max : (1 << ilog2(bytes_left));
456 501
457 regmap_write(rpc->regmap, RPCIF_SMADR,502 regmap_write(rpc->regmap, RPCIF_SMADR,
458 rpc->smadr + pos);503 rpc->smadr + pos);
504 smenr &= ~RPCIF_SMENR_SPIDE(0xF);
505 smenr |= RPCIF_SMENR_SPIDE(rpcif_bits_set(rpc, nbytes));
459 regmap_write(rpc->regmap, RPCIF_SMENR, smenr);506 regmap_write(rpc->regmap, RPCIF_SMENR, smenr);
460 regmap_write(rpc->regmap, RPCIF_SMCR,507 regmap_write(rpc->regmap, RPCIF_SMCR,
461 rpc->smcr | RPCIF_SMCR_SPIE);508 rpc->smcr | RPCIF_SMCR_SPIE);
@@ -463,18 +510,14 @@ int rpcif_manual_xfer(struct rpcif *rpc) · 1 unmodified line
463 if (ret)510 if (ret)
464 goto err_out;511 goto err_out;
465 512
466 if (nbytes > 4) {513 if (nbytes == 8) {
467 regmap_read(rpc->regmap, RPCIF_SMRDR1,514 regmap_read(rpc->regmap, RPCIF_SMRDR1,
468 &data[0]);515 &data[0]);
469 regmap_read(rpc->regmap, RPCIF_SMRDR0,516 regmap_read(rpc->regmap, RPCIF_SMRDR0,
470 &data[1]);517 &data[1]);
471 } else if (nbytes > 2) {518 } else {
472 regmap_read(rpc->regmap, RPCIF_SMRDR0,
473 &data[0]);
474 } else {
475 regmap_read(rpc->regmap, RPCIF_SMRDR0,519 regmap_read(rpc->regmap, RPCIF_SMRDR0,
476 &data[0]);520 &data[0]);
477 data[0] >>= 16;
478 }521 }
479 memcpy(rpc->buffer + pos, data, nbytes);522 memcpy(rpc->buffer + pos, data, nbytes);
480 523
include/memory/renesas-rpc-if.h+1−0
@@ -59,6 +59,7 @@ struct rpcif_op { · 58 unmodified lines
59 59
60struct rpcif {60struct rpcif {
61 struct device *dev;61 struct device *dev;
62 void __iomem *base;
62 void __iomem *dirmap;63 void __iomem *dirmap;
63 struct regmap *regmap;64 struct regmap *regmap;
64 struct reset_control *rstc;65 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