On Fri, Jan 30, 2026 at 04:31:41PM +0530, Sai Sree Kartheek Adivi wrote:
> Move macros defined in k3-udma.c to k3-udma.h for better separation and
> re-use.
>
> Signed-off-by: Sai Sree Kartheek Adivi <s-adivi@ti.com>
> ---
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> drivers/dma/ti/k3-udma.c | 62 ---------------------------------------
> drivers/dma/ti/k3-udma.h | 63 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 63 insertions(+), 62 deletions(-)
>
> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
> index aa2dc762140f6..4cc64763de1f6 100644
> --- a/drivers/dma/ti/k3-udma.c
> +++ b/drivers/dma/ti/k3-udma.c
> @@ -39,21 +39,6 @@ struct udma_static_tr {
> u16 bstcnt; /* RPSTR1 */
> };
>
> -#define K3_UDMA_MAX_RFLOWS 1024
> -#define K3_UDMA_DEFAULT_RING_SIZE 16
> -
> -/* How SRC/DST tag should be updated by UDMA in the descriptor's Word 3 */
> -#define UDMA_RFLOW_SRCTAG_NONE 0
> -#define UDMA_RFLOW_SRCTAG_CFG_TAG 1
> -#define UDMA_RFLOW_SRCTAG_FLOW_ID 2
> -#define UDMA_RFLOW_SRCTAG_SRC_TAG 4
> -
> -#define UDMA_RFLOW_DSTTAG_NONE 0
> -#define UDMA_RFLOW_DSTTAG_CFG_TAG 1
> -#define UDMA_RFLOW_DSTTAG_FLOW_ID 2
> -#define UDMA_RFLOW_DSTTAG_DST_TAG_LO 4
> -#define UDMA_RFLOW_DSTTAG_DST_TAG_HI 5
> -
> struct udma_chan;
>
> enum k3_dma_type {
> @@ -118,15 +103,6 @@ struct udma_oes_offsets {
> u32 pktdma_rchan_flow;
> };
>
> -#define UDMA_FLAG_PDMA_ACC32 BIT(0)
> -#define UDMA_FLAG_PDMA_BURST BIT(1)
> -#define UDMA_FLAG_TDTYPE BIT(2)
> -#define UDMA_FLAG_BURST_SIZE BIT(3)
> -#define UDMA_FLAGS_J7_CLASS (UDMA_FLAG_PDMA_ACC32 | \
> - UDMA_FLAG_PDMA_BURST | \
> - UDMA_FLAG_TDTYPE | \
> - UDMA_FLAG_BURST_SIZE)
> -
> struct udma_match_data {
> enum k3_dma_type type;
> u32 psil_base;
> @@ -1837,38 +1813,6 @@ static int udma_alloc_rx_resources(struct udma_chan *uc)
> return ret;
> }
>
> -#define TISCI_BCDMA_BCHAN_VALID_PARAMS ( \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_EXTENDED_CH_TYPE_VALID)
> -
> -#define TISCI_BCDMA_TCHAN_VALID_PARAMS ( \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_SUPR_TDPKT_VALID)
> -
> -#define TISCI_BCDMA_RCHAN_VALID_PARAMS ( \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID)
> -
> -#define TISCI_UDMA_TCHAN_VALID_PARAMS ( \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_FILT_EINFO_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_FILT_PSWORDS_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_SUPR_TDPKT_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID)
> -
> -#define TISCI_UDMA_RCHAN_VALID_PARAMS ( \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_SHORT_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_LONG_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_START_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_CNT_VALID | \
> - TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID)
> -
> static int udma_tisci_m2m_channel_config(struct udma_chan *uc)
> {
> struct udma_dev *ud = uc->ud;
> @@ -5398,12 +5342,6 @@ static enum dmaengine_alignment udma_get_copy_align(struct udma_dev *ud)
> }
> }
>
> -#define TI_UDMAC_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
> - BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
> - BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \
> - BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | \
> - BIT(DMA_SLAVE_BUSWIDTH_8_BYTES))
> -
> static int udma_probe(struct platform_device *pdev)
> {
> struct device_node *navss_node = pdev->dev.parent->of_node;
> diff --git a/drivers/dma/ti/k3-udma.h b/drivers/dma/ti/k3-udma.h
> index 9062a237cd167..750720cd06911 100644
> --- a/drivers/dma/ti/k3-udma.h
> +++ b/drivers/dma/ti/k3-udma.h
> @@ -97,6 +97,69 @@
> /* Address Space Select */
> #define K3_ADDRESS_ASEL_SHIFT 48
>
> +#define K3_UDMA_MAX_RFLOWS 1024
> +#define K3_UDMA_DEFAULT_RING_SIZE 16
> +
> +/* How SRC/DST tag should be updated by UDMA in the descriptor's Word 3 */
> +#define UDMA_RFLOW_SRCTAG_NONE 0
> +#define UDMA_RFLOW_SRCTAG_CFG_TAG 1
> +#define UDMA_RFLOW_SRCTAG_FLOW_ID 2
> +#define UDMA_RFLOW_SRCTAG_SRC_TAG 4
> +
> +#define UDMA_RFLOW_DSTTAG_NONE 0
> +#define UDMA_RFLOW_DSTTAG_CFG_TAG 1
> +#define UDMA_RFLOW_DSTTAG_FLOW_ID 2
> +#define UDMA_RFLOW_DSTTAG_DST_TAG_LO 4
> +#define UDMA_RFLOW_DSTTAG_DST_TAG_HI 5
> +
> +#define UDMA_FLAG_PDMA_ACC32 BIT(0)
> +#define UDMA_FLAG_PDMA_BURST BIT(1)
> +#define UDMA_FLAG_TDTYPE BIT(2)
> +#define UDMA_FLAG_BURST_SIZE BIT(3)
> +#define UDMA_FLAGS_J7_CLASS (UDMA_FLAG_PDMA_ACC32 | \
> + UDMA_FLAG_PDMA_BURST | \
> + UDMA_FLAG_TDTYPE | \
> + UDMA_FLAG_BURST_SIZE)
> +
> +#define TI_UDMAC_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
> + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
> + BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \
> + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | \
> + BIT(DMA_SLAVE_BUSWIDTH_8_BYTES))
> +
> +/* TI_SCI Params */
> +#define TISCI_BCDMA_BCHAN_VALID_PARAMS ( \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_EXTENDED_CH_TYPE_VALID)
> +
> +#define TISCI_BCDMA_TCHAN_VALID_PARAMS ( \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_SUPR_TDPKT_VALID)
> +
> +#define TISCI_BCDMA_RCHAN_VALID_PARAMS ( \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID)
> +
> +#define TISCI_UDMA_TCHAN_VALID_PARAMS ( \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_FILT_EINFO_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_FILT_PSWORDS_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_TX_SUPR_TDPKT_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID)
> +
> +#define TISCI_UDMA_RCHAN_VALID_PARAMS ( \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_PAUSE_ON_ERR_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_FETCH_SIZE_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_CQ_QNUM_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_CHAN_TYPE_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_SHORT_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_IGNORE_LONG_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_START_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_RX_FLOWID_CNT_VALID | \
> + TI_SCI_MSG_VALUE_RM_UDMAP_CH_ATYPE_VALID)
> +
> struct udma_dev;
> struct udma_tchan;
> struct udma_rchan;
> --
> 2.34.1
>