tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

dmaengine: imx-sdma: utilize compiler to calculate ADDRS_ARRAY_SIZE_V<n>

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>
Link: https://lore.kernel.org/r/20240419150729.1071904-2-Frank.Li@nxp.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Frank Li and committed by
Vinod Koul 1cb49f38 458bb56d

+15 -7
+15 -7
drivers/dma/imx-sdma.c
··· 240 240 s32 utra_addr; 241 241 s32 ram_code_start_addr; 242 242 /* End of v1 array */ 243 - s32 mcu_2_ssish_addr; 243 + union { s32 v1_end; s32 mcu_2_ssish_addr; }; 244 244 s32 ssish_2_mcu_addr; 245 245 s32 hdmi_dma_addr; 246 246 /* End of v2 array */ 247 - s32 zcanfd_2_mcu_addr; 247 + union { s32 v2_end; s32 zcanfd_2_mcu_addr; }; 248 248 s32 zqspi_2_mcu_addr; 249 249 s32 mcu_2_ecspi_addr; 250 250 s32 mcu_2_sai_addr; ··· 252 252 s32 uart_2_mcu_rom_addr; 253 253 s32 uartsh_2_mcu_rom_addr; 254 254 /* End of v3 array */ 255 - s32 mcu_2_zqspi_addr; 255 + union { s32 v3_end; s32 mcu_2_zqspi_addr; }; 256 256 /* End of v4 array */ 257 + s32 v4_end[0]; 257 258 }; 258 259 259 260 /* ··· 1916 1915 spin_unlock_irqrestore(&sdmac->vc.lock, flags); 1917 1916 } 1918 1917 1919 - #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34 1920 - #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 38 1921 - #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 45 1922 - #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4 46 1918 + #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 \ 1919 + (offsetof(struct sdma_script_start_addrs, v1_end) / sizeof(s32)) 1920 + 1921 + #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 \ 1922 + (offsetof(struct sdma_script_start_addrs, v2_end) / sizeof(s32)) 1923 + 1924 + #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 \ 1925 + (offsetof(struct sdma_script_start_addrs, v3_end) / sizeof(s32)) 1926 + 1927 + #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4 \ 1928 + (offsetof(struct sdma_script_start_addrs, v4_end) / sizeof(s32)) 1923 1929 1924 1930 static void sdma_add_scripts(struct sdma_engine *sdma, 1925 1931 const struct sdma_script_start_addrs *addr)