Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'net-extend-devlink-port-attrs-with-switch-ID' 



Jiri Pirko says:

====================
net: extend devlink port attrs with switch ID

Extend devlink port attrs to contain switch ID and change drivers that
register devlink ports to use that.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8dc35020 119c0b57

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+25 −1
Original line number Diff line number Diff line
@@ -10104,7 +10104,6 @@ static const struct net_device_ops bnxt_netdev_ops = { 
	.ndo_bpf		= bnxt_xdp,

	.ndo_bridge_getlink	= bnxt_bridge_getlink,

	.ndo_bridge_setlink	= bnxt_bridge_setlink,

	.ndo_get_port_parent_id	= bnxt_get_port_parent_id,

	.ndo_get_devlink_port	= bnxt_get_devlink_port,

};
@@ -10429,6 +10428,26 @@ static int bnxt_init_mac_addr(struct bnxt *bp) 
	return rc;

}



static int bnxt_pcie_dsn_get(struct bnxt *bp, u8 dsn[])

{

	struct pci_dev *pdev = bp->pdev;

	int pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_DSN);

	u32 dw;



	if (!pos) {

		netdev_info(bp->dev, "Unable do read adapter's DSN");

		return -EOPNOTSUPP;

	}



	/* DSN (two dw) is at an offset of 4 from the cap pos */

	pos += 4;

	pci_read_config_dword(pdev, pos, &dw);

	put_unaligned_le32(dw, &dsn[0]);

	pci_read_config_dword(pdev, pos + 4, &dw);

	put_unaligned_le32(dw, &dsn[4]);

	return 0;

}



static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	static int version_printed;
@@ -10569,6 +10588,11 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto init_err_pci_clean;

	}



	/* Read the adapter's DSN to use as the eswitch switch_id */

	rc = bnxt_pcie_dsn_get(bp, bp->switch_id);

	if (rc)

		goto init_err_pci_clean;



	bnxt_hwrm_func_qcfg(bp);

	bnxt_hwrm_vnic_qcaps(bp);

	bnxt_hwrm_port_led_qcaps(bp);

drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c

+2 −1
Original line number Diff line number Diff line
@@ -230,7 +230,8 @@ int bnxt_dl_register(struct bnxt *bp) 
	}



	devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,

			       bp->pf.port_id, false, 0);

			       bp->pf.port_id, false, 0,

			       bp->switch_id, sizeof(bp->switch_id));

	rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);

	if (rc) {

		netdev_err(bp->dev, "devlink_port_register failed");

drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c

+0 −25
Original line number Diff line number Diff line
@@ -406,26 +406,6 @@ static void bnxt_vf_rep_netdev_init(struct bnxt *bp, struct bnxt_vf_rep *vf_rep, 
	dev->min_mtu = ETH_ZLEN;

}



static int bnxt_pcie_dsn_get(struct bnxt *bp, u8 dsn[])

{

	struct pci_dev *pdev = bp->pdev;

	int pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_DSN);

	u32 dw;



	if (!pos) {

		netdev_info(bp->dev, "Unable do read adapter's DSN");

		return -EOPNOTSUPP;

	}



	/* DSN (two dw) is at an offset of 4 from the cap pos */

	pos += 4;

	pci_read_config_dword(pdev, pos, &dw);

	put_unaligned_le32(dw, &dsn[0]);

	pci_read_config_dword(pdev, pos + 4, &dw);

	put_unaligned_le32(dw, &dsn[4]);

	return 0;

}



static int bnxt_vf_reps_create(struct bnxt *bp)

{

	u16 *cfa_code_map = NULL, num_vfs = pci_num_vf(bp->pdev);
@@ -490,11 +470,6 @@ static int bnxt_vf_reps_create(struct bnxt *bp) 
		}

	}



	/* Read the adapter's DSN to use as the eswitch switch_id */

	rc = bnxt_pcie_dsn_get(bp, bp->switch_id);

	if (rc)

		goto err;



	/* publish cfa_code_map only after all VF-reps have been initialized */

	bp->cfa_code_map = cfa_code_map;

	bp->eswitch_mode = DEVLINK_ESWITCH_MODE_SWITCHDEV;

drivers/net/ethernet/mellanox/mlxsw/core.c

+5 −2
Original line number Diff line number Diff line
@@ -1720,7 +1720,9 @@ EXPORT_SYMBOL(mlxsw_core_res_get); 


int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

			 u32 port_number, bool split,

			 u32 split_port_subnumber)

			 u32 split_port_subnumber,

			 const unsigned char *switch_id,

			 unsigned char switch_id_len)

{

	struct devlink *devlink = priv_to_devlink(mlxsw_core);

	struct mlxsw_core_port *mlxsw_core_port =
@@ -1730,7 +1732,8 @@ int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port, 


	mlxsw_core_port->local_port = local_port;

	devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,

			       port_number, split, split_port_subnumber);

			       port_number, split, split_port_subnumber,

			       switch_id, switch_id_len);

	err = devlink_port_register(devlink, devlink_port, local_port);

	if (err)

		memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));

drivers/net/ethernet/mellanox/mlxsw/core.h

+3 −1
Original line number Diff line number Diff line
@@ -166,7 +166,9 @@ void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core, 
void *mlxsw_core_port_driver_priv(struct mlxsw_core_port *mlxsw_core_port);

int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

			 u32 port_number, bool split,

			 u32 split_port_subnumber);

			 u32 split_port_subnumber,

			 const unsigned char *switch_id,

			 unsigned char switch_id_len);

void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port);

void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,

			     void *port_driver_priv, struct net_device *dev);