On Mon, Apr 01, 2019 at 08:11:00PM +0100, Robin Murphy wrote:
> With the diff below squashed in to address my outstanding style nits,
>
> Acked-by: Robin Murphy <robin.mur...@arm.com>
>
> I don't foresee any conflicting io-pgtable changes to prevent this going via
> DRM, but I'll leave the final say up to Joerg.
No objection from my side with merging this via DRM. With Robin's
concerns addressed:
Acked-by: Joerg Roedel <jroe...@suse.de>
>
> Thanks,
> Robin.
>
> ----->8-----
> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
> index 98551d0cff59..55ed039da166 100644
> --- a/drivers/iommu/io-pgtable-arm.c
> +++ b/drivers/iommu/io-pgtable-arm.c
> @@ -197,12 +197,13 @@ struct arm_lpae_io_pgtable {
>
> typedef u64 arm_lpae_iopte;
>
> -static inline bool iopte_leaf(arm_lpae_iopte pte, int l, enum
> io_pgtable_fmt fmt)
> +static inline bool iopte_leaf(arm_lpae_iopte pte, int lvl,
> + enum io_pgtable_fmt fmt)
> {
> - if ((l == (ARM_LPAE_MAX_LEVELS - 1)) && (fmt != ARM_MALI_LPAE))
> - return iopte_type(pte,l) == ARM_LPAE_PTE_TYPE_PAGE;
> + if (lvl == (ARM_LPAE_MAX_LEVELS - 1) && fmt != ARM_MALI_LPAE)
> + return iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_PAGE;
>
> - return iopte_type(pte,l) == ARM_LPAE_PTE_TYPE_BLOCK;
> + return iopte_type(pte, lvl) == ARM_LPAE_PTE_TYPE_BLOCK;
> }
>
> static arm_lpae_iopte paddr_to_iopte(phys_addr_t paddr,
> @@ -310,13 +311,10 @@ static void __arm_lpae_init_pte(struct
> arm_lpae_io_pgtable *data,
> if (data->iop.cfg.quirks & IO_PGTABLE_QUIRK_ARM_NS)
> pte |= ARM_LPAE_PTE_NS;
>
> - if (lvl == ARM_LPAE_MAX_LEVELS - 1) {
> - if (data->iop.fmt == ARM_MALI_LPAE)
> - pte |= ARM_LPAE_PTE_TYPE_BLOCK;
> - else
> - pte |= ARM_LPAE_PTE_TYPE_PAGE;
> - } else
> + if (data->iop.fmt != ARM_MALI_LPAE && lvl != ARM_LPAE_MAX_LEVELS - 1)
> pte |= ARM_LPAE_PTE_TYPE_BLOCK;
> + else
> + pte |= ARM_LPAE_PTE_TYPE_PAGE;
>
> if (data->iop.fmt != ARM_MALI_LPAE)
> pte |= ARM_LPAE_PTE_AF;
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
