summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMatthew Rosato <mjrosato@linux.ibm.com>2020-09-10 10:59:56 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-29 10:11:53 +0100
commitd8b44e9cad83f4ab27368b7b12c5062074732883 (patch)
tree851d40350d1f3efcfefbf86c8ba742a7ba4cd099 /arch
parent9a15e9921f9eb9137eb48bd96ae33497043fc82e (diff)
downloadlinux-stable-d8b44e9cad83f4ab27368b7b12c5062074732883.tar.gz
linux-stable-d8b44e9cad83f4ab27368b7b12c5062074732883.tar.bz2
linux-stable-d8b44e9cad83f4ab27368b7b12c5062074732883.zip
s390/pci: Mark all VFs as not implementing PCI_COMMAND_MEMORY
[ Upstream commit 08b6e22b850c28b6032da1e4d767a33116e23dfb ] For s390 we can have VFs that are passed-through without the associated PF. Firmware provides an emulation layer to allow these devices to operate independently, but is missing emulation of the Memory Space Enable bit. For these as well as linked VFs, set no_command_memory which specifies these devices do not implement PCI_COMMAND_MEMORY. Fixes: abafbc551fdd ("vfio-pci: Invalidate mmaps and block MMIO access on disabled memory") Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com> Reviewed-by: Niklas Schnelle <schnelle@linux.ibm.com> Reviewed-by: Pierre Morel <pmorel@linux.ibm.com> Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/pci/pci_bus.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c
index 5967f3014156..c93486a9989b 100644
--- a/arch/s390/pci/pci_bus.c
+++ b/arch/s390/pci/pci_bus.c
@@ -197,9 +197,10 @@ void pcibios_bus_add_device(struct pci_dev *pdev)
* With pdev->no_vf_scan the common PCI probing code does not
* perform PF/VF linking.
*/
- if (zdev->vfn)
+ if (zdev->vfn) {
zpci_bus_setup_virtfn(zdev->zbus, pdev, zdev->vfn);
-
+ pdev->no_command_memory = 1;
+ }
}
static int zpci_bus_add_device(struct zpci_bus *zbus, struct zpci_dev *zdev)