Re: [PATCH v2 4/4] dmaengine: dw-axi-dmac: Use bitfield helpers for registers

[Jia Wang]

On 2026-09-01 10:02 +0300, Andy Shevchenko wrote:
> On Tue, Sep 01, 2026 at 02:16:07PM +0800, Jia Wang wrote:
> > The driver open-codes several channel configuration and descriptor
> > control bitfield writes with left shifts. Define masks for those fields
> > and use FIELD_PREP() when programming the registers.
> > 
> > Valid field values keep the same encoding. FIELD_PREP() confines values
> > to their respective fields, but does not validate handshake numbers
> > supplied through DMA specifiers.
> 
> ...
> 
> >  {
> >  	u32 cfg_lo, cfg_hi;
> >  
> > -	cfg_lo = (config->dst_multblk_type << CH_CFG_L_DST_MULTBLK_TYPE_POS |
> > -		  config->src_multblk_type << CH_CFG_L_SRC_MULTBLK_TYPE_POS);
> > +	cfg_lo = FIELD_PREP(CH_CFG_L_DST_MULTBLK_TYPE, config->dst_multblk_type) |
> > +		 FIELD_PREP(CH_CFG_L_SRC_MULTBLK_TYPE, config->src_multblk_type);
> 
> Personally I would duplicate this to make each branch self-contained.
> 

Agreed. I will initialize cfg_lo separately in each branch in the next
version.

> >  	if (chan->chip->dw->hdata->reg_map_8_channels &&
> >  	    !chan->chip->dw->hdata->use_cfg2) {
> > -		cfg_hi = config->tt_fc << CH_CFG_H_TT_FC_POS |
> > -			 config->hs_sel_src << CH_CFG_H_HS_SEL_SRC_POS |
> > -			 config->hs_sel_dst << CH_CFG_H_HS_SEL_DST_POS |
> > -			 config->src_per << CH_CFG_H_SRC_PER_POS |
> > -			 config->dst_per << CH_CFG_H_DST_PER_POS |
> > -			 config->prior << CH_CFG_H_PRIORITY_POS;
> 
> 		cfg_lo = FIELD_PREP(CH_CFG_L_DST_MULTBLK_TYPE, config->dst_multblk_type) |
> 			 FIELD_PREP(CH_CFG_L_SRC_MULTBLK_TYPE, config->src_multblk_type);
> 
> > +		cfg_hi = FIELD_PREP(CH_CFG_H_TT_FC, config->tt_fc) |
> > +			 FIELD_PREP(CH_CFG_H_HS_SEL_SRC, config->hs_sel_src) |
> > +			 FIELD_PREP(CH_CFG_H_HS_SEL_DST, config->hs_sel_dst) |
> > +			 FIELD_PREP(CH_CFG_H_SRC_PER, config->src_per) |
> > +			 FIELD_PREP(CH_CFG_H_DST_PER, config->dst_per) |
> > +			 FIELD_PREP(CH_CFG_H_PRIORITY, config->prior);
> >  	} else {
> > -		cfg_lo |= config->src_per << CH_CFG2_L_SRC_PER_POS |
> > -			  config->dst_per << CH_CFG2_L_DST_PER_POS;
> > -		cfg_hi = config->tt_fc << CH_CFG2_H_TT_FC_POS |
> > -			 config->hs_sel_src << CH_CFG2_H_HS_SEL_SRC_POS |
> > -			 config->hs_sel_dst << CH_CFG2_H_HS_SEL_DST_POS |
> > -			 config->prior << CH_CFG2_H_PRIORITY_POS;
> > +		cfg_lo |= FIELD_PREP(CH_CFG2_L_SRC_PER, config->src_per) |
> > +			  FIELD_PREP(CH_CFG2_L_DST_PER, config->dst_per);
> 
> 		cfg_lo = FIELD_PREP(CH_CFG_L_DST_MULTBLK_TYPE, config->dst_multblk_type) |
> 			 FIELD_PREP(CH_CFG_L_SRC_MULTBLK_TYPE, config->src_multblk_type) |
> 			 FIELD_PREP(CH_CFG2_L_SRC_PER, config->src_per) |
> 			 FIELD_PREP(CH_CFG2_L_DST_PER, config->dst_per);
> 
> > +		cfg_hi = FIELD_PREP(CH_CFG2_H_TT_FC, config->tt_fc) |
> > +			 FIELD_PREP(CH_CFG2_H_HS_SEL_SRC, config->hs_sel_src) |
> > +			 FIELD_PREP(CH_CFG2_H_HS_SEL_DST, config->hs_sel_dst) |
> > +			 FIELD_PREP(CH_CFG2_H_PRIORITY, config->prior);
> >  	}
> 
> ...
> 
> > -		reg = (DWAXIDMAC_BURST_TRANS_LEN_4 << CH_CTL_L_DST_MSIZE_POS |
> > -		       DWAXIDMAC_BURST_TRANS_LEN_4 << CH_CTL_L_SRC_MSIZE_POS |
> > -		       xfer_width << CH_CTL_L_DST_WIDTH_POS |
> > -		       xfer_width << CH_CTL_L_SRC_WIDTH_POS |
> > -		       DWAXIDMAC_CH_CTL_L_INC << CH_CTL_L_DST_INC_POS |
> > -		       DWAXIDMAC_CH_CTL_L_INC << CH_CTL_L_SRC_INC_POS);
> > +		reg = (FIELD_PREP(CH_CTL_L_DST_MSIZE, DWAXIDMAC_BURST_TRANS_LEN_4) |
> > +		       FIELD_PREP(CH_CTL_L_SRC_MSIZE, DWAXIDMAC_BURST_TRANS_LEN_4) |
> > +		       FIELD_PREP(CH_CTL_L_DST_WIDTH, xfer_width) |
> > +		       FIELD_PREP(CH_CTL_L_SRC_WIDTH, xfer_width) |
> > +		       FIELD_PREP(CH_CTL_L_DST_INC, DWAXIDMAC_CH_CTL_L_INC) |
> > +		       FIELD_PREP(CH_CTL_L_SRC_INC, DWAXIDMAC_CH_CTL_L_INC));
> 
> Unneeded parentheses.
> 

I will drop the outer parentheses in the next version.

> -- 
> With Best Regards,
> Andy Shevchenko
> 
> 
> 

Best regards,
Jia Wang