Message ID | 3-v1-e289ca9121be+2be-smmuv3_newapi_p1_jgg@nvidia.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> 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 7937CCD98D9 for <linux-arm-kernel@archiver.kernel.org>; Wed, 11 Oct 2023 00:34:54 +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=dsiph/aJeq6USTyXuU4Ks1Lbwr4UdNsi55uVT4RMZbc=; b=KPL1eoBZ+m0p4L uMo9qNEb8ljCYMTAhkbiorfj/QNr9dxU9QIfd1qerGBL+dnq/5JLuvsjn8LdVz+hD+lmLoOXdB69j 4B9F5obkZY0VblZnU/P2FIsrxavnuH6axA8EBPuPyGqeghnY/4evCEwmGECz/bkVSI5PF3JyzEH8n +mgDYCXv7yBsOiMG+Qg1L+JUjolPhg5Y/+mdpfUfgxPo4YwsBk+1BvyUR+hLSPQ1GRIsux0fvetVZ 8x64kRFqZkWQLoaNVt15JObQfMpjldQlkgVF8y27qxKQZuog/heoIcOS7uANnNEIXeU/UGre1f+69 o1iWniqd2rDeQ7z8mM2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqNB4-00ERUR-0A; Wed, 11 Oct 2023 00:34:18 +0000 Received: from mail-dm6nam04on20617.outbound.protection.outlook.com ([2a01:111:f400:7e8b::617] helo=NAM04-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqNAi-00ER8o-2S for linux-arm-kernel@lists.infradead.org; Wed, 11 Oct 2023 00:33:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=islR07DKAc8dfe7nG/WwDm6H6EGPMgJUGzrOdDM3WeFV8ME0KuIc4iyzFWeUE4u6+h0EnFZOa8ZKKBE1xCcsm8b84KwicA+UN157LGjwFhylN2qUdEB8Joz3y/49571gN/uG8qzopGVcbb5wptABtf49qKLtCMyQtLnpDcwOWiaxw+15UWPUK7v2K9szln0bxWZRGGOFzLfr9w+0bflUWoHcPYRerTwwijEt1EHe+OmX94zTl499/XqgJhG21PUoUAh8JbZ5H2hd8pflGvNm3vYZAbLSwEAWjsvtGf/Fgy6dIUbIIRIHFIzHANRklNnTVJOih1ML5pfq6Kl8e6uvOQ== 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=+jfjLgiQddbkGMxPnFEHgFgTjad/UVbGA26QDxIp3W8=; b=eMg8JC/Fs19RdcU7Z0sagrcY+gyw4F38kduzejc7hOQ1HKTOFfr+ubW1HEgDHamFa1YbqIUmDoG+3QQHjyDszNoOkk68iEnVrjMI0UFvDzIKZog+mcA0obRY/QkvFzPJFs9TAoz/6/oBIuZoik76U5arZ/JHneX98579LxLFO/5B/1o2nEgsMHffxfnjF9Rg4JQZx6H39NcSV1gUP5bLbsK06NLVduaEfywRbu1FkviKGBTDlDJ/S1S2dP1AUz8J0KXlcsjkXc46SZ0w/XLl1los+UY3/TdhEpJFtBt2ODoFs1qeSTXmiaPkYcaLK4o3sKR0pKXsEwHp2H0wLOT4xQ== 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=+jfjLgiQddbkGMxPnFEHgFgTjad/UVbGA26QDxIp3W8=; b=Zc5FiWesiejL9kLhvFESDarX2gGee+wSN7UWISSQQ8SzPqANkajWWqxWgY4R1Ge6R1UZ3bwzstZBhXPqx/0pgquK/LN6s1ddsAILhX8FVglhyXwcjqRSEJ3SbLEAhgWNGe6Ny/Z2m/XE91iOzOSHgqHPIGUyYxXtONnB2bZPpAGoRaFOBdfaUe24i3yBXJYr7zsZCds8JY3Ia15fx9XNn9rUwcaWXpOLyZ5aa+6OKAxYOVvGahRLYi4RC97vfiCrMJBeQXKUCfzJxMABhUYa9h4Zc1dJRnQMOWOrZzplvTkDV2usWcDq/0ULqRFqUILsysSDy/L6ExICZehg70i8xA== 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 IA1PR12MB6625.namprd12.prod.outlook.com (2603:10b6:208:3a3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.42; Wed, 11 Oct 2023 00:33:32 +0000 Received: from LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::3f66:c2b6:59eb:78c2]) by LV2PR12MB5869.namprd12.prod.outlook.com ([fe80::3f66:c2b6:59eb:78c2%6]) with mapi id 15.20.6863.032; Wed, 11 Oct 2023 00:33:32 +0000 From: Jason Gunthorpe <jgg@nvidia.com> To: iommu@lists.linux.dev, Joerg Roedel <joro@8bytes.org>, linux-arm-kernel@lists.infradead.org, Robin Murphy <robin.murphy@arm.com>, Will Deacon <will@kernel.org> Cc: Michael Shavit <mshavit@google.com>, Nicolin Chen <nicolinc@nvidia.com> Subject: [PATCH 03/19] iommu/arm-smmu-v3: Remove ARM_SMMU_DOMAIN_NESTED Date: Tue, 10 Oct 2023 21:33:09 -0300 Message-ID: <3-v1-e289ca9121be+2be-smmuv3_newapi_p1_jgg@nvidia.com> In-Reply-To: <0-v1-e289ca9121be+2be-smmuv3_newapi_p1_jgg@nvidia.com> References: X-ClientProxiedBy: BL1PR13CA0413.namprd13.prod.outlook.com (2603:10b6:208:2c2::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_|IA1PR12MB6625:EE_ X-MS-Office365-Filtering-Correlation-Id: e1226df5-241c-4010-d1f4-08dbc9f1b01e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L/rxMpah8KWY8ME6+G66r3TZxtJlyGxGVJLmsA1x/akuhqOe/MA76VwR8bhv8TXyT8MDV9I/D9EeNeKiu1hvNVMU/xQG3O9v3kwCCu3CMMaRqkJVVRGJuHoPBhuY01/2PP8p6BuzkDc6BV+MpFucIBWkz20XZtu4zwj+pBLp8bqAUFn4oJ2uUG6HDqrzzu56f8lrcOvgPZscWrBr3b0r9KJJMCNKqGxSeTwtN1CmmxWfME0pVhLyPTnRXfpNaLa+KJ5FTqi06Jv8sR9AUNlvfZ3MOvGWljNQyTvu+2H0SkBplrOmYg9N4rWV+HU4LnbDPP5+Wk2WyXpX/pKVRNdmhtKBV/TI06PAnjUZxtafGkeu8dkqG1ojijKfwep++o6DTSVEX3jYs8cKDK2+AEQhKdO46Dubik2oxsE+f3HbQqrMeXl63uOcdT4hxK01SVk985NfA8AVjL74Q+2VRY3yohuCUCjBjwKps86S1/G1vejmvv8UX0hjXGEJZAm8AVeKroOd4jgyas2lPvh+UPi0HNp4VusbBOKwuVC18jGuxgmk8lLD5Sf8RMfpkGdKJLVV8yXeDEoao/CgyqpN5WtL+zHjrzrAybFx4lUE8va0v8k= 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)(396003)(366004)(376002)(346002)(39860400002)(136003)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(107886003)(6512007)(36756003)(38100700002)(86362001)(26005)(83380400001)(2906002)(6666004)(2616005)(6506007)(478600001)(6486002)(8936002)(8676002)(4326008)(316002)(41300700001)(110136005)(66946007)(66556008)(66476007)(54906003)(5660300002)(4216001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KYkowyP/KLGQJxLM3i78dxk4VMe2lQWVAUvnIp6PyjaYU6jPj7g0Cwz/BDUl0wqWfuRBUr3aXLnu+ryVD0YnP7jQ8z1bV0t5jhm6FC+3JszoXx5csTCe81rvJGVK84u7j+HxOmtclDmd8DGi15jJudBNu17UNM7vCML2mFCYLiOoRpJnvmrBc8/4lPdNVA5Qa3qobXoXPJEs7xJdzeVP7fehKpQ4jYqHK3rEUfE3qVvhsy5JSbOnpBoGrOo6ICpVvQoByNWhQjeYFEJPdpyGGteC81aPyrJguxe57Xu4brbxQYhro3FTkx8cRiBjGP0Bxp+Iwle3iIW1SoS1s4weKxtTLmFE25Nvql/j0ixkSnqaBzkXvZsG6rE/OIkiSSVOW4q0Sf0A3hwchkPhtZgVJQcjsIcnsH18ZVMkyE92G9EYQnHJWAij4PxMkZ/7YwqLVZ45nAlkXnehRr2t3voEC4qKTyd3BZrWsQ16tmBc+AhFlx4ripK78Dtd9gaobXNRtKAMTqCcBtAW8yujFBmM/2jnOx/QFLYGUc25bUh+gKdexKulV1bxyWH8k7wVUhduOVC4WrT3dfrK97UbKwJuPapwgXPWTQqpU9+Cc/gwjhZ8T5pDqwH/PQF13dqV+QefIEMKh6QvFiCKltIz9jxwf9EloeIKAAa8HFTGkdHHEvR2a7rlQJs1iddTcDFYg67wEznuF8byD68yrxIEH3xJNXnv19G4i3je7M/s4+Pg/V+2UKg53cmyYLLGu4KXYgLqGmNIt7wgPHFBSYRpoBJInDCeoVYZ4WzQS3xXCma/2YZSTpixft3YiT1qeldPrCg2SdbL1cchS9ju7pJHE5f5nVIhKVY1oj8HrX5FNDIBPE5fVI9BNs8fR9wwtXuBx9alDZCuQBN84RkNCF6Q4e8+U0ceFBj6CooCJwG7d6UzbRTSV3ahyh5qSdA+rVT4vxArOE66N+1GrKFY5VZ1hOAs2zBiSUWE92Yu0MQJr8o9WGcrtUtVWJ2rmW2KchYsL2nzEMVSGKesTQ7IDHH9oqGHs8HFDOhRyKEmTFF7isnzLLh8CUPNJefHOxVtCCNVQhbC+noW6ZviBCngG7mWEcrpA+zX8sbECbVhnbWpjWZFPpvamMrXa12g5cqkkkYoMap+51UzjHKKbSXITuZic9M+cOCVrMOiiWrUt33GIuhC3KIfOmQYoIh+ZoRWuWXERZO9PH1icPY1S5q2KT+xk0fDT/IuC9eoF9QS+kvD0US4QiIBSWnCkcxOJ8tGd8OWAPlQulewYj0z45/Uk+ECOzHEZz39vUts2qggb54fa5MwjVVSanaydmrn/WIWxbcQvNKaUjcQ73Z4sA8LHDrrVg9kvecgnvceWsqTNvckxYP7SGTLNIaDJ9dlWgLskMCZ8Opy8EkpCxomkU9TlurqowzBwMZifkx67tQraySDCi0sXwyEjLM74DkAtFWWmfK9qxCPMPxx39vQFyKzQVwaoBR+0Y0azOXdElJZinjf/owEMuUvEHiUlMl/lksoV9hK6Vl0tg18zVKolJvXgSgwJ0rEPvuZXKDtGmr8MkiNXWH64VQImnNRIZBy++52b9+pP4Xr X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1226df5-241c-4010-d1f4-08dbc9f1b01e X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 00:33:28.3068 (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: l2VF3seq/G7td0PT2sYN5NkD0rmNisY8TLFD/rXPwbtHGZcBDl4g+0yxxc8Dmt2n X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6625 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231010_173356_826112_74CEB64D X-CRM114-Status: GOOD ( 10.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
Update SMMUv3 to the modern iommu API (part 1/2)
|
expand
|
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 9117e769a965e1..bf7218adbc2822 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1286,7 +1286,6 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, cd_table = &master->cd_table; break; case ARM_SMMU_DOMAIN_S2: - case ARM_SMMU_DOMAIN_NESTED: s2_cfg = &smmu_domain->s2_cfg; break; default: @@ -2167,7 +2166,6 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain) fmt = ARM_64_LPAE_S1; finalise_stage_fn = arm_smmu_domain_finalise_s1; break; - case ARM_SMMU_DOMAIN_NESTED: case ARM_SMMU_DOMAIN_S2: ias = smmu->ias; oas = smmu->oas; @@ -2735,7 +2733,7 @@ static int arm_smmu_enable_nesting(struct iommu_domain *domain) if (smmu_domain->smmu) ret = -EPERM; else - smmu_domain->stage = ARM_SMMU_DOMAIN_NESTED; + smmu_domain->stage = ARM_SMMU_DOMAIN_S2; mutex_unlock(&smmu_domain->init_mutex); return ret; diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index 03f9e526cbd92f..27ddf1acd12cea 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -715,7 +715,6 @@ struct arm_smmu_master { enum arm_smmu_domain_stage { ARM_SMMU_DOMAIN_S1 = 0, ARM_SMMU_DOMAIN_S2, - ARM_SMMU_DOMAIN_NESTED, ARM_SMMU_DOMAIN_BYPASS, };
Currently this is exactly the same as ARM_SMMU_DOMAIN_S2, so just remove it. The ongoing work to add nesting support through iommufd will do something a little different. Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 +--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)