spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0

[ Upstream commit 2ec8b010979036c2fe79a64adb6ecc0bd11e91d1 ]

We don't want to use the value of ilog2(0) as dummy.buswidth is 0 when
dummy.nbytes is 0. Since we have no dummy bytes, we don't need to
configure the dummy byte bits per clock register value anyway.

Signed-off-by: "William A. Kennington III" <william@wkennington.com>
Link: https://lore.kernel.org/r/20230922182812.2728066-1-william@wkennington.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/spi/spi-npcm-fiu.c b/drivers/spi/spi-npcm-fiu.c
index eb353561509a8a1e39079d46bbf2206b11e352ee..01a2b9de18b7fa8a13227533f3c8745ddc249b91 100644 (file)
--- a/drivers/spi/spi-npcm-fiu.c
+++ b/drivers/spi/spi-npcm-fiu.c
@@ -353,8 +353,9 @@ static int npcm_fiu_uma_read(struct spi_mem *mem,
                uma_cfg |= ilog2(op->cmd.buswidth);
                uma_cfg |= ilog2(op->addr.buswidth)
                        << NPCM_FIU_UMA_CFG_ADBPCK_SHIFT;
-               uma_cfg |= ilog2(op->dummy.buswidth)
-                       << NPCM_FIU_UMA_CFG_DBPCK_SHIFT;
+               if (op->dummy.nbytes)
+                       uma_cfg |= ilog2(op->dummy.buswidth)
+                               << NPCM_FIU_UMA_CFG_DBPCK_SHIFT;
                uma_cfg |= ilog2(op->data.buswidth)
                        << NPCM_FIU_UMA_CFG_RDBPCK_SHIFT;
                uma_cfg |= op->dummy.nbytes << NPCM_FIU_UMA_CFG_DBSIZ_SHIFT;