svn commit: r347754 - stable/12/sys/dev/mlx5/mlx5_core

[Hans Petter Selasky]

Author: hselasky
Date: Thu May 16 16:12:51 2019
New Revision: 347754
URL: https://svnweb.freebsd.org/changeset/base/347754

Log:
  MFC r347290:
  Fix for double bus master disable in mlx5core.
  
  mlx5_pci_disable_device is calling pci_disable_device which disables
  bus master. No need to explicitly call pci_clear_master.
  
  Submitted by:	slavash@
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c	Thu May 16 16:12:17 2019	(r347753)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c	Thu May 16 16:12:51 2019	(r347754)
@@ -866,7 +866,6 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, st
 	return 0;
 
 err_clr_master:
-	pci_clear_master(dev->pdev);
 	release_bar(dev->pdev);
 err_disable:
 	mlx5_pci_disable_device(dev);
@@ -877,7 +876,6 @@ err_dbg:
 static void mlx5_pci_close(struct mlx5_core_dev *dev, struct mlx5_priv *priv)
 {
 	iounmap(dev->iseg);
-	pci_clear_master(dev->pdev);
 	release_bar(dev->pdev);
 	mlx5_pci_disable_device(dev);
 }