You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
85 lines
3.1 KiB
85 lines
3.1 KiB
4 years ago
|
From 08d07de27cd1b9ec43e75242f71fa8468fb8b406 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Tue, 12 May 2020 10:55:15 -0400
|
||
|
|
Subject: [PATCH 199/312] [netdrv] net/mlx5e: Fix pfnum in devlink port
|
||
|
|
attribute
|
||
|
|
|
||
|
|
Message-id: <20200512105530.4207-110-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306981
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789382 109/124] net/mlx5e: Fix pfnum in devlink port attribute
|
||
|
|
Bugzilla: 1789382
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789382
|
||
|
|
Upstream: v5.7-rc2
|
||
|
|
|
||
|
|
commit 7482d9cb5b974b7ad1a58fa8714f7a8c05b5d278
|
||
|
|
Author: Parav Pandit <parav@mellanox.com>
|
||
|
|
Date: Fri Apr 3 03:57:30 2020 -0500
|
||
|
|
|
||
|
|
net/mlx5e: Fix pfnum in devlink port attribute
|
||
|
|
|
||
|
|
Cited patch missed to extract PCI pf number accurately for PF and VF
|
||
|
|
port flavour. It considered PCI device + function number.
|
||
|
|
Due to this, device having non zero device number shown large pfnum.
|
||
|
|
|
||
|
|
Hence, use only PCI function number; to avoid similar errors, derive
|
||
|
|
pfnum one time for all port flavours.
|
||
|
|
|
||
|
|
Fixes: f60f315d339e ("net/mlx5e: Register devlink ports for physical link, PCI PF, VFs")
|
||
|
|
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
|
||
|
|
Signed-off-by: Parav Pandit <parav@mellanox.com>
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 +++++----
|
||
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
index 02f1362a01ef..e8845a6121dd 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
|
||
|
|
@@ -1935,29 +1935,30 @@ static int register_devlink_port(struct mlx5_core_dev *dev,
|
||
|
|
struct mlx5_eswitch_rep *rep = rpriv->rep;
|
||
|
|
struct netdev_phys_item_id ppid = {};
|
||
|
|
unsigned int dl_port_index = 0;
|
||
|
|
+ u16 pfnum;
|
||
|
|
|
||
|
|
if (!is_devlink_port_supported(dev, rpriv))
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
mlx5e_rep_get_port_parent_id(rpriv->netdev, &ppid);
|
||
|
|
+ pfnum = PCI_FUNC(dev->pdev->devfn);
|
||
|
|
|
||
|
|
if (rep->vport == MLX5_VPORT_UPLINK) {
|
||
|
|
devlink_port_attrs_set(&rpriv->dl_port,
|
||
|
|
DEVLINK_PORT_FLAVOUR_PHYSICAL,
|
||
|
|
- PCI_FUNC(dev->pdev->devfn), false, 0,
|
||
|
|
+ pfnum, false, 0,
|
||
|
|
&ppid.id[0], ppid.id_len);
|
||
|
|
dl_port_index = vport_to_devlink_port_index(dev, rep->vport);
|
||
|
|
} else if (rep->vport == MLX5_VPORT_PF) {
|
||
|
|
devlink_port_attrs_pci_pf_set(&rpriv->dl_port,
|
||
|
|
&ppid.id[0], ppid.id_len,
|
||
|
|
- dev->pdev->devfn);
|
||
|
|
+ pfnum);
|
||
|
|
dl_port_index = rep->vport;
|
||
|
|
} else if (mlx5_eswitch_is_vf_vport(dev->priv.eswitch,
|
||
|
|
rpriv->rep->vport)) {
|
||
|
|
devlink_port_attrs_pci_vf_set(&rpriv->dl_port,
|
||
|
|
&ppid.id[0], ppid.id_len,
|
||
|
|
- dev->pdev->devfn,
|
||
|
|
- rep->vport - 1);
|
||
|
|
+ pfnum, rep->vport - 1);
|
||
|
|
dl_port_index = vport_to_devlink_port_index(dev, rep->vport);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|