Received-SPF: pass (google.com: domain of linux-kernel+bounces-47990-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: carlos.song@nxp.com
To: broonie@kernel.org,
	shawnguo@kernel.org,
	s.hauer@pengutronix.de,
	kernel@pengutronix.de,
	linux-imx@nxp.com,
	benjamin@bigler.one,
	stefanmoring@gmail.com
Cc: linux-spi@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v4] spi: imx: fix the burst length at DMA mode and CPU mode
Date: Thu,  1 Feb 2024 18:54:51 +0800
Message-Id: <20240201105451.507005-1-carlos.song@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?3YZJRG9O7EnZXlAtiSfLwyU8eDUQlh42WWPflzsvc8sKfS7fyL9S00Hgqa8o?=
 =?us-ascii?Q?QS94FgA/5k631FupTzyew5Zy3kJJ7wTPUcLPFhw6aOvHvvIyWFLUaune6EaK?=
 =?us-ascii?Q?LUp4vmjTtcBiSADpqp+ZwYYPy+w7uEzgTag78nVAAp1i/bWe32ILIJyuXt07?=
 =?us-ascii?Q?Gw3rTExFbARE+NXY0TZnEzCbMmO5HpPZt5kzaDWffoMn717caXRf8pkPLLGf?=
 =?us-ascii?Q?aC6F1KIaLJ/RNN2lp8Z0IyqMPgR1PlwjPkAbpPMqkbVBBP3G/g8bEW935dvG?=
 =?us-ascii?Q?3pWvylFStjhNuN92SlvATGYknxDjGf5suA0bQ/3w8+PyUuNmLLSklE5ErSLV?=
 =?us-ascii?Q?QGKKHtEgUM6QtBJIvXCcG7VPHK1orzhCEiPMK87/bBsWxpwfUSau9LV6QvrW?=
 =?us-ascii?Q?LOegFqtRVDMXeVUn3J+ZOCQDv6jhenitd7Uj5VqCYBbuYcqyQgadzAH7MnN6?=
 =?us-ascii?Q?hhwYSOtMvsxy8YPdnA+6E04MQLP3i3LQFC8EP1A/cj0jyWadG4wcSk/LbEk4?=
 =?us-ascii?Q?GxIiriJOIbnYRK1redhh5VG0uEuFyXznNIG7lxo4SGaJMe9jb/Qrah3DeO1j?=
 =?us-ascii?Q?nFOH2dewojvg7+P+gjHsV5pbhGPY+x+DRqhICZf/m4IvbMVhqInIwLoqNio1?=
 =?us-ascii?Q?i49bCgmz0rls71DaHCewRNRifrWz9YXO5q/Jd8AHfN0h1cworjK1xjY1hnIb?=
 =?us-ascii?Q?t9Tzoo0mzZZF+oAqYFil41oF3ZMPSvKd2Pfs2y5Ycu6/nM/w+MscFKXe0Izr?=
 =?us-ascii?Q?06LNBqeX+6RQP+unDevvrUZQs/+3ncG2PcKvizVVJIiGB7ZLT7kamjZc6bIX?=
 =?us-ascii?Q?XBwlAZXlOJFMNGwgcI4nkO+K13ukKCRpQN4ywMEF0fMnzSp0bsXYfz9lXVYs?=
 =?us-ascii?Q?hHURZhByUZVWgNCYfHzrCDwlx9UJClT2rQyA9UPSw7nj3rS6nxuDVnWRyX7x?=
 =?us-ascii?Q?mZQi8071s5vFoeEz/SvgqIVGqccZDxdY/odnSfZqPa24ilu6VLS6aZK1vmOF?=
 =?us-ascii?Q?BVSX+wuGnvIjL7+kx5OaVjytR+7s1Z79QgXyWPIE1QlCp5xV+jsOd8F7ZNRe?=
 =?us-ascii?Q?FbsB6fgWm27nCcXH8qh9u8BLJvFGp+NfhsEX+jfz1S4r5HA9pDd0r6+B/G1u?=
 =?us-ascii?Q?mo4YiSxk99FFhEb2OZOB7akphTNlwopEQ/f45N3wvrC1L4GeGq4JZQA1h6W0?=
 =?us-ascii?Q?k9e0LrTM8sh2gEJx5pbCrliSKY+2EhpeUGeYCRRtBpJnY/WVi6+Mx7vEWEA7?=
 =?us-ascii?Q?dPvLrYUmWj/F+e3nUTxmnN6/ZaTrMVenhvNzYHp7LkSaw8xjLnr/viAMN41v?=
 =?us-ascii?Q?G0XhksXpynq+dZDjVBWYt1moHWZXbsF/t9kv1GRqVpUhspiAPJsLQDW6d7l6?=
 =?us-ascii?Q?/H5KfkEDdvMJx5T7H2l/Y747GtgtYZGr3WKgk1CQ6eLZF9QXbxT7qLE4VZu/?=
 =?us-ascii?Q?K6PeBJ0Niw06Y9R3x3BF9EPEqGzjsS+YVoM4cJ5AxHn03l+RXFeqPpPLnMxP?=
 =?us-ascii?Q?Bcsx9rwKfbc2ZaZ6Q8CTZI8eUJzsBO85cE1IFlBrOXD75eqbqASLfxnNM6h5?=
 =?us-ascii?Q?svlWf0O9F1u6hBb1qevE1SOpU/+eCNyw7cwH6QVv?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 26eddd88-094a-4121-41f0-08dc23135244
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5005.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2024 10:48:27.4921
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6KjpV57rar2TwIwL7koHz9hUiXTnVfcUZfmBiPks2KLPYeRotGBrjM4jwnHiLwqUtkr1GQT/cd5xH9hl9ZKmBw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7718

