diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-03-15 13:49:15 -0700 |
|---|---|---|
| committer | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-03-25 18:16:33 -0700 |
| commit | 899a8ceb0dc63f219d39d949ae17ae48cc0c21b8 (patch) | |
| tree | e698341d84a219ca9627e82c194a0169cca1c019 | |
| parent | f764584e94fe7c2c5c6c709837951ac81c8bff76 (diff) | |
| download | linux-wip-devlink-ports.tar.gz | |
f Idswip-devlink-ports
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c index 731499ebc3aac..18d82e82d9eb8 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_devlink.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_devlink.c @@ -376,13 +376,6 @@ nfp_devlink_port_register_phys(struct devlink *devlink, struct nfp_port *port) #define NFP_DEVLINK_PORT_PCI_PORT_ID_VF_OFF 1000 #define NFP_DEVLINK_PORT_PCI_PORT_ID_SUB_OFF 1 -static u32 nfp_devlink_port_gen_pci_port_id(struct nfp_port *port) -{ - return (port->pf_id + 1) * NFP_DEVLINK_PORT_PCI_PORT_ID_PF_OFF + - (port->vf_id + 1) * NFP_DEVLINK_PORT_PCI_PORT_ID_VF_OFF + - port->pf_split_id * NFP_DEVLINK_PORT_PCI_PORT_ID_SUB_OFF; -} - int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) { struct devlink *devlink = priv_to_devlink(app->pf); @@ -395,12 +388,14 @@ int nfp_devlink_port_register(struct nfp_app *app, struct nfp_port *port) devlink_port_attrs_pci_pf_set(&port->dl_port, port->pf_id, port->pf_split, port->pf_split_id); - id = nfp_devlink_port_gen_pci_port_id(port); + id = (port->pf_id + 1) * NFP_DEVLINK_PORT_PCI_PORT_ID_PF_OFF + + port->pf_split_id * NFP_DEVLINK_PORT_PCI_PORT_ID_SUB_OFF; return devlink_port_register(devlink, &port->dl_port, id); case NFP_PORT_VF_PORT: devlink_port_attrs_pci_vf_set(&port->dl_port, port->pf_id, port->vf_id, false, 0); - id = nfp_devlink_port_gen_pci_port_id(port); + id = (port->pf_id + 1) * NFP_DEVLINK_PORT_PCI_PORT_ID_PF_OFF + + (port->vf_id + 1) * NFP_DEVLINK_PORT_PCI_PORT_ID_VF_OFF; return devlink_port_register(devlink, &port->dl_port, id); default: return -EINVAL; |