Commit 71c93e37 authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

devlink: move port_fn_hw_addr_get/set() to devlink_port_ops 



Move port_fn_hw_addr_get/set() from devlink_ops into newly introduced
devlink_port_ops.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Acked-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent aa3aff82

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

+0 −2
Original line number Diff line number Diff line
@@ -310,8 +310,6 @@ static const struct devlink_ops mlx5_devlink_ops = { 
	.eswitch_inline_mode_get = mlx5_devlink_eswitch_inline_mode_get,

	.eswitch_encap_mode_set = mlx5_devlink_eswitch_encap_mode_set,

	.eswitch_encap_mode_get = mlx5_devlink_eswitch_encap_mode_get,

	.port_function_hw_addr_get = mlx5_devlink_port_function_hw_addr_get,

	.port_function_hw_addr_set = mlx5_devlink_port_function_hw_addr_set,

	.rate_leaf_tx_share_set = mlx5_esw_devlink_rate_leaf_tx_share_set,

	.rate_leaf_tx_max_set = mlx5_esw_devlink_rate_leaf_tx_max_set,

	.rate_node_tx_share_set = mlx5_esw_devlink_rate_node_tx_share_set,

drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ static void mlx5_esw_dl_port_free(struct devlink_port *dl_port) 
}



static const struct devlink_port_ops mlx5_esw_dl_port_ops = {

	.port_fn_hw_addr_get = mlx5_devlink_port_fn_hw_addr_get,

	.port_fn_hw_addr_set = mlx5_devlink_port_fn_hw_addr_set,

};



int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_num)
@@ -139,6 +141,8 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1 
}



static const struct devlink_port_ops mlx5_esw_dl_sf_port_ops = {

	.port_fn_hw_addr_get = mlx5_devlink_port_fn_hw_addr_get,

	.port_fn_hw_addr_set = mlx5_devlink_port_fn_hw_addr_set,

};



int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_port *dl_port,

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+6 −6
Original line number Diff line number Diff line
@@ -506,10 +506,10 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, 
					struct netlink_ext_ack *extack);

int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,

					enum devlink_eswitch_encap_mode *encap);

int mlx5_devlink_port_function_hw_addr_get(struct devlink_port *port,

int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port,

				     u8 *hw_addr, int *hw_addr_len,

				     struct netlink_ext_ack *extack);

int mlx5_devlink_port_function_hw_addr_set(struct devlink_port *port,

int mlx5_devlink_port_fn_hw_addr_set(struct devlink_port *port,

				     const u8 *hw_addr, int hw_addr_len,

				     struct netlink_ext_ack *extack);

int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled,

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

+6 −6
Original line number Diff line number Diff line
@@ -3957,7 +3957,7 @@ is_port_function_supported(struct mlx5_eswitch *esw, u16 vport_num) 
	       mlx5_esw_is_sf_vport(esw, vport_num);

}



int mlx5_devlink_port_function_hw_addr_get(struct devlink_port *port,

int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port,

				     u8 *hw_addr, int *hw_addr_len,

				     struct netlink_ext_ack *extack)

{
@@ -3986,7 +3986,7 @@ int mlx5_devlink_port_function_hw_addr_get(struct devlink_port *port, 
	return 0;

}



int mlx5_devlink_port_function_hw_addr_set(struct devlink_port *port,

int mlx5_devlink_port_fn_hw_addr_set(struct devlink_port *port,

				     const u8 *hw_addr, int hw_addr_len,

				     struct netlink_ext_ack *extack)

{

drivers/net/ethernet/sfc/efx_devlink.c

+42 −44
Original line number Diff line number Diff line
@@ -26,46 +26,6 @@ struct efx_devlink { 


#ifdef CONFIG_SFC_SRIOV



static const struct devlink_port_ops sfc_devlink_port_ops = {

};



static void efx_devlink_del_port(struct devlink_port *dl_port)

{

	if (!dl_port)

		return;

	devl_port_unregister(dl_port);

}



static int efx_devlink_add_port(struct efx_nic *efx,

				struct mae_mport_desc *mport)

{

	bool external = false;



	if (!ef100_mport_on_local_intf(efx, mport))

		external = true;



	switch (mport->mport_type) {

	case MAE_MPORT_DESC_MPORT_TYPE_VNIC:

		if (mport->vf_idx != MAE_MPORT_DESC_VF_IDX_NULL)

			devlink_port_attrs_pci_vf_set(&mport->dl_port, 0, mport->pf_idx,

						      mport->vf_idx,

						      external);

		else

			devlink_port_attrs_pci_pf_set(&mport->dl_port, 0, mport->pf_idx,

						      external);

		break;

	default:

		/* MAE_MPORT_DESC_MPORT_ALIAS and UNDEFINED */

		return 0;

	}



	mport->dl_port.index = mport->mport_id;



	return devl_port_register_with_ops(efx->devlink, &mport->dl_port,

					   mport->mport_id,

					   &sfc_devlink_port_ops);

}



static int efx_devlink_port_addr_get(struct devlink_port *port, u8 *hw_addr,

				     int *hw_addr_len,

				     struct netlink_ext_ack *extack)
@@ -164,6 +124,48 @@ static int efx_devlink_port_addr_set(struct devlink_port *port, 
	return rc;

}



static const struct devlink_port_ops sfc_devlink_port_ops = {

	.port_fn_hw_addr_get = efx_devlink_port_addr_get,

	.port_fn_hw_addr_set = efx_devlink_port_addr_set,

};



static void efx_devlink_del_port(struct devlink_port *dl_port)

{

	if (!dl_port)

		return;

	devl_port_unregister(dl_port);

}



static int efx_devlink_add_port(struct efx_nic *efx,

				struct mae_mport_desc *mport)

{

	bool external = false;



	if (!ef100_mport_on_local_intf(efx, mport))

		external = true;



	switch (mport->mport_type) {

	case MAE_MPORT_DESC_MPORT_TYPE_VNIC:

		if (mport->vf_idx != MAE_MPORT_DESC_VF_IDX_NULL)

			devlink_port_attrs_pci_vf_set(&mport->dl_port, 0, mport->pf_idx,

						      mport->vf_idx,

						      external);

		else

			devlink_port_attrs_pci_pf_set(&mport->dl_port, 0, mport->pf_idx,

						      external);

		break;

	default:

		/* MAE_MPORT_DESC_MPORT_ALIAS and UNDEFINED */

		return 0;

	}



	mport->dl_port.index = mport->mport_id;



	return devl_port_register_with_ops(efx->devlink, &mport->dl_port,

					   mport->mport_id,

					   &sfc_devlink_port_ops);

}



#endif



static int efx_devlink_info_nvram_partition(struct efx_nic *efx,
@@ -615,10 +617,6 @@ static int efx_devlink_info_get(struct devlink *devlink, 


static const struct devlink_ops sfc_devlink_ops = {

	.info_get			= efx_devlink_info_get,

#ifdef CONFIG_SFC_SRIOV

	.port_function_hw_addr_get	= efx_devlink_port_addr_get,

	.port_function_hw_addr_set	= efx_devlink_port_addr_set,

#endif

};



#ifdef CONFIG_SFC_SRIOV