diff options
| author | Eric Auger | 2020-07-28 17:08:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-08-24 11:02:06 +0200 |
| commit | e7c3b9d9a0ddee7daa9b08bd14bd3ebbcf5f5cd3 (patch) | |
| tree | 19bee6a1f3e39fb38bce6cdefeb934162b8075fc /hw/arm/smmu-common.c | |
| parent | hw/arm/smmuv3: Let AIDR advertise SMMUv3.0 support (diff) | |
| download | qemu-e7c3b9d9a0ddee7daa9b08bd14bd3ebbcf5f5cd3.tar.gz qemu-e7c3b9d9a0ddee7daa9b08bd14bd3ebbcf5f5cd3.tar.xz qemu-e7c3b9d9a0ddee7daa9b08bd14bd3ebbcf5f5cd3.zip | |
hw/arm/smmuv3: Support HAD and advertise SMMUv3.1 support
HAD is a mandatory features with SMMUv3.1 if S1P is set, which is
our case. Other 3.1 mandatory features come with S2P which we don't
have.
So let's support HAD and advertise SMMUv3.1 support in AIDR.
HAD support allows the CD to disable hierarchical attributes, ie.
if the HAD0/1 bit is set, the APTable field of table descriptors
walked through TTB0/1 is ignored.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20200728150815.11446-11-eric.auger@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/smmu-common.c')
| -rw-r--r-- | hw/arm/smmu-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 8d89a86699..3838db1395 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -316,7 +316,7 @@ static int smmu_ptw_64(SMMUTransCfg *cfg, if (is_table_pte(pte, level)) { ap = PTE_APTABLE(pte); - if (is_permission_fault(ap, perm)) { + if (is_permission_fault(ap, perm) && !tt->had) { info->type = SMMU_PTW_ERR_PERMISSION; goto error; } |