ice: use internal pf id instead of function number

[ Upstream commit 503ab6ee40fc103ea55cc9e50bb879e571d65aac ]

Use always the same pf id in devlink port number. When doing
pass-through the PF to VM bus info func number can be any value.

Fixes: 2ae0aa4758b0 ("ice: Move devlink port to PF/VF struct")
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Suggested-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
index 13e6790d3cae79ef7bcccc4da2ac3dcc0ec96576..afcf64dab48a101b0385b2476b12f172dad9603a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_port.c
@@ -337,7 +337,7 @@ int ice_devlink_create_pf_port(struct ice_pf *pf)
                return -EIO;
 
        attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;
-       attrs.phys.port_number = pf->hw.bus.func;
+       attrs.phys.port_number = pf->hw.pf_id;
 
        /* As FW supports only port split options for whole device,
         * set port split options only for first PF.
@@ -399,7 +399,7 @@ int ice_devlink_create_vf_port(struct ice_vf *vf)
                return -EINVAL;
 
        attrs.flavour = DEVLINK_PORT_FLAVOUR_PCI_VF;
-       attrs.pci_vf.pf = pf->hw.bus.func;
+       attrs.pci_vf.pf = pf->hw.pf_id;
        attrs.pci_vf.vf = vf->vf_id;
 
        ice_devlink_set_switch_id(pf, &attrs.switch_id);