Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
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 v2] iommu: map reserved memory as cacheable if device is coherent
Date:   Thu, 14 Sep 2023 15:52:58 +0300
Message-Id: <20230914125258.19640-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?xLnh2Dy1ZDuXcpc50BAdJ1oL0cVe3qvzAS5J0n3X446rj27bPF+ZMj/+9P1X?=
 =?us-ascii?Q?uJ6LWEw1pXFrttXpZksggVYnUR0meT0z6Wo6YKV5T0krGp8TpUTJzexvzFWs?=
 =?us-ascii?Q?gGkAcTl6wt1nZ0JWgKIaccN+CIi5GkP046jV2asACDm7xfwEt1udhsfQa/cf?=
 =?us-ascii?Q?DgJPPkhCp4cBZxVMEgc2UIIC0mwL67BWuN3W90mxmxqNbQ4lnvyUWLbWu6XS?=
 =?us-ascii?Q?m1wd2JlD2da7xam56lWQTB/WmouPeNYA6M8YPvn7RlwlGRf1dx5rxSkrHXb+?=
 =?us-ascii?Q?/yk/cigHqm+LXJi63KUdke1n6YFV+2JLFEAAfOQlJR5eZ4RJoej0eJyHHCOw?=
 =?us-ascii?Q?UTZNLTruvwZGCyMtZadlE6S6cAtUXAk+F92CYgnd2eVM+qQueykCutCtH3LG?=
 =?us-ascii?Q?HN6LDMGVzZ0OWV+benhI0IQr6mNRjg4dKUoWnWaiHuaoun+MMZG8RWVPwuRG?=
 =?us-ascii?Q?dMFdG0iUts+xK9GCT5VwXLf/+ZkENcIJzZx6yYhI1PV4vtmjFC4hvylM6vct?=
 =?us-ascii?Q?rYQUshbJsncd9OLReriwi5dFpPp+aAlxjfZaVWdSuxZ5Sj8GSrc9CPqePCyU?=
 =?us-ascii?Q?LAN2d7H+A9z+IA1MY/NMvsVoSlbpOKlKVojrAphj3Tu3ZmdagI6+AoVM6Eby?=
 =?us-ascii?Q?m0adrnr48fuXgSlRuAnUTGomcDnYY7tp4ephRUGDFZFwpbYWFUa5GKC/EVmr?=
 =?us-ascii?Q?GWu5PSobgNVbgWjA6YTKZ1N0JxJK9EjUqxzPt2iv+uRZoFFE6UowS/L72puZ?=
 =?us-ascii?Q?wqnhzV+7bc3dVJH+dHlAe05ONJ944pIcfRabT0n9LZ6ZpPYYdtA25ZiCz3uN?=
 =?us-ascii?Q?KDMbmd65S3TdoNFKSma82tAoqkRq1s3shrm84HKgxKftClfQfJU60ETy/BIy?=
 =?us-ascii?Q?3FlXpfoWTV8THfzYX1Zcl/nq+g/cdOrxHCRZqmzPyDrtFUYjv3+AXJhy2ghd?=
 =?us-ascii?Q?6w7v0/yYIS71CecmlR0GqgmiNbJp7VCrKqmFQr1stHO0eSr4d7+gq/dWKqiK?=
 =?us-ascii?Q?s0QUeD7+mbNdFgKY16P9wVoSGhVEy0NFWFUP3Yee/B9GpHNJyrKF2m2mcl7z?=
 =?us-ascii?Q?p2BSIVZqiPSSYcx4/TkCR1YNUZps8ZJD4hsYpddScHbHtJgctOcJ8qrnRbdn?=
 =?us-ascii?Q?yAvJBCbKpe2DUswXatUbdYFT8nJh4Zk7FLjWYGy+OLX+KA5QhUdXrVUZUCxa?=
 =?us-ascii?Q?l9YwEh8mqhkl01W/A79O4E5RbI3MS62XQ+ThP8+nMAHQh+UBlxp+ThW+6a6b?=
 =?us-ascii?Q?O7cLBSq8jJuZbQzRNHpBMNhs+nXSHXIxkMJt4wTr4mi3dce5xlq1eX4bmRHK?=
 =?us-ascii?Q?e1NZcSg+FDJKQpkEHR10kVUQ8wk05TSW7SjgI6Ivyv2DjGfWhDiKMPta79RZ?=
 =?us-ascii?Q?NMu1SuDaAN94GgSF4mQLhiXkWG4BuzCedF2ROtL8IrqWPr9EjWT38++0CQQI?=
 =?us-ascii?Q?7cOaelDw/eomIxtqEkm5/PzjRMzCkXvgYvdepIF9qZ5oRWKTAIwCS+mz++D2?=
 =?us-ascii?Q?ZxUnhfLCDQ3vlqfCYpl8ghAhN227leqL+FXeeKsBy2oZn/3SJylNy4RwCMHi?=
 =?us-ascii?Q?zJVQnQtpPmTox+OBPt1r+QUxiY/7EIc6o+aHdW5d?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 978f98e1-f969-4274-40b6-08dbb5218f41
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9380.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Sep 2023 12:53:14.7606
 (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: N6T1joLTnlzr716OCJGmhjfSeEBouRTkF7pr8Y4u0UVRdHOeMOw2DrBtqrA98bUd8EAAZCvpPP7e0aJpBOb5mA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7808
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 (pete.vger.email [0.0.0.0]); Thu, 14 Sep 2023 05:53:24 -0700 (PDT)
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email

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>
---
Changes in v2:
 - added Reviewed-by tag

 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