From patchwork Thu Aug 3 00:08:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13338999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39968C10F00 for ; Thu, 3 Aug 2023 00:10:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232613AbjHCAKK (ORCPT ); Wed, 2 Aug 2023 20:10:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231674AbjHCAJx (ORCPT ); Wed, 2 Aug 2023 20:09:53 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20601.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e88::601]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 274113A98; Wed, 2 Aug 2023 17:09:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oLCNw7HuUeanTTWEbx+A7DdGuo1SlRFu72QTjRH57hbBPiKRAiKWF9QQGRlenZ+TmANhFNq+rzbECJbnmTLbK37oA2c9r1C9u69zrdPW+S4KGgCV++qB9dFBQJ62a72uCh1c3ErZdZ2KrnSxrtWPHrEKvaUXH4fhxoNJy9sCM/0SUPR//WU9zbjrZ6RvS36hJ5DszBKKDT/+tH5OCfQUGg4O0BrmLb5nc9Amyd3RlOd2boI2zohFNf7Qb1GHDHWGg6W2o3pUkm42xTO44qaXxdMtA8bIqoF1YSY0ido09c+mbE/GsfHqyE+rZXxH+23jB9H4ro9YwsntXO5But8yvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dz6dt5RIf74WYF+p6eT92sktXeneappvg700tVsi8FE=; b=K5jSubKbSl11abJk8XROC1fD3N+87NF6p9jW38eblqxVZUcqR4zeCebGKU8l1LUGtSZIdEatQOYZIraVwdWL4d8Ew3B4/rnnOVnPq4WJ0lzuWafFBiS05lWsD5yVYWY/z0zK+Qj9Lw19yzEZoro8RqTbypUjJg3bon+Vb869PUDKK1NpInh+NCx/loOPIL5b+9vPQ0eO4AGhernfQi+gXKfNoRW/3NrtwGRKe+paU5z6r74OrGXW6C0zt96ZSM+T8bhNXx4xGEDndQxCNiCVgpxjGfU22UA1gtf6hX2c2A5MeogHatIZkaHUBpPA/a5mOvtPkeK6fQtOeCqbk0qbjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dz6dt5RIf74WYF+p6eT92sktXeneappvg700tVsi8FE=; b=IrgSjYYH+dgCn99+8ienGIjsaH1lmP7bVgKhmLOlXgpTCDfVXvELZMuKo/xg1mtr4gvo2N/yZdk22R3WF7OeTkorstuqbZ7c+y0jc2rw82cdLp//cZNwPvqOGS61QBWYFKSNzaGiDXhRLNrnMvwKTySAPSWLfeqmg8976C9XjfALq7KH5isGiBMhkIHaj8k1BLLEU45URUy6c3sDmbs8w9AK19LAEFUiEfi5V1apMddeQEQrwcrQaU9B8sj3BcknMnJc30W3QD1n5zR2qIjCNQyVxNEWdmx8Z9iCZbK6TBzhw2xvOdnuBSAtnNF41/1/xtmSF41zYVcxkZ2R4wPKJg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) by MN0PR12MB5809.namprd12.prod.outlook.com (2603:10b6:208:375::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44; Thu, 3 Aug 2023 00:08:21 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::5111:16e8:5afe:1da1]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::5111:16e8:5afe:1da1%6]) with mapi id 15.20.6631.045; Thu, 3 Aug 2023 00:08:21 +0000 From: Jason Gunthorpe To: Andy Gross , Alim Akhtar , Bjorn Andersson , AngeloGioacchino Del Regno , Baolin Wang , Christophe Leroy , Gerald Schaefer , Heiko Stuebner , iommu@lists.linux.dev, Jernej Skrabec , Jonathan Hunter , Joerg Roedel , Kevin Tian , Konrad Dybcio , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-s390@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, Russell King , linuxppc-dev@lists.ozlabs.org, Matthias Brugger , Matthew Rosato , Michael Ellerman , Nicholas Piggin , Orson Zhai , Rob Clark , Robin Murphy , Samuel Holland , Thierry Reding , Krishna Reddy , Chen-Yu Tsai , Will Deacon , Yong Wu , Chunyan Zhang Cc: Lu Baolu , Dmitry Osipenko , Marek Szyprowski , Nicolin Chen , Niklas Schnelle , Steven Price , Thierry Reding Subject: [PATCH v6 14/25] iommu/msm: Implement an IDENTITY domain Date: Wed, 2 Aug 2023 21:08:01 -0300 Message-ID: <14-v6-e8114faedade+425-iommu_all_defdom_jgg@nvidia.com> In-Reply-To: <0-v6-e8114faedade+425-iommu_all_defdom_jgg@nvidia.com> References: X-ClientProxiedBy: MN2PR15CA0059.namprd15.prod.outlook.com (2603:10b6:208:237::28) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|MN0PR12MB5809:EE_ X-MS-Office365-Filtering-Correlation-Id: f9c2988f-a516-4321-d22c-08db93b5bc3e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kbVmhJ5kzIipHTOFYRrjvSiWnHjgrlAe/5HeDoXqtyAAqXWtUe5o83FYcRy78F2oNGbrbc+8KAjq1S1meIM4Ueyvp9BcQw0ORH/WlS4Yd54AlfH2KKbZnD2nRB7mLfVmp5HufFNOt9nUo9bgpfG3agoyr1BKLfDPc1ySymp+ukJYsOsXI5K1Fi9sNfv5uPrzH7ze5nbi6sUq5jn7/1K0cPwxrGl86M5GjIrO8EqUQjyTpEpS3kYsqzAcReoUvwiVdI6uPvdQAMCWsPp5/wiaWBaxWxwDYIN7VbHRaht2G1bRk98XqVziK1QkjC6aLtxWlUg+SjV75hUiMbcnatvpcU84cFzsHV7vNYTG7S7s1o+HaXiRowgj671QAK2KuYsgMD2grsZbpisfleB4VFxOpbmmMFex/SuU5m4OYeioo8Ksz0X423las8+hBzHrz9nxXk4S5LckZglN2ZnDP065NZshwIkV9gwawhfCnBRrdFSQx2l4tGLKEs2aHKpa/bNhNoktX2r5H8FXmTQDujlyr8ghOqxUB7ixsicSVpQIS4im00LGi81QXJ7bXckKGbPRBHkl5PtlpTry51EY4LdnmZ2sIpdL59Axjj/6P6rXHKk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LV2PR12MB5869.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(366004)(376002)(396003)(136003)(346002)(39860400002)(451199021)(110136005)(6512007)(54906003)(6486002)(6666004)(921005)(478600001)(38100700002)(41300700001)(5660300002)(316002)(66476007)(66946007)(8676002)(4326008)(8936002)(66556008)(2616005)(83380400001)(7406005)(26005)(107886003)(186003)(6506007)(7416002)(86362001)(36756003)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F1X2tmawWvei+c32esVYoFS/4e2F5mBnMkbOK8rcFqkHd5l8XhIbGfQVZNDhdxgPZfpWp5ZZVqTHnTRIVZiWtkxqnXzL+m7GV5AnhbgmW7qLu06pkKP0ewRwzNfVA9Ihh4HzEh1BnyANQ+xGI313mI92gOygSkYwRWypgJxpEcthd9phiHsbLYgVfqb7fuvhqLuCfJRdpDDGc7L0N6prKMwQ0BIwyYTSMlvzzBBDB7ZKQhKTPOXpcELE/4C8n18Pp8PBjqpsLwXD8mG6UeKPY6f47j+5+nfTAGu7PIhuKdhaMQiPLjeuTPA2bRsBx8V7JwWhkwIbaAQAvlA5GwnA07FsUTJxOsoEwb4lEEh+W+7S1ihw4N7XFu8JNklejALlaoOEXZaeBLCXMn8f1HP/+fOrp4/djUpC/WOzH0zEFga0eOyfD6YgbQuUOsz2h2q1Nnu6xkd7dR3OR5WVQlRbL+Y9KX3fhmUbSLgxnrc4DbnfOPr2cWgtsGb+EevKdy/7Oh2a8VYyqtbttsOqU6LYLufsv7taIeceUtOap0HM9xh8S0aWQshRowqOK1cj7m266Ud30YW3Pql2Posd1ZaM3+mFErwODFUXEpX/dyfefBSmOUgA1VmS4OlLcM90csKNY47WrT4vA/JOY055O22iYTP3E4H3vK36QWjtT3da8u9imMh/sOOMh8hwHNEFnPCj/JgXi7UbdsqGO2BOeapPZs4sR242gsu6v2y3O4RTDFcoqu58s8yh84dXC2K9U24zM1siWMJ3EqhUpSCnhmo3xcj/S1jxUoDvZcei3O7I2Bp00wZzTBN9KVQeliyjvTMxX0pWqnIHPxFN+6AWPTbS+xUtjEw7KiG5cH8Q1Pk5DQbCeVVN5pNYjOni6QcKWHvFwjFA0zz82JuyzGZTT7oPI0W+7nV4izxAfNOCRVUTYlWpcp13nmgUoVDprSiYgLALuJnPU5xE8TN1Rgbgstq49kGG9yXX63mZ0LSQZ6+si9Zz0q0MnwwWz4sqSIQ1sd0Fv149e5yu4X0/pbBgG9uQh98n4XbD3rygD6nI2I+WYjy1jwkHfEbsXl1HP1m8lOZJmY8AKnZNQfBoQhqJyWCXXb9pPGFYFaQwtaRHuu9wwARP1TznX9kG9bgKDRKaToaOaW/CPZBE2CePYa0F9yIawwug+phXdGuPbmBvDHc5bB08esF3jzpvRGgClCeoWgIHm8/mfuG2dKJcfZQDodnbWbRG9HIYZWNRFfbCRio/9e2EnepOfqTGVOkFgjfH4rKmo6b/tn0rh8jI96/DhmkxjE1ARVj/3Bj3sHVLQW7Glk5TCDfb8rBGWjJF84mbXQWq/Vh5UE5DCiS2U07O3zUYv2q6h4Nx/mqIIxIL8O9HpEUvFvl7KGEiHmtr54KyFa8W5PcCjOTSjwXopMME9ElQEKyWGefonxpEArrc0nboXkyjt1Kvt3Q2BCZhrf+yzxH3lqjE2cD/F98XK/pt2C1bts73Nfc5dtgoXosL5monKaqsfsUwOrwL+pbu5L6C88NPqJyb+Rcou1WzdxyMb8RHDxquf8PaWSOQgweO2URZpjB5u26mTxhppsaSBHan/J+6 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9c2988f-a516-4321-d22c-08db93b5bc3e X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2023 00:08:16.2672 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Z0qxX+iRdVyVjrxA6v/2RAzCT4tAYguTdVZfkmM24blHmpJ2LXycNlmWm6KyRUU3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5809 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org What msm does during msm_iommu_set_platform_dma() is actually putting the iommu into identity mode. Move to the new core support for ARM_DMA_USE_IOMMU by defining ops->identity_domain. This driver does not support IOMMU_DOMAIN_DMA, however it cannot be compiled on ARM64 either. Most likely it is fine to support dma-iommu.c Signed-off-by: Jason Gunthorpe Reviewed-by: Lu Baolu --- drivers/iommu/msm_iommu.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 79d89bad5132b7..26ed81cfeee897 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -443,15 +443,20 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev) return ret; } -static void msm_iommu_set_platform_dma(struct device *dev) +static int msm_iommu_identity_attach(struct iommu_domain *identity_domain, + struct device *dev) { struct iommu_domain *domain = iommu_get_domain_for_dev(dev); - struct msm_priv *priv = to_msm_priv(domain); + struct msm_priv *priv; unsigned long flags; struct msm_iommu_dev *iommu; struct msm_iommu_ctx_dev *master; - int ret; + int ret = 0; + if (domain == identity_domain || !domain) + return 0; + + priv = to_msm_priv(domain); free_io_pgtable_ops(priv->iop); spin_lock_irqsave(&msm_iommu_lock, flags); @@ -468,8 +473,18 @@ static void msm_iommu_set_platform_dma(struct device *dev) } fail: spin_unlock_irqrestore(&msm_iommu_lock, flags); + return ret; } +static struct iommu_domain_ops msm_iommu_identity_ops = { + .attach_dev = msm_iommu_identity_attach, +}; + +static struct iommu_domain msm_iommu_identity_domain = { + .type = IOMMU_DOMAIN_IDENTITY, + .ops = &msm_iommu_identity_ops, +}; + static int msm_iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t pa, size_t pgsize, size_t pgcount, int prot, gfp_t gfp, size_t *mapped) @@ -675,10 +690,10 @@ irqreturn_t msm_iommu_fault_handler(int irq, void *dev_id) } static struct iommu_ops msm_iommu_ops = { + .identity_domain = &msm_iommu_identity_domain, .domain_alloc = msm_iommu_domain_alloc, .probe_device = msm_iommu_probe_device, .device_group = generic_device_group, - .set_platform_dma_ops = msm_iommu_set_platform_dma, .pgsize_bitmap = MSM_IOMMU_PGSIZES, .of_xlate = qcom_iommu_of_xlate, .default_domain_ops = &(const struct iommu_domain_ops) {