| Message ID | 20191209180514.272727-13-jean-philippe@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On Mon, Dec 09, 2019 at 07:05:13PM +0100, Jean-Philippe Brucker wrote: > The SMMUv3 driver, which may be built without CONFIG_PCI, will soon gain > PASID support. Partially revert commit c6e9aefbf9db ("PCI/ATS: Remove > unused PRI and PASID stubs") to re-introduce the PASID stubs, and avoid > adding more #ifdefs to the SMMU driver. > > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > include/linux/pci-ats.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h > index 5d62e78946a3..d08f0869f121 100644 > --- a/include/linux/pci-ats.h > +++ b/include/linux/pci-ats.h > @@ -33,6 +33,9 @@ void pci_disable_pasid(struct pci_dev *pdev); > int pci_pasid_features(struct pci_dev *pdev); > int pci_max_pasids(struct pci_dev *pdev); > #else /* CONFIG_PCI_PASID */ > +static inline int pci_enable_pasid(struct pci_dev *pdev, int features) > +{ return -EINVAL; } > +static inline void pci_disable_pasid(struct pci_dev *pdev) { } > static inline int pci_pasid_features(struct pci_dev *pdev) > { return -EINVAL; } > static inline int pci_max_pasids(struct pci_dev *pdev) > -- > 2.24.0 >
Hi Jean, On 12/9/19 7:05 PM, Jean-Philippe Brucker wrote: > The SMMUv3 driver, which may be built without CONFIG_PCI, will soon gain > PASID support. Partially revert commit c6e9aefbf9db ("PCI/ATS: Remove > unused PRI and PASID stubs") to re-introduce the PASID stubs, and avoid > adding more #ifdefs to the SMMU driver. > > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > include/linux/pci-ats.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h > index 5d62e78946a3..d08f0869f121 100644 > --- a/include/linux/pci-ats.h > +++ b/include/linux/pci-ats.h > @@ -33,6 +33,9 @@ void pci_disable_pasid(struct pci_dev *pdev); > int pci_pasid_features(struct pci_dev *pdev); > int pci_max_pasids(struct pci_dev *pdev); > #else /* CONFIG_PCI_PASID */ > +static inline int pci_enable_pasid(struct pci_dev *pdev, int features) > +{ return -EINVAL; } > +static inline void pci_disable_pasid(struct pci_dev *pdev) { } > static inline int pci_pasid_features(struct pci_dev *pdev) > { return -EINVAL; } > static inline int pci_max_pasids(struct pci_dev *pdev) >
diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index 5d62e78946a3..d08f0869f121 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h @@ -33,6 +33,9 @@ void pci_disable_pasid(struct pci_dev *pdev); int pci_pasid_features(struct pci_dev *pdev); int pci_max_pasids(struct pci_dev *pdev); #else /* CONFIG_PCI_PASID */ +static inline int pci_enable_pasid(struct pci_dev *pdev, int features) +{ return -EINVAL; } +static inline void pci_disable_pasid(struct pci_dev *pdev) { } static inline int pci_pasid_features(struct pci_dev *pdev) { return -EINVAL; } static inline int pci_max_pasids(struct pci_dev *pdev)
The SMMUv3 driver, which may be built without CONFIG_PCI, will soon gain PASID support. Partially revert commit c6e9aefbf9db ("PCI/ATS: Remove unused PRI and PASID stubs") to re-introduce the PASID stubs, and avoid adding more #ifdefs to the SMMU driver. Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> --- include/linux/pci-ats.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.24.0