Merge branch 'pci/virtualization'

  - To avoid bus errors, enable PASID only if entire path supports End-End
    TLP prefixes (Sinan Kaya)

  - Unify slot and bus reset functions and remove hotplug knowledge from
    callers (Sinan Kaya)

  - Add Function-Level Reset quirks for Intel and Samsung NVMe devices to
    fix guest reboot issues (Alex Williamson)

  - Add function 1 DMA alias quirk for Marvell 88SS9183 PCIe SSD Controller
    (Bjorn Helgaas)

* pci/virtualization:
  PCI: Add function 1 DMA alias quirk for Marvell 88SS9183
  PCI: Delay after FLR of Intel DC P3700 NVMe
  PCI: Disable Samsung SM961/PM961 NVMe before FLR
  PCI: Export pcie_has_flr()
  PCI: Rename pci_try_reset_bus() to pci_reset_bus()
  PCI: Deprecate pci_reset_bus() and pci_reset_slot() functions
  PCI: Unify try slot and bus reset API
  PCI: Hide pci_reset_bridge_secondary_bus() from drivers
  IB/hfi1: Use pci_try_reset_bus() for initiating PCI Secondary Bus Reset
  PCI: Handle error return from pci_reset_bridge_secondary_bus()
  PCI/IOV: Tidy pci_sriov_set_totalvfs()
  PCI: Enable PASID only if entire path supports End-End TLP prefixes

# Conflicts:
#	drivers/pci/hotplug/pciehp_hpc.c

diff --cc drivers/pci/hotplug/pciehp_hpc.c
index 5b15e76f3564f7baac8da4c922399c2948609f91,8dae23221344b8638f3a5c122085cef2983c05b5..7136e34309250aa2a3cc0d2880f563a3b183e895
--- 1/drivers/pci/hotplug/pciehp_hpc.c
--- 2/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@@ -777,16 -743,18 +778,16 @@@ int pciehp_reset_slot(struct slot *slot
        pcie_write_cmd(ctrl, 0, ctrl_mask);
        ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
                 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, 0);
 -      if (pciehp_poll_mode)
 -              del_timer_sync(&ctrl->poll_timer);
  
-       pci_reset_bridge_secondary_bus(ctrl->pcie->port);
+       rc = pci_bridge_secondary_bus_reset(ctrl->pcie->port);
  
        pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, stat_mask);
        pcie_write_cmd_nowait(ctrl, ctrl_mask, ctrl_mask);
        ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
                 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, ctrl_mask);
 -      if (pciehp_poll_mode)
 -              int_poll_timeout(&ctrl->poll_timer);
 +
 +      up_write(&ctrl->reset_lock);
-       return 0;
+       return rc;
  }
  
  int pcie_init_notification(struct controller *ctrl)

diff --cc drivers/pci/iov.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/pcie/aer.c
Simple merge

diff --cc drivers/pci/pcie/err.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc drivers/pci/quirks.c
index 6b635022f2fed967cbacb5e36a1774ce543ce966,6994544125ffb8e2d162c1f96e3002b74598d92f..b2e6c02385e5f784bad4812b341b991fd0f176cd
--- 1/drivers/pci/quirks.c
--- 2/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@@ -25,9 -25,9 +25,10 @@@
  #include <linux/sched.h>
  #include <linux/ktime.h>
  #include <linux/mm.h>
+ #include <linux/nvme.h>
  #include <linux/platform_data/x86/apple.h>
  #include <linux/pm_runtime.h>
 +#include <linux/switchtec.h>
  #include <asm/dma.h>  /* isa_dma_bridge_buggy */
  #include "pci.h"
  

diff --cc include/linux/pci.h
Simple merge

diff --cc include/uapi/linux/pci_regs.h
Simple merge