| Message ID | 20180328115018.31921-5-niklas.cassel@axis.com |
|---|---|
| State | Accepted |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | PCI endpoint 64-bit BAR fixes | expand |
On Wednesday 28 March 2018 05:20 PM, Niklas Cassel wrote: > 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> > --- > drivers/pci/endpoint/pci-epc-core.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c > index 109d75f0b7d2..40eea20d21f9 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 possible I'd like this to be split. But otherwise Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > > if (!epc->ops->set_bar) >
diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c index 109d75f0b7d2..40eea20d21f9 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)
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> --- drivers/pci/endpoint/pci-epc-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)