git: 1dd0ee9b5382 - stable/12 - MFC 480570dbb309: Fixes for SRIOV in mlx5core.

[Hans Petter Selasky]

The branch stable/12 has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=1dd0ee9b5382b0d9af0236587e3fe10b341f2a59

commit 1dd0ee9b5382b0d9af0236587e3fe10b341f2a59
Author:     Hans Petter Selasky <hselasky at FreeBSD.org>
AuthorDate: 2021-01-08 11:06:11 +0000
Commit:     Hans Petter Selasky <hselasky at FreeBSD.org>
CommitDate: 2021-01-22 12:09:35 +0000

    MFC 480570dbb309:
    Fixes for SRIOV in mlx5core.
    
    - call pci_iov_detach() on detaching from PCI device to take care of hang
      on destroying VFs after PF is down.
    
    - disable eswitch SRIOV support right after pci_iov_detach(),
      else the eswitch cleanup sometimes occur while the SRIOV flow table
      is still present.
    
    Sponsored by: Mellanox Technologies // NVIDIA Networking
---
 sys/dev/mlx5/mlx5_core/mlx5_main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c
index 8f41f3b30ac7..ce3a06d2f495 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_main.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c
@@ -1663,6 +1663,11 @@ static void remove_one(struct pci_dev *pdev)
 	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);
 	struct mlx5_priv *priv = &dev->priv;
 
+#ifdef PCI_IOV
+	pci_iov_detach(pdev->dev.bsddev);
+	mlx5_eswitch_disable_sriov(priv->eswitch);
+#endif
+
 	if (mlx5_unload_one(dev, priv, true)) {
 		mlx5_core_err(dev, "mlx5_unload_one() failed, leaked %lld bytes\n",
 		    (long long)(dev->priv.fw_pages * MLX5_ADAPTER_PAGE_SIZE));