diff options
| author | Niklas Cassel <niklas.cassel@axis.com> | 2018-03-28 13:50:09 +0200 |
|---|---|---|
| committer | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2018-04-03 12:23:52 +0100 |
| commit | 3567a4edd6352239586470da1bd5834989425085 (patch) | |
| tree | eaea11b533ae62882a7d4a7c92b7250266fe1b34 /drivers/pci | |
| parent | f16b1f6fdf631213428ff115ae49ea70c9ac4f2d (diff) | |
| download | linux-0-day-3567a4edd6352239586470da1bd5834989425085.tar.gz linux-0-day-3567a4edd6352239586470da1bd5834989425085.tar.xz | |
PCI: endpoint: Setting 64-bit/prefetch bit is invalid when IO is set
If flag PCI_BASE_ADDRESS_SPACE_IO is set, also having any
PCI_BASE_ADDRESS_MEM_* bit set is invalid.
This sanity check is done in pci_epc_set_bar(), so that we don't need
to do this sanity check in all epc->ops->set_bar() implementations.
Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/endpoint/pci-epc-core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c index 109d75f0b7d2c..40eea20d21f9f 100644 --- a/drivers/pci/endpoint/pci-epc-core.c +++ b/drivers/pci/endpoint/pci-epc-core.c @@ -309,10 +309,13 @@ int pci_epc_set_bar(struct pci_epc *epc, u8 func_no, { int ret; unsigned long irq_flags; + int flags = epf_bar->flags; if (IS_ERR_OR_NULL(epc) || func_no >= epc->max_functions || (epf_bar->barno == BAR_5 && - epf_bar->flags & PCI_BASE_ADDRESS_MEM_TYPE_64)) + flags & PCI_BASE_ADDRESS_MEM_TYPE_64) || + (flags & PCI_BASE_ADDRESS_SPACE_IO && + flags & PCI_BASE_ADDRESS_IO_MASK)) return -EINVAL; if (!epc->ops->set_bar) |