APPLIED: [Artful][PATCH 1/1] [PATCH] PCI: Disable VF decoding before pcibios_sriov_disable() updates resources

Seth Forshee seth.forshee at
Fri Sep 8 15:28:45 UTC 2017

On Fri, Sep 08, 2017 at 09:45:29AM -0400, Joseph Salisbury wrote:
> From: Gavin Shan <gwshan at>
> BugLink:
> A struct resource represents the address space consumed by a device.  We
> should not modify that resource while the device is actively using the
> address space.  For VFs, pci_iov_update_resource() enforces this by
> printing a warning and doing nothing if the VFE (VF Enable) and MSE (VF
> Memory Space Enable) bits are set.
> Previously, both sriov_enable() and sriov_disable() called the
> pcibios_sriov_disable() arch hook, which may update the struct resource,
> while VFE and MSE were enabled.  This effectively dropped the resource
> update pcibios_sriov_disable() intended to do.
> Disable VF memory decoding before calling pcibios_sriov_disable().
> Reported-by: Carol L Soto <clsoto at>
> Tested-by: Carol L Soto <clsoto at>
> Signed-off-by: Gavin Shan <gwshan at>
> Signed-off-by: Alexey Kardashevskiy <aik at>
> [bhelgaas: changelog]
> Signed-off-by: Bjorn Helgaas <bhelgaas at>
> Cc: shan.gavin at
> Cc: Benjamin Herrenschmidt <benh at>
> Cc: Paul Mackerras <paulus at>
> (cherry picked from linux-next commit 0fc690a7c3f7053613dcbab6a7613bb6586d8ee2)
> Signed-off-by: Joseph Salisbury <joseph.salisbury at>

Applied to artful/master-next and unstable/master, thanks.

More information about the kernel-team mailing list