From patchwork Wed Aug 23 16:47:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13362823 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BE353C79F61 for ; Wed, 23 Aug 2023 16:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uBjaou6aWLUWUmCI46Z1xbCOrox4DzrwQ6JHgrixbjE=; b=K4JQ0a3rRQTjSN n1YR+I+a2FY1mf3UetqZTObjszoX0I2M3+8/lsUAwlRn21/n8FOAKcDTN9yvfeKsUEu5KyPY6ETfR HzCTtqdGXOrnJ4x6mZwC3CEB9AuhZ1SEgbeAhoLbxj47btlIam54Bh+V+MfReO5Qo4j4Dh72Iz1CP 4EDHZHIsGOL2chSjHhexIASkiKQtgCOwhdF5mIjLM6YpURm6gG9yvlOQYYqXfjx+7Vsfl1Ho2/lRj BeSE07NRJDiPn4iX7yN6ahv1P6k8rIal8L2/ikwQwFdu9Vq7dLucCEovodRMtZwBSHVvOJYMNFuSK TRFXA1mxdsYvf/aAofQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qYr22-0016mY-21; Wed, 23 Aug 2023 16:48:34 +0000 Received: from mail-bn8nam12on2060f.outbound.protection.outlook.com ([2a01:111:f400:fe5b::60f] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qYr1R-001693-0F; Wed, 23 Aug 2023 16:47:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K1k5aBGwc7zXR2jO86vKFGDdyTDYUZ8ph6J/ACFYjycYfn5ul3kszvD3F0dWutsk3NTE3zEXEFo7lWYjBK5QVMzQVV9mChbbb7tCzWrikAbA0njpLTnlY3tEBPVr9S9Q1cJCOc79vD9Rtif1T5mpyxYcueF93oadB6ZEdK+W0NZsPjQUUDCwbMel6eVfBT7gwGZUd8jHwPMMhBFF9lQ3CPGAfZJxEAOD6CT2UYy/zpaULGkCARxTMyM5R3471s82bovqiIrRnM9EfydUzChgZ6wfYJqvGhX6zkfKlIlQADqjCcMeRfgDyyqHisY/XW3E+qPRSAuUo3U4XhxzUzLnMQ== 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=NU6+gAi7na6R2Cd9q+LQhmLXvWeshtpQZ97BCSNrvGU=; b=LV4Lnm3BqpGeGRksv5lQ9RQzPeFtSZ7UWJasPoC5dXQD2W114DRUh4D/xWayOdxW7mCPvzKwiKEJFIDRQU6JHKkVk2foXHsDNJgLC4+ES3qPdj1T0WYHnzDnL5gPbQWwioUCpVfI+Fe9huBMdjFEWZ70oD/08Q6JJLbyyXxNr7gkgGz7EHmTItOecGFCkvGe3jaYWKL5qUC0dAKnz6aST3o0RemflEtC3DMnaLHuJ0rljTnt/GWDmxhWauN7Naep7vdZNvHf76/nDS3w/ofrQcXFx7Cc7jH93336a+HG4TgAliArVvflF4SHEsW2BvJTg16EqFj/QW9iotbLeqDq5g== 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=NU6+gAi7na6R2Cd9q+LQhmLXvWeshtpQZ97BCSNrvGU=; b=r+X9ujf1HRvXIvTcw4zkJO1SaNHwGjRbg6be7ZR8Vvl0X66NuRr2bnzZaAaVBnql5QfMTzXyC8jf6YwxJPYp98aUabHfNTGKOFr/HgS+AIM3vbOoALfJ7kxWaJE3fR2Sl6d15F8Qeb2Gn3oYPwbgd/OMlxmL25fZKtJanPHoH6T2pGCvVIFM1PdsKTkbbyINOGcGUQsjOgdxyPCUU60VZryyjRbizcJXwrobY+bfkdtvEUWqZvp2jQj8rGn1ReJL/ypvMq6XRzcSJop605mWMkc3QZcRN+yLLcJqfixOmdTx4ULjVmg5NUymArJAGnYktsy9iJpLYivDXd2rNUmslA== 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 CY5PR12MB6346.namprd12.prod.outlook.com (2603:10b6:930:21::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.24; Wed, 23 Aug 2023 16:47:46 +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.6699.020; Wed, 23 Aug 2023 16:47:46 +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 v7 18/24] iommu/mtk_iommu: Add an IOMMU_IDENTITIY_DOMAIN Date: Wed, 23 Aug 2023 13:47:32 -0300 Message-ID: <18-v7-de04a3217c48+15055-iommu_all_defdom_jgg@nvidia.com> In-Reply-To: <0-v7-de04a3217c48+15055-iommu_all_defdom_jgg@nvidia.com> References: X-ClientProxiedBy: CH0PR03CA0402.namprd03.prod.outlook.com (2603:10b6:610:11b::23) To LV2PR12MB5869.namprd12.prod.outlook.com (2603:10b6:408:176::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV2PR12MB5869:EE_|CY5PR12MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: 7dd5b181-0263-4496-5402-08dba3f8aab8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ARSuSzIG4NTLUBt6iP0Xt4Iieh+wMxcoXt93FfDOiJdsQ61y+RXclG3PnAl6V8spCK4IFWYYmkCGaR6ZB4c5YtgUdfn6bB2pgy6+ynQS4VGdfqp2dtGc+gpNh9wuUZs3BuxtbyuQy8ov484kGS+OMv0BwVPNwdvT4buyxmEA7yOdhfL0BQPjTLuOie0oAEaPUyp6kBTu5a3OSP6RgpIl+IXFkpbjXCcwYSU/4x7RrQFsO7yvlOpGF2uAsFRgUdssUXFKiboDck96UIv6Fhrz73egWoSJAIICeX5abwOlWnzK5cJVxiiI34hdqHfjLr6lcJC5AGsSwRy7IXfH4BNXJWYGv03ZsU64s79FAgUdYc9YtznKj/g4ItO4Do0ebaYjjO+OL/lSZWrLiUjjDdV+Rmm/vf/2AR6XmmUap7z0MD6QYuMk+RjpDJPNlJGzH+4ixuRv5d/m94IioPyBtz7VXs6VPrArdF2FwuQ7vKKyp7hwZ2qbsvHOnu+WP56xW9qZ1o0PTEFkd2tuYXVuf/6m9u19o1HuBbzpjWbVXeKtjQyVr8CO3yr5uOBNdnLkHsEKRJd3LN17VFC6N030xIA1CPNUGw+f44+CgJTBr9Z1eAg= 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:(13230031)(376002)(396003)(136003)(346002)(366004)(39860400002)(186009)(1800799009)(451199024)(54906003)(66476007)(66946007)(6512007)(316002)(66556008)(110136005)(8676002)(8936002)(107886003)(2616005)(4326008)(36756003)(41300700001)(921005)(478600001)(6666004)(6506007)(38100700002)(6486002)(83380400001)(7416002)(2906002)(7406005)(86362001)(5660300002)(26005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 64UO3QKO0APzzmJvk9MO8LTs0t6W9y8C+5J072qdBI4AqdI+rynXtQcZTolBR+0MNeQqxkfpPyX0mgiSQxuEmgCqeYnG2EjlV365G8X66yqfaVSaPNHgHootOpmfer6d3zcRPLNiIAIrccUUDKn1mAfRvIa+J99jJXihzYji7gG/tAfrsgVwOB3LTOURMguuGSE1FEPZNnSlvVRKpxBvrdTxGSyVReRkewepyv8m2O2avpr8DRw0ZKvDEQOSMmOmICEavmFhMfe2rnpvo8Z5cJZjTaQxzbWZsX0bop8zLpDOICbqqOZuGPcgANqSP1II6n8gRNUU0FIrBFXtIV4Qmo7QPYRrIlUOeftp1ocj6aEX+ELf43kBX634oVpactgO/667RAJ5S1mvUwl5IQ+sdNA7+tV6sL+muhyAIg9jw0vTlA1CzkKq2rwUMzZ0IsfrgSN1shJuoQ4etaQTICewfNBExGdWTA9tE2fRAEAXRFCjG+npMEzdRefPDCLLKuzaWo0ry03zLZL/jTDnQaEH3SC+0VMmio/3wGq0+vIzxMWe3cmc/QQEzPFjo0MBclHgJFE3Tyofb1BJeRPaxZZsFgOsF89jBVlsOxaHxbluM8DDypAoB+SVflr7EafS+mXF+sPuczr9PKymUAdH8it0jTd3t1+HJZL6/gQ1nEumL6T11yVMYpJhcnWkX24hcdqTf0QC4quGgDXJ663wGzlUPzU5JPF2za5e+3UtGuSvTiphKxxGB00OamSwf39I2Zn7d8wFfHuPRjtRRrejhfjUi/kNM85d7M2w8wUOwylDVVsrvEXQ5az2SCmxF1Uev9DtWNMuhUC8Ka722vJYfkCa9gycTqBPSfzRhF+w7x+cTDRAoTGyVfOFHxys9gA36EKVohqCoCZLaPa8bz5ULKJzxJEQVyYNiBNegFf95k7xOfx3rQLh+1BGVCAP/EZ7FWwgLG4qL/Ig9AxN4MtZB18SSAV/6hUJqaQknUDZr3DWr+h1miiYDL8OcEskO/1ia5Y4rAA2t9lIb9VtY23CB3XgAcqkgrFu4dnxnsz7mLTpgTLruSMiIUuFkaVL8wngX60QO66PveB2kZOqcB4Z2ie8JYKpO6cPgb6tUG2EdA3pFw0dgye0KeBAFHBY61YznoUCTIB+URzZ580gPp3g053R87cehEzaN2ij8dNaZWrL2MqRBSZG2CIVKic4onMDrwJ5lTT2DSSWGm+tb1GDNC/gVHF8PSE8v/Tgv14cgkc3EsmoDKLeChg3j8rQ/XUNEhrMsNqe6DKkUyGgHBbqO3cosH57Hq4UkL/JtWjmPVhbIwp9zI8sokp9//xrsenHgcxmATUjKOgiaoSikV1q6qAEKVNVYSxroxEjh2oIZNkCwax4p2cfBehlfMibshMjDFsZrwNf8mpL+LpkrjqgF+ZzVRNpAfl3/v5msVW1Apbg301/D6X7EaQRFIc2ETw0mvAjEspahsU4/0Sy/FUfJRSbOj48MeBPwgWImFyaCIvNE6JQj9qiNG1GSN7T9qt4aay3rNINn4CzupIuCaBdWdZrbT5TA70FElVZkyWdY/wyYesZW4LSF6ntDZr4B2xyJ3Sp X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7dd5b181-0263-4496-5402-08dba3f8aab8 X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2023 16:47:41.7431 (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: TOVGUd4pTUinXgJkTrPziIS6nf9ReGkQLBPp97BqZsp7VdfNUTMuECaWQ8WwCrXx X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6346 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230823_094757_146122_48DC0AA4 X-CRM114-Status: GOOD ( 10.34 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org This brings back the ops->detach_dev() code that commit 1b932ceddd19 ("iommu: Remove detach_dev callbacks") deleted and turns it into an IDENTITY domain. Reviewed-by: Lu Baolu Signed-off-by: Jason Gunthorpe Reviewed-by: Jerry Snitselaar --- drivers/iommu/mtk_iommu.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 640275873a271e..164f9759e1c039 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -777,6 +777,28 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, return ret; } +static int mtk_iommu_identity_attach(struct iommu_domain *identity_domain, + struct device *dev) +{ + struct iommu_domain *domain = iommu_get_domain_for_dev(dev); + struct mtk_iommu_data *data = dev_iommu_priv_get(dev); + + if (domain == identity_domain || !domain) + return 0; + + mtk_iommu_config(data, dev, false, 0); + return 0; +} + +static struct iommu_domain_ops mtk_iommu_identity_ops = { + .attach_dev = mtk_iommu_identity_attach, +}; + +static struct iommu_domain mtk_iommu_identity_domain = { + .type = IOMMU_DOMAIN_IDENTITY, + .ops = &mtk_iommu_identity_ops, +}; + static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t paddr, size_t pgsize, size_t pgcount, int prot, gfp_t gfp, size_t *mapped) @@ -996,6 +1018,7 @@ static void mtk_iommu_get_resv_regions(struct device *dev, } static const struct iommu_ops mtk_iommu_ops = { + .identity_domain = &mtk_iommu_identity_domain, .domain_alloc = mtk_iommu_domain_alloc, .probe_device = mtk_iommu_probe_device, .release_device = mtk_iommu_release_device,