Commit 40cd07cb authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: mscc: ocelot: refactor enum ocelot_reg decoding to helper 



ocelot_io.c duplicates the decoding of an enum ocelot_reg (which holds
an enum ocelot_target in the upper bits and an index into a regmap array
in the lower bits) 4 times.

We'd like to reuse that logic once more, from ocelot.c. In order to do
that, let's consolidate the existing 4 instances into a header
accessible both by ocelot.c as well as by ocelot_io.c.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9ecd0579

drivers/net/ethernet/mscc/ocelot.h

+9 −0
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ struct ocelot_multicast { 
	struct ocelot_pgid *pgid;

};



static inline void ocelot_reg_to_target_addr(struct ocelot *ocelot,

					     enum ocelot_reg reg,

					     enum ocelot_target *target,

					     u32 *addr)

{

	*target = reg >> TARGET_OFFSET;

	*addr = ocelot->map[*target][reg & REG_MASK];

}



int ocelot_bridge_num_find(struct ocelot *ocelot,

			   const struct net_device *bridge);

drivers/net/ethernet/mscc/ocelot_io.c

+16 −14
Original line number Diff line number Diff line
@@ -13,25 +13,26 @@ 
int __ocelot_bulk_read_ix(struct ocelot *ocelot, enum ocelot_reg reg,

			  u32 offset, void *buf, int count)

{

	u16 target = reg >> TARGET_OFFSET;

	enum ocelot_target target;

	u32 addr;



	ocelot_reg_to_target_addr(ocelot, reg, &target, &addr);

	WARN_ON(!target);



	return regmap_bulk_read(ocelot->targets[target],

				ocelot->map[target][reg & REG_MASK] + offset,

	return regmap_bulk_read(ocelot->targets[target], addr + offset,

				buf, count);

}

EXPORT_SYMBOL_GPL(__ocelot_bulk_read_ix);



u32 __ocelot_read_ix(struct ocelot *ocelot, enum ocelot_reg reg, u32 offset)

{

	u16 target = reg >> TARGET_OFFSET;

	u32 val;

	enum ocelot_target target;

	u32 addr, val;



	ocelot_reg_to_target_addr(ocelot, reg, &target, &addr);

	WARN_ON(!target);



	regmap_read(ocelot->targets[target],

		    ocelot->map[target][reg & REG_MASK] + offset, &val);

	regmap_read(ocelot->targets[target], addr + offset, &val);

	return val;

}

EXPORT_SYMBOL_GPL(__ocelot_read_ix);
@@ -39,25 +40,26 @@ EXPORT_SYMBOL_GPL(__ocelot_read_ix); 
void __ocelot_write_ix(struct ocelot *ocelot, u32 val, enum ocelot_reg reg,

		       u32 offset)

{

	u16 target = reg >> TARGET_OFFSET;

	enum ocelot_target target;

	u32 addr;



	ocelot_reg_to_target_addr(ocelot, reg, &target, &addr);

	WARN_ON(!target);



	regmap_write(ocelot->targets[target],

		     ocelot->map[target][reg & REG_MASK] + offset, val);

	regmap_write(ocelot->targets[target], addr + offset, val);

}

EXPORT_SYMBOL_GPL(__ocelot_write_ix);



void __ocelot_rmw_ix(struct ocelot *ocelot, u32 val, u32 mask,

		     enum ocelot_reg reg, u32 offset)

{

	u16 target = reg >> TARGET_OFFSET;

	enum ocelot_target target;

	u32 addr;



	ocelot_reg_to_target_addr(ocelot, reg, &target, &addr);

	WARN_ON(!target);



	regmap_update_bits(ocelot->targets[target],

			   ocelot->map[target][reg & REG_MASK] + offset,

			   mask, val);

	regmap_update_bits(ocelot->targets[target], addr + offset, mask, val);

}

EXPORT_SYMBOL_GPL(__ocelot_rmw_ix);