Commit 20f8bc87 authored by Daniel Machon's avatar Daniel Machon Committed by Paolo Abeni
Browse files

net: sparx5: ops out chip port to device index/bit functions 



The chip port device index and mode bit can be obtained using the port
number.  However the mapping of port number to chip device index and
mode bit differs on Sparx5 and lan969x. Therefore ops out the function.

Reviewed-by: default avatarSteen Hegelund <Steen.Hegelund@microchip.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDaniel Machon <daniel.machon@microchip.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 048c9690

drivers/net/ethernet/microchip/sparx5/sparx5_main.c

+2 −0
Original line number Diff line number Diff line
@@ -988,6 +988,8 @@ static const struct sparx5_ops sparx5_ops = { 
	.is_port_5g              = &sparx5_port_is_5g,

	.is_port_10g             = &sparx5_port_is_10g,

	.is_port_25g             = &sparx5_port_is_25g,

	.get_port_dev_index      = &sparx5_port_dev_mapping,

	.get_port_dev_bit        = &sparx5_port_dev_mapping,

};



static const struct sparx5_match_data sparx5_desc = {

drivers/net/ethernet/microchip/sparx5/sparx5_main.h

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ struct sparx5_ops { 
	bool (*is_port_5g)(int portno);

	bool (*is_port_10g)(int portno);

	bool (*is_port_25g)(int portno);

	u32  (*get_port_dev_index)(struct sparx5 *sparx5, int port);

	u32  (*get_port_dev_bit)(struct sparx5 *sparx5, int port);

};



struct sparx5_main_io_resource {

drivers/net/ethernet/microchip/sparx5/sparx5_port.c

+3 −1
Original line number Diff line number Diff line
@@ -847,8 +847,10 @@ static int sparx5_port_pcs_high_set(struct sparx5 *sparx5, 
/* Switch between 1G/2500 and 5G/10G/25G devices */

static void sparx5_dev_switch(struct sparx5 *sparx5, int port, bool hsd)

{

	int bt_indx = BIT(sparx5_port_dev_index(sparx5, port));

	const struct sparx5_ops *ops = sparx5->data->ops;

	int bt_indx;



	bt_indx = BIT(ops->get_port_dev_bit(sparx5, port));



	if (ops->is_port_5g(port)) {

		spx5_rmw(hsd ? 0 : bt_indx,

drivers/net/ethernet/microchip/sparx5/sparx5_port.h

+6 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static inline u32 sparx5_to_pcs_dev(struct sparx5 *sparx5, int port) 
	return TARGET_PCS25G_BR;

}



static inline int sparx5_port_dev_index(struct sparx5 *sparx5, int port)

static inline u32 sparx5_port_dev_mapping(struct sparx5 *sparx5, int port)

{

	if (sparx5_port_is_2g5(port))

		return port;
@@ -74,6 +74,11 @@ static inline int sparx5_port_dev_index(struct sparx5 *sparx5, int port) 
	return (port - 56);

}



static inline u32 sparx5_port_dev_index(struct sparx5 *sparx5, int port)

{

	return sparx5->data->ops->get_port_dev_index(sparx5, port);

}



int sparx5_port_init(struct sparx5 *sparx5,

		     struct sparx5_port *spx5_port,

		     struct sparx5_port_config *conf);