Commit 9ecd0579 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: mscc: ocelot: strengthen type of "u32 reg" in I/O accessors 



The "u32 reg" argument that is passed to these functions is not a plain
address, but rather a driver-specific encoding of another enum
ocelot_target target in the upper bits, and an index into the
u32 ocelot->map[target][] array in the lower bits. That encoded value
takes the type "enum ocelot_reg" and is what is passed to these I/O
functions, so let's actually use that to prevent type confusion.

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 c2865b11

drivers/net/ethernet/mscc/ocelot_io.c

+11 −9
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 


#include "ocelot.h"



int __ocelot_bulk_read_ix(struct ocelot *ocelot, u32 reg, u32 offset, void *buf,

			  int count)

int __ocelot_bulk_read_ix(struct ocelot *ocelot, enum ocelot_reg reg,

			  u32 offset, void *buf, int count)

{

	u16 target = reg >> TARGET_OFFSET;
@@ -23,7 +23,7 @@ int __ocelot_bulk_read_ix(struct ocelot *ocelot, u32 reg, u32 offset, void *buf, 
}

EXPORT_SYMBOL_GPL(__ocelot_bulk_read_ix);



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

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

{

	u16 target = reg >> TARGET_OFFSET;

	u32 val;
@@ -36,7 +36,8 @@ u32 __ocelot_read_ix(struct ocelot *ocelot, u32 reg, u32 offset) 
}

EXPORT_SYMBOL_GPL(__ocelot_read_ix);



void __ocelot_write_ix(struct ocelot *ocelot, u32 val, u32 reg, u32 offset)

void __ocelot_write_ix(struct ocelot *ocelot, u32 val, enum ocelot_reg reg,

		       u32 offset)

{

	u16 target = reg >> TARGET_OFFSET;
@@ -47,8 +48,8 @@ void __ocelot_write_ix(struct ocelot *ocelot, u32 val, u32 reg, u32 offset) 
}

EXPORT_SYMBOL_GPL(__ocelot_write_ix);



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

		     u32 offset)

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

		     enum ocelot_reg reg, u32 offset)

{

	u16 target = reg >> TARGET_OFFSET;
@@ -60,7 +61,7 @@ void __ocelot_rmw_ix(struct ocelot *ocelot, u32 val, u32 mask, u32 reg, 
}

EXPORT_SYMBOL_GPL(__ocelot_rmw_ix);



u32 ocelot_port_readl(struct ocelot_port *port, u32 reg)

u32 ocelot_port_readl(struct ocelot_port *port, enum ocelot_reg reg)

{

	struct ocelot *ocelot = port->ocelot;

	u16 target = reg >> TARGET_OFFSET;
@@ -73,7 +74,7 @@ u32 ocelot_port_readl(struct ocelot_port *port, u32 reg) 
}

EXPORT_SYMBOL_GPL(ocelot_port_readl);



void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg)

void ocelot_port_writel(struct ocelot_port *port, u32 val, enum ocelot_reg reg)

{

	struct ocelot *ocelot = port->ocelot;

	u16 target = reg >> TARGET_OFFSET;
@@ -84,7 +85,8 @@ void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg) 
}

EXPORT_SYMBOL_GPL(ocelot_port_writel);



void ocelot_port_rmwl(struct ocelot_port *port, u32 val, u32 mask, u32 reg)

void ocelot_port_rmwl(struct ocelot_port *port, u32 val, u32 mask,

		      enum ocelot_reg reg)

{

	u32 cur = ocelot_port_readl(port, reg);

include/soc/mscc/ocelot.h

+11 −9
Original line number Diff line number Diff line
@@ -940,15 +940,17 @@ struct ocelot_policer { 
	__ocelot_target_write_ix(ocelot, target, val, reg, 0)



/* I/O */

u32 ocelot_port_readl(struct ocelot_port *port, u32 reg);

void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg);

void ocelot_port_rmwl(struct ocelot_port *port, u32 val, u32 mask, u32 reg);

int __ocelot_bulk_read_ix(struct ocelot *ocelot, u32 reg, u32 offset, void *buf,

			  int count);

u32 __ocelot_read_ix(struct ocelot *ocelot, u32 reg, u32 offset);

void __ocelot_write_ix(struct ocelot *ocelot, u32 val, u32 reg, u32 offset);

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

u32 ocelot_port_readl(struct ocelot_port *port, enum ocelot_reg reg);

void ocelot_port_writel(struct ocelot_port *port, u32 val, enum ocelot_reg reg);

void ocelot_port_rmwl(struct ocelot_port *port, u32 val, u32 mask,

		      enum ocelot_reg reg);

int __ocelot_bulk_read_ix(struct ocelot *ocelot, enum ocelot_reg reg,

			  u32 offset, void *buf, int count);

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

void __ocelot_write_ix(struct ocelot *ocelot, u32 val, enum ocelot_reg reg,

		       u32 offset);

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

		     enum ocelot_reg reg, u32 offset);

u32 __ocelot_target_read_ix(struct ocelot *ocelot, enum ocelot_target target,

			    u32 reg, u32 offset);

void __ocelot_target_write_ix(struct ocelot *ocelot, enum ocelot_target target,