Hi Robin,
On Tue, Jan 26, 2016 at 05:13:13PM +0000, Robin Murphy wrote:
> Add a nearly-complete ARMv7 short descriptor implementation, omitting
> only a few legacy and CPU-centric aspects which shouldn't be necessary
> for IOMMU API use anyway.
>
> Signed-off-by: Yong Wu <yong...@mediatek.com>
> Signed-off-by: Robin Murphy <robin.mur...@arm.com>
> ---
> drivers/iommu/Kconfig | 19 +
> drivers/iommu/Makefile | 1 +
> drivers/iommu/io-pgtable-arm-v7s.c | 849
> +++++++++++++++++++++++++++++++++++++
> drivers/iommu/io-pgtable.c | 3 +
> drivers/iommu/io-pgtable.h | 14 +-
> 5 files changed, 885 insertions(+), 1 deletion(-)
> create mode 100644 drivers/iommu/io-pgtable-arm-v7s.c
This looks good to me, with one minor comment below.
> diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
> index 36673c8..aa57073 100644
> --- a/drivers/iommu/io-pgtable.h
> +++ b/drivers/iommu/io-pgtable.h
> @@ -1,5 +1,6 @@
> #ifndef __IO_PGTABLE_H
> #define __IO_PGTABLE_H
> +#include <linux/bitops.h>
>
> /*
> * Public API for use by IOMMU drivers
> @@ -9,6 +10,7 @@ enum io_pgtable_fmt {
> ARM_32_LPAE_S2,
> ARM_64_LPAE_S1,
> ARM_64_LPAE_S2,
> + ARM_V7S,
> IO_PGTABLE_NUM_FMTS,
> };
>
> @@ -45,7 +47,9 @@ struct iommu_gather_ops {
> * page table walker.
> */
> struct io_pgtable_cfg {
> - #define IO_PGTABLE_QUIRK_ARM_NS (1 << 0) /* Set NS bit in PTEs */
> + #define IO_PGTABLE_QUIRK_ARM_NS BIT(0) /* Set NS bit in PTEs */
> + #define IO_PGTABLE_QUIRK_NO_PERMS BIT(1) /* No AP/XN bits */
> + #define IO_PGTABLE_QUIRK_TLBI_ON_MAP BIT(2) /* TLB Inv. on map */
We should either try to keep these generic or add _ARM_ in the names. I
don't see why we couldn't have them as generic quicks, but that means
you should fix the AP/XN comment to be architecture agnostic and also
hack the lpae iopgtable alloc code to reject a cfg with unsupported
quirks.
With that change, I'm happy to queue this via my tree or whatever is
easiest for Yong/Joerg.
Will
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
