git.openwrt.org Git - openwrt/staging/thess.git/blob

   1 From fffca269e4f31c3633c6d810833ba1b184407915 Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date: Thu, 19 Sep 2024 18:57:16 +0200
   4 Subject: [PATCH] spi: airoha: remove read cache in airoha_snand_dirmap_read()
   5
   6 Current upstream driver reports errors running mtd_oobtest kernel module
   7 test:
   8
   9 root@OpenWrt:/# insmod mtd_test.ko
  10 root@OpenWrt:/# insmod mtd_oobtest.ko dev=5
  11 [ 7023.730584] =================================================
  12 [ 7023.736399] mtd_oobtest: MTD device: 5
  13 [ 7023.740160] mtd_oobtest: MTD device size 3670016, eraseblock size 131072, page size 2048, count of eraseblocks 28, pages per eraseblock 64, OOB size 128
  14 [ 7023.753837] mtd_test: scanning for bad eraseblocks
  15 [ 7023.758636] mtd_test: scanned 28 eraseblocks, 0 are bad
  16 [ 7023.763861] mtd_oobtest: test 1 of 5
  17 [ 7024.042076] mtd_oobtest: writing OOBs of whole device
  18 [ 7024.682069] mtd_oobtest: written up to eraseblock 0
  19 [ 7041.962077] mtd_oobtest: written 28 eraseblocks
  20 [ 7041.966626] mtd_oobtest: verifying all eraseblocks
  21 [ 7041.972276] mtd_oobtest: error @addr[0x0:0x0] 0xff -> 0xe diff 0xf1
  22 [ 7041.978550] mtd_oobtest: error @addr[0x0:0x1] 0xff -> 0x10 diff 0xef
  23 [ 7041.984932] mtd_oobtest: error @addr[0x0:0x2] 0xff -> 0x82 diff 0x7d
  24 [ 7041.991293] mtd_oobtest: error @addr[0x0:0x3] 0xff -> 0x10 diff 0xef
  25 [ 7041.997659] mtd_oobtest: error @addr[0x0:0x4] 0xff -> 0x0 diff 0xff
  26 [ 7042.003942] mtd_oobtest: error @addr[0x0:0x5] 0xff -> 0x8a diff 0x75
  27 [ 7042.010294] mtd_oobtest: error @addr[0x0:0x6] 0xff -> 0x20 diff 0xdf
  28 [ 7042.016659] mtd_oobtest: error @addr[0x0:0x7] 0xff -> 0x1 diff 0xfe
  29 [ 7042.022935] mtd_oobtest: error @addr[0x0:0x8] 0xff -> 0x2e diff 0xd1
  30 [ 7042.029295] mtd_oobtest: error @addr[0x0:0x9] 0xff -> 0x40 diff 0xbf
  31 [ 7042.035661] mtd_oobtest: error @addr[0x0:0xa] 0xff -> 0x0 diff 0xff
  32 [ 7042.041935] mtd_oobtest: error @addr[0x0:0xb] 0xff -> 0x89 diff 0x76
  33 [ 7042.048300] mtd_oobtest: error @addr[0x0:0xc] 0xff -> 0x82 diff 0x7d
  34 [ 7042.054662] mtd_oobtest: error @addr[0x0:0xd] 0xff -> 0x15 diff 0xea
  35 [ 7042.061014] mtd_oobtest: error @addr[0x0:0xe] 0xff -> 0x90 diff 0x6f
  36 [ 7042.067380] mtd_oobtest: error @addr[0x0:0xf] 0xff -> 0x0 diff 0xff
  37 ....
  38 [ 7432.421369] mtd_oobtest: error @addr[0x237800:0x36] 0xff -> 0x5f diff 0xa0
  39 [ 7432.428242] mtd_oobtest: error @addr[0x237800:0x37] 0xff -> 0x21 diff 0xde
  40 [ 7432.435118] mtd_oobtest: error: verify failed at 0x237800
  41 [ 7432.440510] mtd_oobtest: error: too many errors
  42 [ 7432.445053] mtd_oobtest: error -1 occurred
  43
  44 The above errors are due to the buggy logic in the 'read cache' available
  45 in airoha_snand_dirmap_read() routine since there are some corner cases
  46 where we are missing data updates. Since we do not get any read/write speed
  47 improvement using the cache (according to the mtd_speedtest kernel
  48 module test), in order to fix the mtd_oobtest test, remove the 'read cache'
  49 in airoha_snand_dirmap_read routine. Now the driver is passing all the
  50 tests available in mtd_test suite.
  51
  52 Fixes: a403997c1201 ("spi: airoha: add SPI-NAND Flash controller driver")
  53 Tested-by: Christian Marangi <ansuelsmth@gmail.com>
  54 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  55 Link: https://patch.msgid.link/20240919-airoha-spi-fixes-v2-1-cb0f0ed9920a@kernel.org
  56 Signed-off-by: Mark Brown <broonie@kernel.org>
  57 ---
  58  drivers/spi/spi-airoha-snfi.c | 21 ---------------------
  59  1 file changed, 21 deletions(-)
  60
  61 --- a/drivers/spi/spi-airoha-snfi.c
  62 +++ b/drivers/spi/spi-airoha-snfi.c
  63 @@ -211,9 +211,6 @@ struct airoha_snand_dev {
  64
  65         u8 *txrx_buf;
  66         dma_addr_t dma_addr;
  67 -
  68 -       u64 cur_page_num;
  69 -       bool data_need_update;
  70  };
  71
  72  struct airoha_snand_ctrl {
  73 @@ -644,11 +641,6 @@ static ssize_t airoha_snand_dirmap_read(
  74         u32 val, rd_mode;
  75         int err;
  76
  77 -       if (!as_dev->data_need_update)
  78 -               return len;
  79 -
  80 -       as_dev->data_need_update = false;
  81 -
  82         switch (op->cmd.opcode) {
  83         case SPI_NAND_OP_READ_FROM_CACHE_DUAL:
  84                 rd_mode = 1;
  85 @@ -895,23 +887,11 @@ static ssize_t airoha_snand_dirmap_write
  86  static int airoha_snand_exec_op(struct spi_mem *mem,
  87                                 const struct spi_mem_op *op)
  88  {
  89 -       struct airoha_snand_dev *as_dev = spi_get_ctldata(mem->spi);
  90         u8 data[8], cmd, opcode = op->cmd.opcode;
  91         struct airoha_snand_ctrl *as_ctrl;
  92         int i, err;
  93
  94         as_ctrl = spi_controller_get_devdata(mem->spi->controller);
  95 -       if (opcode == SPI_NAND_OP_PROGRAM_EXECUTE &&
  96 -           op->addr.val == as_dev->cur_page_num) {
  97 -               as_dev->data_need_update = true;
  98 -       } else if (opcode == SPI_NAND_OP_PAGE_READ) {
  99 -               if (!as_dev->data_need_update &&
 100 -                   op->addr.val == as_dev->cur_page_num)
 101 -                       return 0;
 102 -
 103 -               as_dev->data_need_update = true;
 104 -               as_dev->cur_page_num = op->addr.val;
 105 -       }
 106
 107         /* switch to manual mode */
 108         err = airoha_snand_set_mode(as_ctrl, SPI_MODE_MANUAL);
 109 @@ -996,7 +976,6 @@ static int airoha_snand_setup(struct spi
 110         if (dma_mapping_error(as_ctrl->dev, as_dev->dma_addr))
 111                 return -ENOMEM;
 112
 113 -       as_dev->data_need_update = true;
 114         spi_set_ctldata(spi, as_dev);
 115
 116         return 0;