From: Carlos Song <carlos.song@nxp.com>

For DMA mode, the bus width of the DMA is equal to the size of data
word, so burst length should be configured as bits per word.

For CPU mode, because of the spi transfer len is in byte, so burst
length should be configured as bits per byte * spi_imx->count.

Signed-off-by: Carlos Song <carlos.song@nxp.com>
Reviewed-by: Clark Wang <xiaoning.wang@nxp.com>
Fixes: e9b220aeacf1 ("spi: spi-imx: correctly configure burst length when using dma")
Fixes: 5f66db08cbd3 ("spi: imx: Take in account bits per word instead of assuming 8-bits")
---
Changes for V3:
- include <linux/bits.h>
Changes for V4:
- keep the includes sorted alphabetically.
---
 drivers/spi/spi-imx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 546cdce525fc..f7990ac2c654 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -2,6 +2,7 @@
 // Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
 // Copyright (C) 2008 Juergen Beisert
 
+#include <linux/bits.h>
 #include <linux/clk.h>
 #include <linux/completion.h>
 #include <linux/delay.h>
@@ -660,15 +661,14 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
 			<< MX51_ECSPI_CTRL_BL_OFFSET;
 	else {
 		if (spi_imx->usedma) {
-			ctrl |= (spi_imx->bits_per_word *
-				spi_imx_bytes_per_word(spi_imx->bits_per_word) - 1)
+			ctrl |= (spi_imx->bits_per_word - 1)
 				<< MX51_ECSPI_CTRL_BL_OFFSET;
 		} else {
 			if (spi_imx->count >= MX51_ECSPI_CTRL_MAX_BURST)
-				ctrl |= (MX51_ECSPI_CTRL_MAX_BURST - 1)
+				ctrl |= (MX51_ECSPI_CTRL_MAX_BURST * BITS_PER_BYTE - 1)
 						<< MX51_ECSPI_CTRL_BL_OFFSET;
 			else
-				ctrl |= (spi_imx->count * spi_imx->bits_per_word - 1)
+				ctrl |= (spi_imx->count * BITS_PER_BYTE - 1)
 						<< MX51_ECSPI_CTRL_BL_OFFSET;
 		}
 	}
-- 
2.34.1