mtd: spinand: winbond: Clarify when to enable the HS bit

Above 104MHz when in fast dual or quad I/O reads, the delay between
address and data cycles is too short. It is possible to reach higher
frequencies, up to 166MHz, by adding a few more dummy cycles through the
setting of the HS bit. Improve the condition for enabling this bit, and
also make sure we set it at soon as we go over 104MHz.

Fixes: f1a91175faaa ("mtd: spinand: winbond: Enable high-speed modes on w25n0xjw")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index 6dfd0dcc8ee7af6bf6242ebc9daa82ad57ce6b30..e0138785e28080f74944680d8f9d09d23a775da4 100644 (file)
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -337,16 +337,19 @@ static int w25n0xjw_hs_cfg(struct spinand_device *spinand,
        if (iface != SSDR)
                return -EOPNOTSUPP;
 
+       /*
+        * SDR dual and quad I/O operations over 104MHz require the HS bit to
+        * enable a few more dummy cycles.
+        */
        op = spinand->op_templates->read_cache;
        if (op->cmd.dtr || op->addr.dtr || op->dummy.dtr || op->data.dtr)
                hs = false;
-       else if (op->cmd.buswidth == 1 && op->addr.buswidth == 1 &&
-                op->dummy.buswidth == 1 && op->data.buswidth == 1)
+       else if (op->cmd.buswidth != 1 || op->addr.buswidth == 1)
                hs = false;
-       else if (!op->max_freq)
-               hs = true;
-       else
+       else if (op->max_freq && op->max_freq <= 104 * HZ_PER_MHZ)
                hs = false;
+       else
+               hs = true;
 
        ret = spinand_read_reg_op(spinand, W25N0XJW_SR4, &sr4);
        if (ret)