Merge tag 'mtd/fixes-for-4.19-rc5' of git://git.infradead.org/linux-mtd

Boris writes:
  "- Fixes a bug in the ->read/write_reg() implementation of the m25p80
     driver
   - Make sure of_node_get/put() calls are balanced in the partition
     parsing code
   - Fix a race in the denali NAND controller driver
   - Fix false positive WARN_ON() in the marvell NAND controller driver"

* tag 'mtd/fixes-for-4.19-rc5' of git://git.infradead.org/linux-mtd:
  mtd: devices: m25p80: Make sure the buffer passed in op is DMA-able
  mtd: partitions: fix unbalanced of_node_get/put()
  mtd: rawnand: denali: fix a race condition when DMA is kicked
  mtd: rawnand: marvell: prevent harmless warnings

4 files changed, 36 insertions, 5 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index cbfafc453274..270d3c9580c5 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -39,13 +39,23 @@ static int m25p80_read_reg(struct spi_nor *nor, u8 code, u8 *val, int len)
         struct spi_mem_op op = SPI_MEM_OP(SPI_MEM_OP_CMD(code, 1),
                                           SPI_MEM_OP_NO_ADDR,
                                           SPI_MEM_OP_NO_DUMMY,
-                                          SPI_MEM_OP_DATA_IN(len, val, 1));
+                                          SPI_MEM_OP_DATA_IN(len, NULL, 1));
+        void *scratchbuf;
         int ret;
 
+        scratchbuf = kmalloc(len, GFP_KERNEL);
+        if (!scratchbuf)
+                return -ENOMEM;
+
+        op.data.buf.in = scratchbuf;
         ret = spi_mem_exec_op(flash->spimem, &op);
         if (ret < 0)
                 dev_err(&flash->spimem->spi->dev, "error %d reading %x\n", ret,
                         code);
+        else
+                memcpy(val, scratchbuf, len);
+
+        kfree(scratchbuf);
 
         return ret;
 }
@@ -56,9 +66,19 @@ static int m25p80_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)
         struct spi_mem_op op = SPI_MEM_OP(SPI_MEM_OP_CMD(opcode, 1),
                                           SPI_MEM_OP_NO_ADDR,
                                           SPI_MEM_OP_NO_DUMMY,
-                                          SPI_MEM_OP_DATA_OUT(len, buf, 1));
+                                          SPI_MEM_OP_DATA_OUT(len, NULL, 1));
+        void *scratchbuf;
+        int ret;
 
-        return spi_mem_exec_op(flash->spimem, &op);
+        scratchbuf = kmemdup(buf, len, GFP_KERNEL);
+        if (!scratchbuf)
+                return -ENOMEM;
+
+        op.data.buf.out = scratchbuf;
+        ret = spi_mem_exec_op(flash->spimem, &op);
+        kfree(scratchbuf);
+
+        return ret;
 }
 
 static ssize_t m25p80_write(struct spi_nor *nor, loff_t to, size_t len,
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 52e2cb35fc79..99c460facd5e 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -873,8 +873,11 @@ static int mtd_part_of_parse(struct mtd_info *master,
         int ret, err = 0;
 
         np = mtd_get_of_node(master);
-        if (!mtd_is_partition(master))
+        if (mtd_is_partition(master))
+                of_node_get(np);
+        else
                 np = of_get_child_by_name(np, "partitions");
+
         of_property_for_each_string(np, "compatible", prop, compat) {
                 parser = mtd_part_get_compatible_parser(compat);
                 if (!parser)
diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c
index 67b2065e7a19..b864b93dd289 100644
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@@ -596,6 +596,12 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
         }
 
         iowrite32(DMA_ENABLE__FLAG, denali->reg + DMA_ENABLE);
+        /*
+         * The ->setup_dma() hook kicks DMA by using the data/command
+         * interface, which belongs to a different AXI port from the
+         * register interface.  Read back the register to avoid a race.
+         */
+        ioread32(denali->reg + DMA_ENABLE);
 
         denali_reset_irq(denali);
         denali->setup_dma(denali, dma_addr, page, write);
diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index 7af4d6213ee5..bc2ef5209783 100644
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -1547,7 +1547,7 @@ static void marvell_nfc_parse_instructions(struct nand_chip *chip,
         for (op_id = 0; op_id < subop->ninstrs; op_id++) {
                 unsigned int offset, naddrs;
                 const u8 *addrs;
-                int len = nand_subop_get_data_len(subop, op_id);
+                int len;
 
                 instr = &subop->instrs[op_id];
 
@@ -1593,6 +1593,7 @@ static void marvell_nfc_parse_instructions(struct nand_chip *chip,
                                 nfc_op->ndcb[0] |=
                                         NDCB0_CMD_XTYPE(XTYPE_MONOLITHIC_RW) |
                                         NDCB0_LEN_OVRD;
+                                len = nand_subop_get_data_len(subop, op_id);
                                 nfc_op->ndcb[3] |= round_up(len, FIFO_DEPTH);
                         }
                         nfc_op->data_delay_ns = instr->delay_ns;
@@ -1606,6 +1607,7 @@ static void marvell_nfc_parse_instructions(struct nand_chip *chip,
                                 nfc_op->ndcb[0] |=
                                         NDCB0_CMD_XTYPE(XTYPE_MONOLITHIC_RW) |
                                         NDCB0_LEN_OVRD;
+                                len = nand_subop_get_data_len(subop, op_id);
                                 nfc_op->ndcb[3] |= round_up(len, FIFO_DEPTH);
                         }
                         nfc_op->data_delay_ns = instr->delay_ns;