| Message ID | 20190520065746.17068-1-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | ACPI/IORT: Fix build without CONFIG_IOMMU_API | expand |
On 2019/5/20 14:57, Christoph Hellwig wrote: > IOMMU_FWSPEC_PCI_RC_ATS is only defined if CONFIG_IOMMU_API is > enabled. > > Fixes: 5702ee24182f ("ACPI/IORT: Check ATS capability in root complex nodes") > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/acpi/arm64/iort.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index 9058cb084b91..3e542b5d2a2d 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -1074,9 +1074,10 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) > info.node = node; > err = pci_for_each_dma_alias(to_pci_dev(dev), > iort_pci_iommu_init, &info); > - > +#ifdef CONFIG_IOMMU_API > if (!err && iort_pci_rc_supports_ats(node)) > dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS; > +#endif > } else { > int i = 0; This was reported, please refer to this patch from Lorenzo: https://patchwork.kernel.org/patch/10946845/ Thanks Hanjun
Hi Christoph, On Mon, May 20, 2019 at 08:57:46AM +0200, Christoph Hellwig wrote: > IOMMU_FWSPEC_PCI_RC_ATS is only defined if CONFIG_IOMMU_API is > enabled. > > Fixes: 5702ee24182f ("ACPI/IORT: Check ATS capability in root complex nodes") > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/acpi/arm64/iort.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index 9058cb084b91..3e542b5d2a2d 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -1074,9 +1074,10 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) > info.node = node; > err = pci_for_each_dma_alias(to_pci_dev(dev), > iort_pci_iommu_init, &info); > - > +#ifdef CONFIG_IOMMU_API > if (!err && iort_pci_rc_supports_ats(node)) > dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS; > +#endif Cheers, although there's an alternative fix from Lorenzo that I'll send up for -rc2. Sorry for the delay; been having email issues this week. Will
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 9058cb084b91..3e542b5d2a2d 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1074,9 +1074,10 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) info.node = node; err = pci_for_each_dma_alias(to_pci_dev(dev), iort_pci_iommu_init, &info); - +#ifdef CONFIG_IOMMU_API if (!err && iort_pci_rc_supports_ats(node)) dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS; +#endif } else { int i = 0;
IOMMU_FWSPEC_PCI_RC_ATS is only defined if CONFIG_IOMMU_API is enabled. Fixes: 5702ee24182f ("ACPI/IORT: Check ATS capability in root complex nodes") Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/acpi/arm64/iort.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)