IB/mlx4: Do not generate random node_guid for VFs

Exadata fast node detection and fail-over mechanism(s) relies on the fact
that node GUID in guest is the same as in dom0.

Orabug: 22145330

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Reviewed-by: Qing Huang <qing.huang@oracle.com>

diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 48017336cc4c717bcd6a66356056f4f2dafc9473..4a225042dfa089e7e7a70841466881dcacad4281 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -2127,12 +2127,9 @@ int mlx4_ib_init_sriov(struct mlx4_ib_dev *dev)
                return 0;
        }
 
-       for (i = 0; i < dev->dev->caps.sqp_demux; i++) {
-               if (i == mlx4_master_func_num(dev->dev))
-                       mlx4_put_slave_node_guid(dev->dev, i, dev->ib_dev.node_guid);
-               else
-                       mlx4_put_slave_node_guid(dev->dev, i, mlx4_ib_gen_node_guid());
-       }
+       /* VF's node GUID is PF node GUID */
+       for (i = 0; i < dev->dev->caps.sqp_demux; i++)
+               mlx4_put_slave_node_guid(dev->dev, i, dev->ib_dev.node_guid);
 
        err = mlx4_ib_init_alias_guid_service(dev);
        if (err) {