Skip to contentSkip to conversation

ice: use internal pf id instead of function number

PATCH In review Michal Swiatkowski 2 participants 2 messages Aug 19, 2024 – Aug 20, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ice: use internal pf id instead of function number

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")

---
v1 --> v2: https://lore.kernel.org/netdev/[email protected]/
* change subject to net and add fixes tag
---

 drivers/net/ethernet/intel/ice/devlink/devlink_port.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/devlink/devlink_port.c +2 -2
index 00fed5a61d62..62ef8e2fb5f1 100644
@@ -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.
@@ -455,7 +455,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);
Signature · 1 line
2.42.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 3 lines · Michal Swiatkowski

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.

Quoted 34 lines
Fixes 2ae0aa4758b0 ("ice: Move devlink port to PF/VF struct")

---
v1 --> v2: https://lore.kernel.org/netdev/[email protected]/
* change subject to net and add fixes tag
---

 drivers/net/ethernet/intel/ice/devlink/devlink_port.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/devlink/devlink_port.c +2 -2
index 00fed5a61d62..62ef8e2fb5f1 100644
@@ -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.
@@ -455,7 +455,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);