On 24/09/2019 08:46, tudor.amba...@microchip.com wrote:
+}
+
+/**
+ * spi_nor_write_sr() - Write the Status Register.
+ * @nor:       pointer to 'struct spi_nor'.
+ * @sr:                buffer to write to the Status Register.
+ * @len:       number of bytes to write to the Status Register.
+ *
+ * Return: 0 on success, -errno otherwise.
  */
-static int write_sr(struct spi_nor *nor, u8 val)
+static int spi_nor_write_sr(struct spi_nor *nor, const u8 *sr, size_t len)
 {
-       nor->bouncebuf[0] = val;
+       int ret;
+
+       ret = spi_nor_write_enable(nor);
+       if (ret)
+               return ret;
+

Hi Tudor,

        if (nor->spimem) {
                struct spi_mem_op op =
                        SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WRSR, 1),
                                   SPI_MEM_OP_NO_ADDR,
                                   SPI_MEM_OP_NO_DUMMY,
-                                  SPI_MEM_OP_DATA_IN(1, nor->bouncebuf, 1));

This be SPI_MEM_OP_DATA_OUT() in the current mainline code also, right?

I'm testing my under development driver on top of v5.4-rc1, and flash_lock -u is broken.

Cheers,
John

+                                  SPI_MEM_OP_DATA_OUT(len, sr, 1));

-               return spi_mem_exec_op(nor->spimem, &op);
+               ret = spi_mem_exec_op(nor->spimem, &op);
+       } else {
+               ret = nor->controller_ops->write_reg(nor, SPINOR_OP_WRSR,
+                                                    sr, len);
        }

-       return nor->controller_ops->write_reg(nor, SPINOR_OP_WRSR,
-                                             nor->bouncebuf, 1);
+       if (ret) {
+               dev_err(nor->dev, "error while writing Status Register\n");
+               return ret;
+       }
+
+       ret = spi_nor_wait_till_ready(nor);
+
+       return ret;
 }

 static struct spi_nor *mtd_to_spi_nor(struct mtd_info *mtd)
@@ -741,161 +914,6 @@ static int winbond_set_4byte(struct spi_nor *nor, bool 
enable)
        return ret;
 }


Reply via email to