Commit e8509361 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'regmap-simple-bit-helpers' 



Bartosz Golaszewski says:

====================
regmap: provide simple bitops and use them in a driver

I noticed that oftentimes I use regmap_update_bits() for simple bit
setting or clearing. In this case the fourth argument is superfluous as
it's always 0 or equal to the mask argument.

This series proposes to add simple bit operations for setting, clearing
and testing specific bits with regmap.

The second patch uses all three in a driver that got recently picked into
the net-next tree.

The patches obviously target different trees so - if you're ok with
the change itself - I propose you pick the first one into your regmap
tree for v5.8 and then I'll resend the second patch to add the first
user for these macros for v5.9.

v1 -> v2:
- convert the new macros to static inline functions

v2 -> v3:
- drop unneeded ternary operator
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bda6752f 240f1ae4

drivers/base/regmap/regmap.c

+22 −0
Original line number Diff line number Diff line
@@ -2936,6 +2936,28 @@ int regmap_update_bits_base(struct regmap *map, unsigned int reg, 
}

EXPORT_SYMBOL_GPL(regmap_update_bits_base);



/**

 * regmap_test_bits() - Check if all specified bits are set in a register.

 *

 * @map: Register map to operate on

 * @reg: Register to read from

 * @bits: Bits to test

 *

 * Returns -1 if the underlying regmap_read() fails, 0 if at least one of the

 * tested bits is not set and 1 if all tested bits are set.

 */

int regmap_test_bits(struct regmap *map, unsigned int reg, unsigned int bits)

{

	unsigned int val, ret;



	ret = regmap_read(map, reg, &val);

	if (ret)

		return ret;



	return (val & bits) == bits;

}

EXPORT_SYMBOL_GPL(regmap_test_bits);



void regmap_async_complete_cb(struct regmap_async *async, int ret)

{

	struct regmap *map = async->map;

drivers/net/ethernet/mediatek/mtk_star_emac.c

+35 −45
Original line number Diff line number Diff line
@@ -413,8 +413,8 @@ static void mtk_star_dma_unmap_tx(struct mtk_star_priv *priv, 


static void mtk_star_nic_disable_pd(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_MAC_CFG,

			   MTK_STAR_BIT_MAC_CFG_NIC_PD, 0);

	regmap_clear_bits(priv->regs, MTK_STAR_REG_MAC_CFG,

			  MTK_STAR_BIT_MAC_CFG_NIC_PD);

}



/* Unmask the three interrupts we care about, mask all others. */
@@ -434,40 +434,37 @@ static void mtk_star_intr_disable(struct mtk_star_priv *priv) 


static void mtk_star_intr_enable_tx(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			   MTK_STAR_BIT_INT_STS_TNTC, 0);

	regmap_clear_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			  MTK_STAR_BIT_INT_STS_TNTC);

}



static void mtk_star_intr_enable_rx(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			   MTK_STAR_BIT_INT_STS_FNRC, 0);

	regmap_clear_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			  MTK_STAR_BIT_INT_STS_FNRC);

}



static void mtk_star_intr_enable_stats(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			   MTK_STAR_REG_INT_STS_MIB_CNT_TH, 0);

	regmap_clear_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			  MTK_STAR_REG_INT_STS_MIB_CNT_TH);

}



static void mtk_star_intr_disable_tx(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			   MTK_STAR_BIT_INT_STS_TNTC,

	regmap_set_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			MTK_STAR_BIT_INT_STS_TNTC);

}



static void mtk_star_intr_disable_rx(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			   MTK_STAR_BIT_INT_STS_FNRC,

	regmap_set_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			MTK_STAR_BIT_INT_STS_FNRC);

}



static void mtk_star_intr_disable_stats(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			   MTK_STAR_REG_INT_STS_MIB_CNT_TH,

	regmap_set_bits(priv->regs, MTK_STAR_REG_INT_MASK,

			MTK_STAR_REG_INT_STS_MIB_CNT_TH);

}
@@ -524,11 +521,9 @@ static void mtk_star_dma_init(struct mtk_star_priv *priv) 


