Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
From:   Laurentiu Tudor <laurentiu.tudor@nxp.com>
To:     joro@8bytes.org, will@kernel.org, robin.murphy@arm.com,
        treding@nvidia.com, jgg@nvidia.com, iommu@lists.linux.dev,
        linux-kernel@vger.kernel.org
Cc:     Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH v3] iommu: map reserved memory as cacheable if device is coherent
Date:   Tue, 26 Sep 2023 18:26:00 +0300
Message-Id: <20230926152600.8749-1-laurentiu.tudor@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6pY9MerhWsPfiAUGRhTAnPfgpZ2oSk5T1wXJlQHOXW+00AMvVke8HIK0c4OF?=
 =?us-ascii?Q?SrfKWn7vKPRVzk+X6OdVOL4WZcEB4gopCXTkLDg9uHM/5DpGk7FthOgYqvMB?=
 =?us-ascii?Q?L6vPYRhHPN/mUersq/UYAYt4XN5KroTqheO+K/touUlCqClKK2Dh3R4ZYxUq?=
 =?us-ascii?Q?mEGRMWWSzvDWkPYsLIy3XO8IMMUBuD5RIE4vIp0lvTNaImyjvp71RU9ysvW3?=
 =?us-ascii?Q?PyCZtBw0jZ1whOTyQJ1RmUpLXw5DNkAcZ2YA7LledzBRY5hP+KgrsM3RIFPa?=
 =?us-ascii?Q?dGlkSz7675deFChYcyhk3ed4n+1lC17ziO8T5Z3KXXU6hSjmjK6yqVICuyD1?=
 =?us-ascii?Q?lqGSqK5ipStMsL65CT2WQ+AxYDyDSDml5J+ubr76zGdvnUGhPA8dHZScPkZ8?=
 =?us-ascii?Q?wln2trtW0BmIwG+Tw9+qDJjHIkcVxSlLT+dAQuK5ihs92oHJk67nxJ20CZLx?=
 =?us-ascii?Q?8JTFHMfAwy7KJ+NP2cggenY8x70YuV9+Ray4pGh+yMTsjFy/A7UFjEtn5UNT?=
 =?us-ascii?Q?yA/f32Hus0Q2vCE8Arx18wDvhAo14BgqiHlksKA70s+fBIpGDtCMMB+IAoL1?=
 =?us-ascii?Q?pgDZ47OmwUF8r0sq+FkWU21IOcwr6+dxkAxz6hT0X3/Z14dKLe0t+o15cljE?=
 =?us-ascii?Q?zHoJOm0QKWF1jGFWbzXazPCopIF6Qb2qdO+i8OaZqVl+Poe/Nc1xwFdeCMrv?=
 =?us-ascii?Q?ut088fdDfNPQhjftjxYJWizrkOjmiaO2vnCHviWTyijFgvCpW962FhNLVBGA?=
 =?us-ascii?Q?ZKbgj65rwQ/3r379pD/acWkMgvupaqPyfVbcdtt/LAgFmmLY8x7ePJTSaZEV?=
 =?us-ascii?Q?XjNkFI4nGpdNQYYiQJsTohK2Xz4cZpyPrHmwwdgYS1rkJObD0LlArdKhCQRZ?=
 =?us-ascii?Q?tHLpiJchZ4vMg8jfXlOYEwEpVVUJX5oZ0vIGU15olKcZfSD0P/3fy+izsfoT?=
 =?us-ascii?Q?uTDFjQlP+cLRkoORKdFGEMR0C7kxIaIMfrKBMcngq+9Pm8HnCiEpZOmM4yqW?=
 =?us-ascii?Q?3HhrfQZRNzlZzi1oIEPMYjwecWvyRpHux4GkLZh4i8vmggccAx8fDGk46jPr?=
 =?us-ascii?Q?gXpRdO8VFv2HqOcpD/TbBcTgx/I83Ohq1dhL9K4/1vP/nn+fy248QX2xgr9z?=
 =?us-ascii?Q?qUP2yrjN7LLwdZ7x0ERseMbgYAANheIDH7VbcYzK62zfDduOHwYn1S4d2xuV?=
 =?us-ascii?Q?i1rcUzb6K1IN8WRt684MSqhFNgROUff0uofy9FREF4PKIQWor7eJanJJgtI0?=
 =?us-ascii?Q?J1LLD8dV7E4eW/HRKr/Qscl4tqKirjhMZzGZPFE2Otl+AlyO3xy1NjAIfew9?=
 =?us-ascii?Q?UFXHoOy48Pcu/XDp5kVRcI3/mTyq5bEMh5ystMIbSk4Nd4YZctELwHGXmSzB?=
 =?us-ascii?Q?UZV1cDA4Oxh8Bm38QDFmcVhA106iDiG+ZcmQw0OtjiP55in+BzLTISKrLP+z?=
 =?us-ascii?Q?9oIjA/pMfPvhCBs/jiv8jk68cUHcJE6OfpGTFUZtMZJCiySxJOzplY8NyZwa?=
 =?us-ascii?Q?f5Wl2/qrACSKcG/XZPabQ6feFQaMTQuzMNwfyhFdQQSVtShtPme02YWGL73V?=
 =?us-ascii?Q?gg4rSE+3Km/xdUxugd9YfKtCB3XXKD+Hp01wVdGn?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 372469d3-a7a4-45b2-a3f1-08dbbea4e9ba
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9380.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 15:26:11.2055
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hKOP1zIQzMySyOrWlfOnAc01301Elw8NqJEKEY50oa/XQiNIjktT8gXH/DWO5R2gpmS0N0k9kOlEecHb9DXsTQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7493
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 26 Sep 2023 08:26:30 -0700 (PDT)

Check if the device is marked as DMA coherent in the DT and if so,
map its reserved memory as cacheable in the IOMMU.
This fixes the recently added IOMMU reserved memory support which
uses IOMMU_RESV_DIRECT without properly building the PROT for the
mapping.

Fixes: a5bf3cfce8cb ("iommu: Implement of_iommu_get_resv_regions()")
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
---
Changes in v3:
 - added Acked-by tag (Thierry)

Changes in v2:
 - added Reviewed-by tag (Jason)

 drivers/iommu/of_iommu.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 157b286e36bf..5b3631ba5a45 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -254,6 +254,9 @@ void of_iommu_get_resv_regions(struct device *dev, struct list_head *list)
 				phys_addr_t iova;
 				size_t length;
 
+				if (of_dma_is_coherent(dev->of_node))
+					prot |= IOMMU_CACHE;
+
 				maps = of_translate_dma_region(np, maps, &iova, &length);
 				type = iommu_resv_region_get_type(dev, &phys, iova, length);
 
-- 
2.17.1