Message ID | 1559217748-25426-1-git-send-email-andrii.anisov@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | iommu/arm: add missing return | expand |
Hi Andrii, Sorry for the late answer. On 5/30/19 1:02 PM, Andrii Anisov wrote: > From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> > > In case iommu_ops have been already set, we should not update it. > > Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> > Signed-off-by: Andrii Anisov <andrii_anisov@epam.com> Acked-by: Julien Grall <julien.grall@arm.com> Cheers, > --- > > This patch is extracted from [1], as agreed here [2]. > > [1] https://lists.xenproject.org/archives/html/xen-devel/2019-01/msg01658.html > [2] https://lists.xenproject.org/archives/html/xen-devel/2019-01/msg01859.html > > --- > xen/drivers/passthrough/arm/iommu.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/xen/drivers/passthrough/arm/iommu.c b/xen/drivers/passthrough/arm/iommu.c > index 325997b..2135233 100644 > --- a/xen/drivers/passthrough/arm/iommu.c > +++ b/xen/drivers/passthrough/arm/iommu.c > @@ -32,7 +32,10 @@ void __init iommu_set_ops(const struct iommu_ops *ops) > BUG_ON(ops == NULL); > > if ( iommu_ops && iommu_ops != ops ) > + { > printk("WARNING: Cannot set IOMMU ops, already set to a different value\n"); > + return; > + } > > iommu_ops = ops; > } >
On 11/06/2019 15:37, Julien Grall wrote: > Hi Andrii, > > Sorry for the late answer. > > On 5/30/19 1:02 PM, Andrii Anisov wrote: >> From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> >> >> In case iommu_ops have been already set, we should not update it. >> >> Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> >> Signed-off-by: Andrii Anisov <andrii_anisov@epam.com> > > Acked-by: Julien Grall <julien.grall@arm.com> Now committed, thank you! Cheers,
On 11.06.19 18:12, Julien Grall wrote: >> Acked-by: Julien Grall <julien.grall@arm.com> > > Now committed, thank you! Thank you.
diff --git a/xen/drivers/passthrough/arm/iommu.c b/xen/drivers/passthrough/arm/iommu.c index 325997b..2135233 100644 --- a/xen/drivers/passthrough/arm/iommu.c +++ b/xen/drivers/passthrough/arm/iommu.c @@ -32,7 +32,10 @@ void __init iommu_set_ops(const struct iommu_ops *ops) BUG_ON(ops == NULL); if ( iommu_ops && iommu_ops != ops ) + { printk("WARNING: Cannot set IOMMU ops, already set to a different value\n"); + return; + } iommu_ops = ops; }