| Message ID | 20230208142519.31192-8-alejandro.lucero-palau@amd.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | sfc: devlink support for ef100 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/checkpatch | warning | WARNING: line length of 81 exceeds 80 columns |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
Wed, Feb 08, 2023 at 03:25:18PM CET, alejandro.lucero-palau@amd.com wrote: >From: Alejandro Lucero <alejandro.lucero-palau@amd.com> > >Using the builtin client handle id infrastructure, add support for >obtaining the mac address linked to mports in ef100. This implies >to execute an MCDI command for getting the data from the firmware >for each devlink port. > >Signed-off-by: Alejandro Lucero <alejandro.lucero-palau@amd.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
On Wed, Feb 08, 2023 at 02:25:18PM +0000, alejandro.lucero-palau@amd.com wrote: > From: Alejandro Lucero <alejandro.lucero-palau@amd.com> > > Using the builtin client handle id infrastructure, add support for > obtaining the mac address linked to mports in ef100. This implies > to execute an MCDI command for getting the data from the firmware > for each devlink port. > > Signed-off-by: Alejandro Lucero <alejandro.lucero-palau@amd.com> Acked-by: Martin Habets <habetsm.xilinx@gmail.com> > --- > drivers/net/ethernet/sfc/ef100_nic.c | 27 +++++++++++++++ > drivers/net/ethernet/sfc/ef100_nic.h | 1 + > drivers/net/ethernet/sfc/ef100_rep.c | 8 +++++ > drivers/net/ethernet/sfc/ef100_rep.h | 1 + > drivers/net/ethernet/sfc/efx_devlink.c | 46 ++++++++++++++++++++++++++ > 5 files changed, 83 insertions(+) > > diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c > index aa48c79a2149..becd21c2325d 100644 > --- a/drivers/net/ethernet/sfc/ef100_nic.c > +++ b/drivers/net/ethernet/sfc/ef100_nic.c > @@ -1122,6 +1122,33 @@ static int ef100_probe_main(struct efx_nic *efx) > return rc; > } > > +/* MCDI commands are related to the same device issuing them. This function > + * allows to do an MCDI command on behalf of another device, mainly PFs setting > + * things for VFs. > + */ > +int efx_ef100_lookup_client_id(struct efx_nic *efx, efx_qword_t pciefn, u32 *id) > +{ > + MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_CLIENT_HANDLE_OUT_LEN); > + MCDI_DECLARE_BUF(inbuf, MC_CMD_GET_CLIENT_HANDLE_IN_LEN); > + u64 pciefn_flat = le64_to_cpu(pciefn.u64[0]); > + size_t outlen; > + int rc; > + > + MCDI_SET_DWORD(inbuf, GET_CLIENT_HANDLE_IN_TYPE, > + MC_CMD_GET_CLIENT_HANDLE_IN_TYPE_FUNC); > + MCDI_SET_QWORD(inbuf, GET_CLIENT_HANDLE_IN_FUNC, > + pciefn_flat); > + > + rc = efx_mcdi_rpc(efx, MC_CMD_GET_CLIENT_HANDLE, inbuf, sizeof(inbuf), > + outbuf, sizeof(outbuf), &outlen); > + if (rc) > + return rc; > + if (outlen < sizeof(outbuf)) > + return -EIO; > + *id = MCDI_DWORD(outbuf, GET_CLIENT_HANDLE_OUT_HANDLE); > + return 0; > +} > + > int ef100_probe_netdev_pf(struct efx_nic *efx) > { > struct ef100_nic_data *nic_data = efx->nic_data; > diff --git a/drivers/net/ethernet/sfc/ef100_nic.h b/drivers/net/ethernet/sfc/ef100_nic.h > index e59044072333..f1ed481c1260 100644 > --- a/drivers/net/ethernet/sfc/ef100_nic.h > +++ b/drivers/net/ethernet/sfc/ef100_nic.h > @@ -94,4 +94,5 @@ int ef100_filter_table_probe(struct efx_nic *efx); > > int ef100_get_mac_address(struct efx_nic *efx, u8 *mac_address, > int client_handle, bool empty_ok); > +int efx_ef100_lookup_client_id(struct efx_nic *efx, efx_qword_t pciefn, u32 *id); > #endif /* EFX_EF100_NIC_H */ > diff --git a/drivers/net/ethernet/sfc/ef100_rep.c b/drivers/net/ethernet/sfc/ef100_rep.c > index 6b5bc5d6955d..0b3083ef0ead 100644 > --- a/drivers/net/ethernet/sfc/ef100_rep.c > +++ b/drivers/net/ethernet/sfc/ef100_rep.c > @@ -361,6 +361,14 @@ bool ef100_mport_on_local_intf(struct efx_nic *efx, > mport_desc->interface_idx == nic_data->local_mae_intf; > } > > +bool ef100_mport_is_vf(struct mae_mport_desc *mport_desc) > +{ > + bool pcie_func; > + > + pcie_func = ef100_mport_is_pcie_vnic(mport_desc); > + return pcie_func && (mport_desc->vf_idx != MAE_MPORT_DESC_VF_IDX_NULL); > +} > + > void efx_ef100_init_reps(struct efx_nic *efx) > { > struct ef100_nic_data *nic_data = efx->nic_data; > diff --git a/drivers/net/ethernet/sfc/ef100_rep.h b/drivers/net/ethernet/sfc/ef100_rep.h > index ae6add4b0855..a042525a2240 100644 > --- a/drivers/net/ethernet/sfc/ef100_rep.h > +++ b/drivers/net/ethernet/sfc/ef100_rep.h > @@ -76,4 +76,5 @@ void efx_ef100_fini_reps(struct efx_nic *efx); > struct mae_mport_desc; > bool ef100_mport_on_local_intf(struct efx_nic *efx, > struct mae_mport_desc *mport_desc); > +bool ef100_mport_is_vf(struct mae_mport_desc *mport_desc); > #endif /* EF100_REP_H */ > diff --git a/drivers/net/ethernet/sfc/efx_devlink.c b/drivers/net/ethernet/sfc/efx_devlink.c > index 1b1276716113..68d04c2176d3 100644 > --- a/drivers/net/ethernet/sfc/efx_devlink.c > +++ b/drivers/net/ethernet/sfc/efx_devlink.c > @@ -11,6 +11,7 @@ > #include "efx_devlink.h" > #ifdef CONFIG_SFC_SRIOV > #include <linux/rtc.h> > +#include "ef100_nic.h" > #include "mcdi.h" > #include "mcdi_functions.h" > #include "mcdi_pcol.h" > @@ -58,6 +59,50 @@ static int efx_devlink_add_port(struct efx_nic *efx, > return devl_port_register(efx->devlink, &mport->dl_port, mport->mport_id); > } > > +static int efx_devlink_port_addr_get(struct devlink_port *port, u8 *hw_addr, > + int *hw_addr_len, > + struct netlink_ext_ack *extack) > +{ > + struct efx_devlink *devlink = devlink_priv(port->devlink); > + struct mae_mport_desc *mport_desc; > + efx_qword_t pciefn; > + u32 client_id; > + int rc; > + > + mport_desc = container_of(port, struct mae_mport_desc, dl_port); > + > + if (!ef100_mport_on_local_intf(devlink->efx, mport_desc)) { > + NL_SET_ERR_MSG_MOD(extack, "Port not on local interface"); > + return -EINVAL; > + } > + > + if (ef100_mport_is_vf(mport_desc)) > + EFX_POPULATE_QWORD_3(pciefn, > + PCIE_FUNCTION_PF, PCIE_FUNCTION_PF_NULL, > + PCIE_FUNCTION_VF, mport_desc->vf_idx, > + PCIE_FUNCTION_INTF, PCIE_INTERFACE_CALLER); > + else > + EFX_POPULATE_QWORD_3(pciefn, > + PCIE_FUNCTION_PF, mport_desc->pf_idx, > + PCIE_FUNCTION_VF, PCIE_FUNCTION_VF_NULL, > + PCIE_FUNCTION_INTF, PCIE_INTERFACE_CALLER); > + > + rc = efx_ef100_lookup_client_id(devlink->efx, pciefn, &client_id); > + if (rc) { > + NL_SET_ERR_MSG_MOD(extack, "No internal client_ID for port"); > + return -EIO; > + } > + > + rc = ef100_get_mac_address(devlink->efx, hw_addr, client_id, true); > + if (rc) { > + NL_SET_ERR_MSG_MOD(extack, "No MAC available"); > + return -ENOENT; > + } > + > + *hw_addr_len = ETH_ALEN; > + return rc; > +} > + > static int efx_devlink_info_nvram_partition(struct efx_nic *efx, > struct devlink_info_req *req, > unsigned int partition_type, > @@ -511,6 +556,7 @@ static int efx_devlink_info_get(struct devlink *devlink, > static const struct devlink_ops sfc_devlink_ops = { > #ifdef CONFIG_SFC_SRIOV > .info_get = efx_devlink_info_get, > + .port_function_hw_addr_get = efx_devlink_port_addr_get, > #endif > }; > > -- > 2.17.1
diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c index aa48c79a2149..becd21c2325d 100644 --- a/drivers/net/ethernet/sfc/ef100_nic.c +++ b/drivers/net/ethernet/sfc/ef100_nic.c @@ -1122,6 +1122,33 @@ static int ef100_probe_main(struct efx_nic *efx) return rc; } +/* MCDI commands are related to the same device issuing them. This function + * allows to do an MCDI command on behalf of another device, mainly PFs setting + * things for VFs. + */ +int efx_ef100_lookup_client_id(struct efx_nic *efx, efx_qword_t pciefn, u32 *id) +{ + MCDI_DECLARE_BUF(outbuf, MC_CMD_GET_CLIENT_HANDLE_OUT_LEN); + MCDI_DECLARE_BUF(inbuf, MC_CMD_GET_CLIENT_HANDLE_IN_LEN); + u64 pciefn_flat = le64_to_cpu(pciefn.u64[0]); + size_t outlen; + int rc; + + MCDI_SET_DWORD(inbuf, GET_CLIENT_HANDLE_IN_TYPE, + MC_CMD_GET_CLIENT_HANDLE_IN_TYPE_FUNC); + MCDI_SET_QWORD(inbuf, GET_CLIENT_HANDLE_IN_FUNC, + pciefn_flat); + + rc = efx_mcdi_rpc(efx, MC_CMD_GET_CLIENT_HANDLE, inbuf, sizeof(inbuf), + outbuf, sizeof(outbuf), &outlen); + if (rc) + return rc; + if (outlen < sizeof(outbuf)) + return -EIO; + *id = MCDI_DWORD(outbuf, GET_CLIENT_HANDLE_OUT_HANDLE); + return 0; +} + int ef100_probe_netdev_pf(struct efx_nic *efx) { struct ef100_nic_data *nic_data = efx->nic_data; diff --git a/drivers/net/ethernet/sfc/ef100_nic.h b/drivers/net/ethernet/sfc/ef100_nic.h index e59044072333..f1ed481c1260 100644 --- a/drivers/net/ethernet/sfc/ef100_nic.h +++ b/drivers/net/ethernet/sfc/ef100_nic.h @@ -94,4 +94,5 @@ int ef100_filter_table_probe(struct efx_nic *efx); int ef100_get_mac_address(struct efx_nic *efx, u8 *mac_address, int client_handle, bool empty_ok); +int efx_ef100_lookup_client_id(struct efx_nic *efx, efx_qword_t pciefn, u32 *id); #endif /* EFX_EF100_NIC_H */ diff --git a/drivers/net/ethernet/sfc/ef100_rep.c b/drivers/net/ethernet/sfc/ef100_rep.c index 6b5bc5d6955d..0b3083ef0ead 100644 --- a/drivers/net/ethernet/sfc/ef100_rep.c +++ b/drivers/net/ethernet/sfc/ef100_rep.c @@ -361,6 +361,14 @@ bool ef100_mport_on_local_intf(struct efx_nic *efx, mport_desc->interface_idx == nic_data->local_mae_intf; } +bool ef100_mport_is_vf(struct mae_mport_desc *mport_desc) +{ + bool pcie_func; + + pcie_func = ef100_mport_is_pcie_vnic(mport_desc); + return pcie_func && (mport_desc->vf_idx != MAE_MPORT_DESC_VF_IDX_NULL); +} + void efx_ef100_init_reps(struct efx_nic *efx) { struct ef100_nic_data *nic_data = efx->nic_data; diff --git a/drivers/net/ethernet/sfc/ef100_rep.h b/drivers/net/ethernet/sfc/ef100_rep.h index ae6add4b0855..a042525a2240 100644 --- a/drivers/net/ethernet/sfc/ef100_rep.h +++ b/drivers/net/ethernet/sfc/ef100_rep.h @@ -76,4 +76,5 @@ void efx_ef100_fini_reps(struct efx_nic *efx); struct mae_mport_desc; bool ef100_mport_on_local_intf(struct efx_nic *efx, struct mae_mport_desc *mport_desc); +bool ef100_mport_is_vf(struct mae_mport_desc *mport_desc); #endif /* EF100_REP_H */ diff --git a/drivers/net/ethernet/sfc/efx_devlink.c b/drivers/net/ethernet/sfc/efx_devlink.c index 1b1276716113..68d04c2176d3 100644 --- a/drivers/net/ethernet/sfc/efx_devlink.c +++ b/drivers/net/ethernet/sfc/efx_devlink.c @@ -11,6 +11,7 @@ #include "efx_devlink.h" #ifdef CONFIG_SFC_SRIOV #include <linux/rtc.h> +#include "ef100_nic.h" #include "mcdi.h" #include "mcdi_functions.h" #include "mcdi_pcol.h" @@ -58,6 +59,50 @@ static int efx_devlink_add_port(struct efx_nic *efx, return devl_port_register(efx->devlink, &mport->dl_port, mport->mport_id); } +static int efx_devlink_port_addr_get(struct devlink_port *port, u8 *hw_addr, + int *hw_addr_len, + struct netlink_ext_ack *extack) +{ + struct efx_devlink *devlink = devlink_priv(port->devlink); + struct mae_mport_desc *mport_desc; + efx_qword_t pciefn; + u32 client_id; + int rc; + + mport_desc = container_of(port, struct mae_mport_desc, dl_port); + + if (!ef100_mport_on_local_intf(devlink->efx, mport_desc)) { + NL_SET_ERR_MSG_MOD(extack, "Port not on local interface"); + return -EINVAL; + } + + if (ef100_mport_is_vf(mport_desc)) + EFX_POPULATE_QWORD_3(pciefn, + PCIE_FUNCTION_PF, PCIE_FUNCTION_PF_NULL, + PCIE_FUNCTION_VF, mport_desc->vf_idx, + PCIE_FUNCTION_INTF, PCIE_INTERFACE_CALLER); + else + EFX_POPULATE_QWORD_3(pciefn, + PCIE_FUNCTION_PF, mport_desc->pf_idx, + PCIE_FUNCTION_VF, PCIE_FUNCTION_VF_NULL, + PCIE_FUNCTION_INTF, PCIE_INTERFACE_CALLER); + + rc = efx_ef100_lookup_client_id(devlink->efx, pciefn, &client_id); + if (rc) { + NL_SET_ERR_MSG_MOD(extack, "No internal client_ID for port"); + return -EIO; + } + + rc = ef100_get_mac_address(devlink->efx, hw_addr, client_id, true); + if (rc) { + NL_SET_ERR_MSG_MOD(extack, "No MAC available"); + return -ENOENT; + } + + *hw_addr_len = ETH_ALEN; + return rc; +} + static int efx_devlink_info_nvram_partition(struct efx_nic *efx, struct devlink_info_req *req, unsigned int partition_type, @@ -511,6 +556,7 @@ static int efx_devlink_info_get(struct devlink *devlink, static const struct devlink_ops sfc_devlink_ops = { #ifdef CONFIG_SFC_SRIOV .info_get = efx_devlink_info_get, + .port_function_hw_addr_get = efx_devlink_port_addr_get, #endif };