| From 9c6f66c8c8f935e23cb6983fc4d40e8b5af2327e Mon Sep 17 00:00:00 2001 |
| From: "William A. Kennington III" <william@wkennington.com> |
| Date: Fri, 22 Sep 2023 10:42:10 -0700 |
| Subject: [PATCH] spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0 |
| |
| 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. |
| |
| Patch Tracking Bug: b/302352423 |
| Upstream Info: https://lore.kernel.org/lkml/20230922182812.2728066-1-william@wkennington.com/ |
| Upstream-Status: Pending |
| Justification: Required for nuvoton BMCs |
| Signed-off-by: William A. Kennington III <william@wkennington.com> |
| --- |
| drivers/spi/spi-npcm-fiu.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/spi/spi-npcm-fiu.c b/drivers/spi/spi-npcm-fiu.c |
| index 0ca21ff0e9cc..e42248519688 100644 |
| --- 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; |
| -- |
| 2.42.0.582.g8ccd20d70d-goog |
| |