static void mtk_star_dma_start(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_TX_DMA_CTRL,

			   MTK_STAR_BIT_TX_DMA_CTRL_START,

	regmap_set_bits(priv->regs, MTK_STAR_REG_TX_DMA_CTRL,

			MTK_STAR_BIT_TX_DMA_CTRL_START);

	regmap_update_bits(priv->regs, MTK_STAR_REG_RX_DMA_CTRL,

			   MTK_STAR_BIT_RX_DMA_CTRL_START,

	regmap_set_bits(priv->regs, MTK_STAR_REG_RX_DMA_CTRL,

			MTK_STAR_BIT_RX_DMA_CTRL_START);

}
@@ -553,15 +548,13 @@ static void mtk_star_dma_disable(struct mtk_star_priv *priv) 


static void mtk_star_dma_resume_rx(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_RX_DMA_CTRL,

			   MTK_STAR_BIT_RX_DMA_CTRL_RESUME,

	regmap_set_bits(priv->regs, MTK_STAR_REG_RX_DMA_CTRL,

			MTK_STAR_BIT_RX_DMA_CTRL_RESUME);

}



static void mtk_star_dma_resume_tx(struct mtk_star_priv *priv)

{

	regmap_update_bits(priv->regs, MTK_STAR_REG_TX_DMA_CTRL,

			   MTK_STAR_BIT_TX_DMA_CTRL_RESUME,

	regmap_set_bits(priv->regs, MTK_STAR_REG_TX_DMA_CTRL,

			MTK_STAR_BIT_TX_DMA_CTRL_RESUME);

}
@@ -842,8 +835,8 @@ static int mtk_star_hash_wait_ok(struct mtk_star_priv *priv) 
		return ret;



	/* Check the BIST_OK bit. */

	regmap_read(priv->regs, MTK_STAR_REG_HASH_CTRL, &val);

	if (!(val & MTK_STAR_BIT_HASH_CTRL_BIST_OK))

	if (!regmap_test_bits(priv->regs, MTK_STAR_REG_HASH_CTRL,

			      MTK_STAR_BIT_HASH_CTRL_BIST_OK))

		return -EIO;



	return 0;
@@ -877,11 +870,9 @@ static int mtk_star_reset_hash_table(struct mtk_star_priv *priv) 
	if (ret)

		return ret;



	regmap_update_bits(priv->regs, MTK_STAR_REG_HASH_CTRL,

			   MTK_STAR_BIT_HASH_CTRL_BIST_EN,

	regmap_set_bits(priv->regs, MTK_STAR_REG_HASH_CTRL,

			MTK_STAR_BIT_HASH_CTRL_BIST_EN);

	regmap_update_bits(priv->regs, MTK_STAR_REG_TEST1,

			   MTK_STAR_BIT_TEST1_RST_HASH_MBIST,

	regmap_set_bits(priv->regs, MTK_STAR_REG_TEST1,

			MTK_STAR_BIT_TEST1_RST_HASH_MBIST);



	return mtk_star_hash_wait_ok(priv);
@@ -1013,13 +1004,13 @@ static int mtk_star_enable(struct net_device *ndev) 
		return ret;



	/* Setup the hashing algorithm */

	regmap_update_bits(priv->regs, MTK_STAR_REG_ARL_CFG,

	regmap_clear_bits(priv->regs, MTK_STAR_REG_ARL_CFG,

			  MTK_STAR_BIT_ARL_CFG_HASH_ALG |

			   MTK_STAR_BIT_ARL_CFG_MISC_MODE, 0);

			  MTK_STAR_BIT_ARL_CFG_MISC_MODE);



	/* Don't strip VLAN tags */

	regmap_update_bits(priv->regs, MTK_STAR_REG_MAC_CFG,

			   MTK_STAR_BIT_MAC_CFG_VLAN_STRIP, 0);

	regmap_clear_bits(priv->regs, MTK_STAR_REG_MAC_CFG,

			  MTK_STAR_BIT_MAC_CFG_VLAN_STRIP);



	/* Setup DMA */

	mtk_star_dma_init(priv);
@@ -1201,8 +1192,7 @@ static void mtk_star_set_rx_mode(struct net_device *ndev) 
	int ret;



	if (ndev->flags & IFF_PROMISC) {

		regmap_update_bits(priv->regs, MTK_STAR_REG_ARL_CFG,

				   MTK_STAR_BIT_ARL_CFG_MISC_MODE,

		regmap_set_bits(priv->regs, MTK_STAR_REG_ARL_CFG,

				MTK_STAR_BIT_ARL_CFG_MISC_MODE);

	} else if (netdev_mc_count(ndev) > MTK_STAR_HASHTABLE_MC_LIMIT ||

		   ndev->flags & IFF_ALLMULTI) {

include/linux/regmap.h

+36 −0
Original line number Diff line number Diff line
@@ -1111,6 +1111,21 @@ bool regmap_reg_in_ranges(unsigned int reg, 
			  const struct regmap_range *ranges,

			  unsigned int nranges);



static inline int regmap_set_bits(struct regmap *map,

				  unsigned int reg, unsigned int bits)

{

	return regmap_update_bits_base(map, reg, bits, bits,

				       NULL, false, false);

}



static inline int regmap_clear_bits(struct regmap *map,

				    unsigned int reg, unsigned int bits)

{

	return regmap_update_bits_base(map, reg, bits, 0, NULL, false, false);

}



int regmap_test_bits(struct regmap *map, unsigned int reg, unsigned int bits);



/**

 * struct reg_field - Description of an register field

 *
@@ -1410,6 +1425,27 @@ static inline int regmap_update_bits_base(struct regmap *map, unsigned int reg, 
	return -EINVAL;

}



static inline int regmap_set_bits(struct regmap *map,

				  unsigned int reg, unsigned int bits)

{

	WARN_ONCE(1, "regmap API is disabled");

	return -EINVAL;

}



static inline int regmap_clear_bits(struct regmap *map,

				    unsigned int reg, unsigned int bits)

{

	WARN_ONCE(1, "regmap API is disabled");

	return -EINVAL;

}



static inline int regmap_test_bits(struct regmap *map,

				   unsigned int reg, unsigned int bits)

{

	WARN_ONCE(1, "regmap API is disabled");

	return -EINVAL;

}



static inline int regmap_field_update_bits_base(struct regmap_field *field,

					unsigned int mask, unsigned int val,

					bool *change, bool async, bool force)

CRA Git | Maintained and supported by SUSTech CRA and CCSE