| Message ID | 20200224182401.353359-25-jean-philippe@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | iommu: Shared Virtual Addressing and SMMUv3 support | expand |
On Mon, Feb 24, 2020 at 07:23:59PM +0100, Jean-Philippe Brucker wrote: > The SMMUv3 driver, which can be built without CONFIG_PCI, will soon gain > support for PRI. Partially revert commit c6e9aefbf9db ("PCI/ATS: Remove > unused PRI and PASID stubs") to re-introduce the PRI stubs, and avoid > adding more #ifdefs to the SMMU driver. > > Cc: Bjorn Helgaas <bhelgaas@google.com> > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > include/linux/pci-ats.h | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h > index f75c307f346d..e9e266df9b37 100644 > --- a/include/linux/pci-ats.h > +++ b/include/linux/pci-ats.h > @@ -28,6 +28,14 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs); > void pci_disable_pri(struct pci_dev *pdev); > int pci_reset_pri(struct pci_dev *pdev); > int pci_prg_resp_pasid_required(struct pci_dev *pdev); > +#else /* CONFIG_PCI_PRI */ > +static inline int pci_enable_pri(struct pci_dev *pdev, u32 reqs) > +{ return -ENODEV; } > +static inline void pci_disable_pri(struct pci_dev *pdev) { } > +static inline int pci_reset_pri(struct pci_dev *pdev) > +{ return -ENODEV; } > +static inline int pci_prg_resp_pasid_required(struct pci_dev *pdev) > +{ return 0; } > #endif /* CONFIG_PCI_PRI */ > > #ifdef CONFIG_PCI_PASID > -- > 2.25.0 >
diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index f75c307f346d..e9e266df9b37 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h @@ -28,6 +28,14 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs); void pci_disable_pri(struct pci_dev *pdev); int pci_reset_pri(struct pci_dev *pdev); int pci_prg_resp_pasid_required(struct pci_dev *pdev); +#else /* CONFIG_PCI_PRI */ +static inline int pci_enable_pri(struct pci_dev *pdev, u32 reqs) +{ return -ENODEV; } +static inline void pci_disable_pri(struct pci_dev *pdev) { } +static inline int pci_reset_pri(struct pci_dev *pdev) +{ return -ENODEV; } +static inline int pci_prg_resp_pasid_required(struct pci_dev *pdev) +{ return 0; } #endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID
The SMMUv3 driver, which can be built without CONFIG_PCI, will soon gain support for PRI. Partially revert commit c6e9aefbf9db ("PCI/ATS: Remove unused PRI and PASID stubs") to re-introduce the PRI stubs, and avoid adding more #ifdefs to the SMMU driver. Cc: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> --- include/linux/pci-ats.h | 8 ++++++++ 1 file changed, 8 insertions(+)