From ec83bf90b302380de6faa7d7c6eaee3227d77f30 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 29 Oct 2020 17:20:04 +0100 Subject: [PATCH] Revert "PCI/IOV: Mark VFs as not implementing PCI_COMMAND_MEMORY" This reverts commit 42f16b3add6c3dde6751e5f8f7c2fab6bcc73250 which is commit 12856e7acde4702b7c3238c15fcba86ff6aa507f upstream. It breaks the pci abi and it's nothing we need to worry about for Android devices. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I4e71caad3d2a6b3aeb9bba57892c118e1e79a65d --- drivers/pci/iov.c | 1 - include/linux/pci.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index e15220385666..9c116cbaa95d 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -158,7 +158,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id) virtfn->device = iov->vf_device; virtfn->is_virtfn = 1; virtfn->physfn = pci_dev_get(dev); - virtfn->no_command_memory = 1; if (id == 0) pci_read_vf_config_common(virtfn); diff --git a/include/linux/pci.h b/include/linux/pci.h index cd9109b70d39..14e129d063bd 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -424,7 +424,6 @@ struct pci_dev { unsigned int is_probed:1; /* Device probing in progress */ unsigned int link_active_reporting:1;/* Device capable of reporting link active */ unsigned int no_vf_scan:1; /* Don't scan for VFs after IOV enablement */ - unsigned int no_command_memory:1; /* No PCI_COMMAND_MEMORY */ pci_dev_flags_t dev_flags; atomic_t enable_cnt; /* pci_enable_device has been called */