Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 1 | From 97caa9365f221b5aff93274a29ea894da55dce88 Mon Sep 17 00:00:00 2001 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 2 | From: Manoj Kumar <manoj.kumar3@arm.com> |
| 3 | Date: Mon, 1 Feb 2021 21:36:43 +0530 |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 4 | Subject: [PATCH] iommu/arm-smmu-v3: workaround for ATC_INV_SIZE_ALL in N1SDP |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 5 | |
| 6 | ATC_INV_SIZE_ALL request should automatically translate to ATS |
| 7 | address which is not happening in SMMUv3 version gone into |
| 8 | N1SDP platform. This workaround manually sets the ATS address |
| 9 | field to proper value for ATC_INV_SIZE_ALL command. |
| 10 | |
| 11 | Change-Id: If89465be94720a62be85e1e6612f17e93fa9b8a5 |
| 12 | Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com> |
| 13 | Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com> |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 14 | |
| 15 | Upstream-Status: Inappropriate [Workaround] |
| 16 | Signed-off-by: Manoj Kumar <manoj.kumar3@arm.com> |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 17 | Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> |
| 18 | Signed-off-by: Adam Johnston <adam.johnston@arm.com> |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 19 | --- |
| 20 | drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + |
| 21 | drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 + |
| 22 | 2 files changed, 2 insertions(+) |
| 23 | |
| 24 | diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 25 | index 88817a3376ef..80e252d59a3a 100644 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 26 | --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c |
| 27 | +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 28 | @@ -1731,6 +1731,7 @@ arm_smmu_atc_inv_to_cmd(int ssid, unsigned long iova, size_t size, |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 29 | }; |
| 30 | |
| 31 | if (!size) { |
| 32 | + cmd->atc.addr = ATC_INV_ADDR_ALL; |
| 33 | cmd->atc.size = ATC_INV_SIZE_ALL; |
| 34 | return; |
| 35 | } |
| 36 | diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 37 | index cd48590ada30..20892b2bfe1d 100644 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 38 | --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h |
| 39 | +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h |
Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 40 | @@ -472,6 +472,7 @@ struct arm_smmu_cmdq_ent { |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 41 | |
| 42 | #define CMDQ_OP_ATC_INV 0x40 |
| 43 | #define ATC_INV_SIZE_ALL 52 |
| 44 | + #define ATC_INV_ADDR_ALL 0x7FFFFFFFFFFFF000UL |
| 45 | struct { |
| 46 | u32 sid; |
| 47 | u32 ssid; |