From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "William A. Kennington III" <william@wkennington.com>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
avifishman70@gmail.com, tmaimon77@gmail.com,
tali.perry1@gmail.com, openbmc@lists.ozlabs.org,
linux-spi@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 11/28] spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0
Date: Sun, 29 Oct 2023 18:58:46 -0400 [thread overview]
Message-ID: <20231029225916.791798-11-sashal@kernel.org> (raw)
In-Reply-To: <20231029225916.791798-1-sashal@kernel.org>
From: "William A. Kennington III" <william@wkennington.com>
[ 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>
---
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 b62471ab6d7f2..1edaf22e265bf 100644
--- a/drivers/spi/spi-npcm-fiu.c
+++ b/drivers/spi/spi-npcm-fiu.c
@@ -334,8 +334,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
next prev parent reply other threads:[~2023-10-29 23:29 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-29 22:58 [PATCH AUTOSEL 5.15 01/28] fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 02/28] fs/ntfs3: Add ckeck in ni_update_parent() Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 03/28] fs/ntfs3: Write immediately updated ntfs state Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 04/28] fs/ntfs3: Use kvmalloc instead of kmalloc(... __GFP_NOWARN) Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 05/28] fs/ntfs3: fix deadlock in mark_as_free_ex Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 06/28] fs/ntfs3: Fix possible NULL-ptr-deref in ni_readpage_cmpr() Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 07/28] fs/ntfs3: Fix NULL pointer dereference on error in attr_allocate_frame() Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 08/28] fs/ntfs3: Fix possible null-pointer dereference in hdr_find_e() Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 09/28] fs/ntfs3: Fix directory element type detection Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 10/28] fs/ntfs3: Avoid possible memory leak Sasha Levin
2023-10-29 22:58 ` Sasha Levin [this message]
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 12/28] nvme-rdma: do not try to stop unallocated queues Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 13/28] ASoC: codecs: wsa-macro: handle component name prefix Sasha Levin
2023-10-30 9:32 ` Krzysztof Kozlowski
2023-11-04 2:00 ` Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 14/28] net: ipv6: fix return value check in esp_remove_trailer Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 15/28] net: ipv4: " Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 16/28] Bluetooth: vhci: Fix race when opening vhci device Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 17/28] netfilter: nfnetlink_log: silence bogus compiler warning Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 18/28] ASoC: rt5650: fix the wrong result of key button Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 19/28] drm/ttm: Reorder sys manager cleanup step Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 20/28] fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 21/28] fbdev: core: cfbcopyarea: fix sloppy typing Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 22/28] fbdev: core: syscopyarea: " Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 23/28] scsi: mpt3sas: Fix in error path Sasha Levin
2023-10-29 22:58 ` [PATCH AUTOSEL 5.15 24/28] platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.15 25/28] platform/x86: asus-wmi: Map 0x2a code, Ignore 0x2b and 0x2c events Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.15 26/28] platform/mellanox: mlxbf-tmfifo: Fix a warning message Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.15 27/28] nvme-pci: add BOGUS_NID for Intel 0a54 device Sasha Levin
2023-10-29 22:59 ` [PATCH AUTOSEL 5.15 28/28] Revert "pinctrl: avoid unsafe code pattern in find_pinctrl()" Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231029225916.791798-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=avifishman70@gmail.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=openbmc@lists.ozlabs.org \
--cc=stable@vger.kernel.org \
--cc=tali.perry1@gmail.com \
--cc=tmaimon77@gmail.com \
--cc=william@wkennington.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®