soundwire: use {u32|u16}p_replace_bits
Vinod Koul
maintainerv2 cover soundwire: use {u32|u16}p_replace_bits
This is v2 of the series to fix usage of FIELD_PREP and use {u32|u16}p_replace_bits.
v1 used u32_replace_bits but looks like it might be removed so use the {u32|u16}p_replace_bits() instead. Also this helped to find that one instance in intel driver should have used u16p_replace_bits() so that is fixed too
Vinod Koul (2):
soundwire: cadence: use u32p_replace_bits
soundwire: intel: use {u32|u16}p_replace_bits
drivers/soundwire/cadence_master.c | 21 ++++++++++----------- drivers/soundwire/intel.c | 14 +++++++------- 2 files changed, 17 insertions(+), 18 deletions(-)
Signature · 1 line
2.26.2
Vinod Koul
maintainerPATCH v2 1/2 soundwire: cadence: use u32p_replace_bits
FIELD_PREP() does not replace the bits so it is not apt in case where we modify a register.
Use u32p_replace_bits() instead.
--- drivers/soundwire/cadence_master.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/soundwire/cadence_master.c +10 -11
@@ -1278,9 +1278,9 @@ static int cdns_port_params(struct sdw_bus *bus, dpn_config =cdns_readl (cdns, dpn_config_off); - dpn_config |=FIELD_PREP (CDNS_DPN_CONFIG_WL , (p_params->bps -1 )); - dpn_config |=FIELD_PREP (CDNS_DPN_CONFIG_PORT_FLOW , p_params->flow_mode); - dpn_config |=FIELD_PREP (CDNS_DPN_CONFIG_PORT_DAT , p_params->data_mode); +u32p_replace_bits (&dpn_config, (p_params->bps -1 ),CDNS_DPN_CONFIG_WL ); +u32p_replace_bits (&dpn_config, p_params->flow_mode,CDNS_DPN_CONFIG_PORT_FLOW ); +u32p_replace_bits (&dpn_config, p_params->data_mode,CDNS_DPN_CONFIG_PORT_DAT );cdns_writel (cdns, dpn_config_off, dpn_config);
@@ -1316,18 +1316,17 @@ static int cdns_transport_params(struct sdw_bus *bus, } dpn_config =cdns_readl (cdns, dpn_config_off); - - dpn_config |=FIELD_PREP (CDNS_DPN_CONFIG_BGC , t_params->blk_grp_ctrl); - dpn_config |=FIELD_PREP (CDNS_DPN_CONFIG_BPM , t_params->blk_pkg_mode); +u32p_replace_bits (&dpn_config, t_params->blk_grp_ctrl,CDNS_DPN_CONFIG_BGC ); +u32p_replace_bits (&dpn_config, t_params->blk_pkg_mode,CDNS_DPN_CONFIG_BPM );cdns_writel (cdns, dpn_config_off, dpn_config); - dpn_offsetctrl |=FIELD_PREP (CDNS_DPN_OFFSET_CTRL_1 , t_params->offset1); - dpn_offsetctrl |=FIELD_PREP (CDNS_DPN_OFFSET_CTRL_2 , t_params->offset2); +u32p_replace_bits (&dpn_offsetctrl, t_params->offset1,CDNS_DPN_OFFSET_CTRL_1 ); +u32p_replace_bits (&dpn_offsetctrl, t_params->offset2,CDNS_DPN_OFFSET_CTRL_2 );cdns_writel (cdns, dpn_offsetctrl_off, dpn_offsetctrl); - dpn_hctrl |=FIELD_PREP (CDNS_DPN_HCTRL_HSTART , t_params->hstart); - dpn_hctrl |=FIELD_PREP (CDNS_DPN_HCTRL_HSTOP , t_params->hstop); - dpn_hctrl |=FIELD_PREP (CDNS_DPN_HCTRL_LCTRL , t_params->lane_ctrl); +u32p_replace_bits (&dpn_hctrl, t_params->hstart,CDNS_DPN_HCTRL_HSTART ); +u32p_replace_bits (&dpn_hctrl, t_params->hstop,CDNS_DPN_HCTRL_HSTOP ); +u32p_replace_bits (&dpn_hctrl, t_params->lane_ctrl,CDNS_DPN_HCTRL_LCTRL );cdns_writel (cdns, dpn_hctrl_off, dpn_hctrl);cdns_writel (cdns, dpn_samplectrl_off, (t_params->sample_interval -1 ));
Signature · 1 line
2.26.2
Vinod Koul
maintainerPATCH v2 2/2 soundwire: intel: use {u32|u16}p_replace_bits
In reply to Vinod KoulFIELD_PREP() does not replace the bits so it is not apt in case where we modify a register.
Use u32_replace_bits() or u16_replace_bits() instead.
--- drivers/soundwire/intel.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/soundwire/intel.c +7 -7
@@ -329,7 +329,7 @@ static int intel_link_power_up(struct sdw_intel *sdw)/* set SyncPRD period */ sync_reg =intel_readl (shim,SDW_SHIM_SYNC ); - sync_reg |=FIELD_PREP (SDW_SHIM_SYNC_SYNCPRD , syncprd); +u32p_replace_bits (&sync_reg, syncprd,SDW_SHIM_SYNC_SYNCPRD );/* Set SyncCPU bit */ sync_reg |=SDW_SHIM_SYNC_SYNCCPU ;
@@ -448,7 +448,7 @@ static int intel_shim_init(struct sdw_intel *sdw, bool clock_stop)intel_shim_glue_to_master_ip (sdw); - act |=FIELD_PREP (SDW_SHIM_CTMCTL_DOAIS ,0x1 ); +u16p_replace_bits (&act,0x1 ,SDW_SHIM_CTMCTL_DOAIS ); act |=SDW_SHIM_CTMCTL_DACTQE ; act |=SDW_SHIM_CTMCTL_DODS ;intel_writew (shim,SDW_SHIM_CTMCTL (link_id), act);
@@ -712,9 +712,9 @@ intel_pdi_shim_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)else pdi_conf &= ~(SDW_SHIM_PCMSYCM_DIR ); - pdi_conf |=FIELD_PREP (SDW_SHIM_PCMSYCM_STREAM , pdi->intel_alh_id); - pdi_conf |=FIELD_PREP (SDW_SHIM_PCMSYCM_LCHN , pdi->l_ch_num); - pdi_conf |=FIELD_PREP (SDW_SHIM_PCMSYCM_HCHN , pdi->h_ch_num); +u32p_replace_bits (&pdi_conf, pdi->intel_alh_id,SDW_SHIM_PCMSYCM_STREAM ); +u32p_replace_bits (&pdi_conf, pdi->l_ch_num,SDW_SHIM_PCMSYCM_LCHN ); +u32p_replace_bits (&pdi_conf, pdi->h_ch_num,SDW_SHIM_PCMSYCM_HCHN );intel_writew (shim,SDW_SHIM_PCMSYCHM (link_id, pdi->num), pdi_conf); }
@@ -734,8 +734,8 @@ intel_pdi_alh_configure(struct sdw_intel *sdw, struct sdw_cdns_pdi *pdi)/* Program Stream config ALH register */ conf =intel_readl (alh,SDW_ALH_STRMZCFG (pdi->intel_alh_id)); - conf |=FIELD_PREP (SDW_ALH_STRMZCFG_DMAT ,SDW_ALH_STRMZCFG_DMAT_VAL ); - conf |=FIELD_PREP (SDW_ALH_STRMZCFG_CHN , pdi->ch_count -1 ); +u32p_replace_bits (&conf,SDW_ALH_STRMZCFG_DMAT_VAL ,SDW_ALH_STRMZCFG_DMAT ); +u32p_replace_bits (&conf, pdi->ch_count -1 ,SDW_ALH_STRMZCFG_CHN );intel_writel (alh,SDW_ALH_STRMZCFG (pdi->intel_alh_id), conf); }
Signature · 1 line
2.26.2