diff options
| author |   Robin Murphy <robin.murphy@arm.com> | 2019-10-25 19:08:36 +0100 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2019-11-04 19:59:30 +0000 |
| commit | 205577ab6f7ade6185f764ed78fb6875dca40205 (patch) | |
| tree | 3dc33876b1194b7d1cf1a384e7216659a6d95344 /include/linux/io-pgtable.h | |
| parent | iommu/io-pgtable-arm: Simplify level indexing (diff) | |
| download | wireguard-linux-205577ab6f7ade6185f764ed78fb6875dca40205.tar.xz wireguard-linux-205577ab6f7ade6185f764ed78fb6875dca40205.zip | |
iommu/io-pgtable-arm: Rationalise MAIR handling
Between VMSAv8-64 and the various 32-bit formats, there is either one
64-bit MAIR or a pair of 32-bit MAIR0/MAIR1 or NMRR/PMRR registers.
As such, keeping two 64-bit values in io_pgtable_cfg has always been
overkill.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'include/linux/io-pgtable.h')
| -rw-r--r-- | include/linux/io-pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h index ec7a13405f10..ee21eedafe98 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -102,7 +102,7 @@ struct io_pgtable_cfg { struct { u64 ttbr[2]; u64 tcr; - u64 mair[2]; + u64 mair; } arm_lpae_s1_cfg; struct { |