diff options
| author | Robin Murphy | 2016-02-12 18:09:46 +0100 |
|---|---|---|
| committer | Will Deacon | 2016-02-17 15:15:09 +0100 |
| commit | 3850db49da87121b54c3ba43c82cdbe5a7c76be5 (patch) | |
| tree | 7734f41a83225e45c19a2999592b2b8eaa68a08c /drivers/iommu/io-pgtable-arm-v7s.c | |
| parent | iommu/io-pgtable: Avoid redundant TLB syncs (diff) | |
| download | kernel-qcow2-linux-3850db49da87121b54c3ba43c82cdbe5a7c76be5.tar.gz kernel-qcow2-linux-3850db49da87121b54c3ba43c82cdbe5a7c76be5.tar.xz kernel-qcow2-linux-3850db49da87121b54c3ba43c82cdbe5a7c76be5.zip | |
iommu/io-pgtable: Rationalise quirk handling
As the number of io-pgtable implementations grows beyond 1, it's time
to rationalise the quirks mechanism before things have a chance to
start getting really ugly and out-of-hand.
To that end:
- Indicate exactly which quirks each format can/does support.
- Fail creating a table if a caller wants unsupported quirks.
- Properly document where each quirk applies and why.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/io-pgtable-arm-v7s.c')
| -rw-r--r-- | drivers/iommu/io-pgtable-arm-v7s.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index d39a021a4f6d..9fcceb135f51 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -623,6 +623,11 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, if (cfg->ias > ARM_V7S_ADDR_BITS || cfg->oas > ARM_V7S_ADDR_BITS) return NULL; + if (cfg->quirks & ~(IO_PGTABLE_QUIRK_ARM_NS | + IO_PGTABLE_QUIRK_NO_PERMS | + IO_PGTABLE_QUIRK_TLBI_ON_MAP)) + return NULL; + data = kmalloc(sizeof(*data), GFP_KERNEL); if (!data) return NULL; |