From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 28 Apr 2017 15:36:12 +0000 (-0500)
Subject: Merge branch 'pci/virtualization' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ef1b5dad5a386885998d11eb45ca7fd183079965;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'pci/virtualization' into next

* pci/virtualization:
  ixgbe: Use pcie_flr() instead of duplicating it
  IB/hfi1: Use pcie_flr() instead of duplicating it
  PCI: Call pcie_flr() from reset_chelsio_generic_dev()
  PCI: Call pcie_flr() from reset_intel_82599_sfp_virtfn()
  PCI: Export pcie_flr()
  PCI: Add sysfs sriov_drivers_autoprobe to control VF driver binding
  PCI: Avoid FLR for Intel 82579 NICs

Conflicts:
	include/linux/pci.h
---

ef1b5dad5a386885998d11eb45ca7fd183079965
diff --cc drivers/pci/pci.h
index 71fa82359b5b,3ba7d586f522..586e63f55013
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -272,22 -272,9 +272,23 @@@ struct pci_sriov 
  	struct pci_dev *self;	/* this PF */
  	struct mutex lock;	/* lock for setting sriov_numvfs in sysfs */
  	resource_size_t barsz[PCI_SRIOV_NUM_BARS];	/* VF BAR size */
+ 	bool drivers_autoprobe;	/* auto probing of VFs by driver */
  };
  
 +/* pci_dev priv_flags */
 +#define PCI_DEV_DISCONNECTED 0
 +
 +static inline int pci_dev_set_disconnected(struct pci_dev *dev, void *unused)
 +{
 +	set_bit(PCI_DEV_DISCONNECTED, &dev->priv_flags);
 +	return 0;
 +}
 +
 +static inline bool pci_dev_is_disconnected(const struct pci_dev *dev)
 +{
 +	return test_bit(PCI_DEV_DISCONNECTED, &dev->priv_flags);
 +}
 +
  #ifdef CONFIG_PCI_ATS
  void pci_restore_ats_state(struct pci_dev *dev);
  #else
diff --cc include/linux/pci.h
index bbd17d49c947,a9ff99c91601..88185ffcbf47
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -179,8 -178,8 +179,10 @@@ enum pci_dev_flags 
  	PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7),
  	/* Get VPD from function 0 VPD */
  	PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8),
 +	/* a non-root bridge where translation occurs, stop alias search here */
 +	PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9),
+ 	/* Do not use FLR even if device advertises PCI_AF_CAP */
+ 	PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
  };
  
  enum pci_irq_reroute_variant {