Received-SPF: pass (google.com: domain of linux-kernel+bounces-151629-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Frank Li <Frank.Li@nxp.com>
To: vkoul@kernel.org
Cc: Frank.Li@nxp.com,
	conor+dt@kernel.org,
	devicetree@vger.kernel.org,
	dmaengine@vger.kernel.org,
	festevam@gmail.com,
	imx@lists.linux.dev,
	joy.zou@nxp.com,
	kernel@pengutronix.de,
	krzysztof.kozlowski+dt@linaro.org,
	linux-arm-kernel@lists.infradead.org,
	linux-imx@nxp.com,
	linux-kernel@vger.kernel.org,
	robh@kernel.org,
	s.hauer@pengutronix.de,
	shawnguo@kernel.org
Subject: [PATCH v5 2/3] dmaengine: imx-sdma: utilize compiler to calculate ADDRS_ARRAY_SIZE_V<n>
Date: Fri, 19 Apr 2024 11:07:28 -0400
Message-Id: <20240419150729.1071904-2-Frank.Li@nxp.com>
In-Reply-To: <20240419150729.1071904-1-Frank.Li@nxp.com>
References: <20240419150729.1071904-1-Frank.Li@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?QY6c6/zk01VNA/GEIcosaydmTgREx0nSmTZJX2TTl/QRUF1yjLSh9ulSM41r?=
 =?us-ascii?Q?ADP4XvVohyzz49JBHh8/vyPh8Mfn9wG+3p0vbSszzco9wMouApa4iAWLfk/B?=
 =?us-ascii?Q?a/ElmJbFDF41OyqHBr17JLev+FIZWVe0wlDhXCN78FtGY/dxa5Xjk8hw0Egs?=
 =?us-ascii?Q?4eNkIvC7twUpw5f7NG2L+eQkegu9k4tKDs4KT3OzjDs7yYxrQ/g4vNWPqpvs?=
 =?us-ascii?Q?v9KFJFagY4BMXTxJ8g8telHRdpIR/k83BxGn9DuMrwjP1WjNnBHdwj6bBaQW?=
 =?us-ascii?Q?ZcgkIPBe6RW0x7BJtc/agoQxtx9dp8XFJBvwOxK65+neZDhkTzVNiGodxsd5?=
 =?us-ascii?Q?8gxej1+U5hFQkyOfBwhKyNzwhDmmwcqKwpD5IiVUxmMFmidJqrV+nPit9gMM?=
 =?us-ascii?Q?nEXwtRmu3H/F3Rx46AfC3gbYGy1dlcTrVqbOGrHN90FXPP+lK39lD9PiKUSq?=
 =?us-ascii?Q?mwMlovJZa4FzGSBafMpdQUfEg8HTDYYzrlm7gX18/jze/ujnye8HGsr8vXv8?=
 =?us-ascii?Q?oEZq5Ps9VPoiJtMABg8pydTuzUALHWRK9zv94yq7XDcpt+yqvNt+jpafEiHU?=
 =?us-ascii?Q?mdgrGHef3tIOTYXVgM1IYQUNC2zUPAZhts7Dt5Vo8rFN1uNDY1hfZOfLsu6h?=
 =?us-ascii?Q?wFhp/bOVroI/6WIGNyyIWcv9N7Dp5vqKLtaswP/PMebuCSWCcAuOYjlBZeXo?=
 =?us-ascii?Q?53WXcnmUKwqIc7ZCDuc/dBzpyP2nMZzJgvjsmbh1VFmcEuvqIgQ3/3gjOYxb?=
 =?us-ascii?Q?/V/37eKN0BRqOFgVWhdGUJlhov6OsvYjT5QdZ+VMKPtcEt2Xdftc4eH0buGj?=
 =?us-ascii?Q?/dDN6BvZxu/TA8NSktFPsZT1rymrmhBFj54COoM0E8+Jox/33rnP0Mbh07Ep?=
 =?us-ascii?Q?MVVtVsKlo/C9WytNh4SDN0Y+qaovmyXWzO+lBu2R7tG+dcrtv9ZesUVJYE7T?=
 =?us-ascii?Q?8z13OF9khsTA++PeVuU19QYIaGa9tJBd8TrwUtbf+oq1S00ip4WtSKJZAoZp?=
 =?us-ascii?Q?M8entODfDmOSwWVPHw8f9ZUK1CNDAo2opc93FBn7OkGzEHQ2p0nkZphkq/aL?=
 =?us-ascii?Q?7r1blMbIj5D5H5AiX84zi1T5KIB2GvEoCihwQZRY/h+qVAyfR6lbHeLhSOd1?=
 =?us-ascii?Q?O1ndmzO+jGFuV0g0HnPrTAhGtAjPi0jZq4EQOD3xgz9KgoSmLqS/1G1pPrGN?=
 =?us-ascii?Q?2kCeEG+mjILinL757flwTGR47FAplW4UpQJsiIxjKRflK/eahvWt6tw0bvRE?=
 =?us-ascii?Q?ELm5900425nb3nSGRY3RD+/E2GAhKim6EVoz0VFLZx1oFs1UWBL+UNAnGpPH?=
 =?us-ascii?Q?9gn3XaCTPMneS3CgNnZMiLAzR3e0pAF9GTkW3S9XBRrd+3UKDBCBZWX2FL1H?=
 =?us-ascii?Q?CHbZoseRVBM5v3HOJdNyC2j2HMK5sl0/F3l0pb2xIVosuyB49jpToBW8Xojc?=
 =?us-ascii?Q?iKhrTn/04hqAmQck667Isf1fW/fG/mZSUpvnml2zylMM88URBaeVXYcaVbN0?=
 =?us-ascii?Q?QQme667wisp/71Y5MHLfLAqitJa0JYifPoMa94HLq7VqF8anHhEyXNYYimoY?=
 =?us-ascii?Q?/Fbh1RgR4640jHAoIKVxkEBGM9itPzFxdDlGzw7w?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 547299e4-6431-4d9e-e8a6-08dc60827ba3
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 15:07:51.7869
 (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: peAwbJHSKoknBAoiV4wa2NEmnwO3HTMlwKZOl/aAAqo84CAyvyjaTUjOU178JM+elaQipZu/LbU5ok2eciPZHA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB10330

The macros SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V<n> actually related with the
struct sdma_script_start_addrs.

struct sdma_script_start_addrs {
        ...
	/* End of v1 array */
        ...
	/* End of v2 array */
	...
        /* End of v3 array */
	...
        /* End of v4 array */
};

When add new field of sdma_script_start_addrs, it is easy to miss update
SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V<n>.

Employ offsetof for SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V<n> macros instead of
hardcoding numbers. the preprocessing stage will calculate the size for
each version automatically.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change at v5
    - new patch

 drivers/dma/imx-sdma.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index f68ab34a3c880..4a4d44ed03c8b 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -240,11 +240,11 @@ struct sdma_script_start_addrs {
 	s32 utra_addr;
 	s32 ram_code_start_addr;
 	/* End of v1 array */
-	s32 mcu_2_ssish_addr;
+	union {	s32 v1_end; s32 mcu_2_ssish_addr; };
 	s32 ssish_2_mcu_addr;
 	s32 hdmi_dma_addr;
 	/* End of v2 array */
-	s32 zcanfd_2_mcu_addr;
+	union { s32 v2_end; s32 zcanfd_2_mcu_addr; };
 	s32 zqspi_2_mcu_addr;
 	s32 mcu_2_ecspi_addr;
 	s32 mcu_2_sai_addr;
@@ -252,8 +252,9 @@ struct sdma_script_start_addrs {
 	s32 uart_2_mcu_rom_addr;
 	s32 uartsh_2_mcu_rom_addr;
 	/* End of v3 array */
-	s32 mcu_2_zqspi_addr;
+	union { s32 v3_end; s32 mcu_2_zqspi_addr; };
 	/* End of v4 array */
+	s32 v4_end[0];
 };
 
 /*
@@ -1915,10 +1916,17 @@ static void sdma_issue_pending(struct dma_chan *chan)
 	spin_unlock_irqrestore(&sdmac->vc.lock, flags);
 }
 
-#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1	34
-#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2	38
-#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3	45
-#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4	46
+#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1	\
+(offsetof(struct sdma_script_start_addrs, v1_end) / sizeof(s32))
+
+#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 \
+(offsetof(struct sdma_script_start_addrs, v2_end) / sizeof(s32))
+
+#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 \
+(offsetof(struct sdma_script_start_addrs, v3_end) / sizeof(s32))
+
+#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4 \
+(offsetof(struct sdma_script_start_addrs, v4_end) / sizeof(s32))
 
 static void sdma_add_scripts(struct sdma_engine *sdma,
 			     const struct sdma_script_start_addrs *addr)
-- 
2.34.1