From mboxrd@z Thu Jan 1 00:00:00 1970 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 AF7A6C4332F for ; Tue, 14 Nov 2023 15:18:44 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=txHW+VjdvFoGlhEBRoLSvlxpx7yUqWblwL329jP3LwE=; b=3tlBJkDxTKA1ZU Wp/MDpC4ATrWsxM4UK68FUom5ngD/uBwXZPSMkrv2+0/vjnIOVfpAIggGiET/PzQjtbyfocVhSe7v MN/Tgo8WFSoEA7cA/0NJxDQqcHluOJg6qdKqprtCyP6DnUMZutBmbWPa16i526jc0EuIu87PfGDv2 uXT72j4aySly5j58Byjk6P2XTk83/e4l7gY6E+/Ci60mGT09CA0BqgP0Ny0PsNgePs4lDW92F86o/ BfcGxF+Q3XaMqvERjMa+q5l1ypJ1pwssTDL5Y+WiFztY+geNDH9ufz4ZS21BOGAwG8O05K4zoVGib b327dkOjBdG9T1E7RDpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r2vBA-00GHy5-30; Tue, 14 Nov 2023 15:18:16 +0000 Received: from mail-oa1-f51.google.com ([209.85.160.51]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r2vB7-00GHwr-17 for linux-arm-kernel@lists.infradead.org; Tue, 14 Nov 2023 15:18:14 +0000 Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-1e9c42fc0c9so2771087fac.1 for ; Tue, 14 Nov 2023 07:18:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699975089; x=1700579889; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0CiYZOT0ewHfs0j150rypc6HVEddSdF4ZubZ8pkDprA=; b=Pm13gWoZxKgdihX4cyWfB4Ohr6hzXQ0H45HWot5C4o8sbIJwbw1z+n49XB2n3JTa+Q 1xTIGisLlhIPdiGGFwXxog8Fp4ytmoBsbBrhfe43WxVxj8k5kxQQT7RCPc2s7O38uGlQ k/Sno0PnXgL+G0RCp57mVg/mQCghEAQhYGTimciSn1Ze3uDqkGTR5NbowLq3DuF3oTy9 UdECV7XchSzYqYwHMI0L3yVYAe1FTRZAVNNFcCPplpKZn0AmVBS5+qANi5Q6EWDKYzej ICUMfbjNPGWCqjC1g192bKa1b0ogSDJqrioLaj7pw32hxgSNo5vVw403wp+QCgwA9DpS OeKA== X-Gm-Message-State: AOJu0Yz8PHU19OpUa/8/g/N8P5dJld2aQOgMxH06GYZmoZIKk2dNmw6p lcRjP8MlK2hiU4CIZXVxQ5c= X-Google-Smtp-Source: AGHT+IHFChdzmpFe6VrlAomWf//2t/+49QDYQP/zsLXbPO7/+vSLDdE2t38ElmuFVV6WFtvw6v2oKg== X-Received: by 2002:a05:6870:3293:b0:1e9:b29b:b145 with SMTP id q19-20020a056870329300b001e9b29bb145mr10335803oac.7.1699975088839; Tue, 14 Nov 2023 07:18:08 -0800 (PST) Received: from localhost ([12.186.190.1]) by smtp.gmail.com with ESMTPSA id h17-20020ac85491000000b00419ab6ffedasm2805617qtq.29.2023.11.14.07.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 07:18:08 -0800 (PST) Date: Tue, 14 Nov 2023 07:18:06 -0800 From: Moritz Fischer To: Jason Gunthorpe Cc: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon , Michael Shavit , Nicolin Chen , Shameerali Kolothum Thodi Subject: Re: [PATCH v2 03/19] iommu/arm-smmu-v3: Remove ARM_SMMU_DOMAIN_NESTED Message-ID: References: <0-v2-de8b10590bf5+400-smmuv3_newapi_p1_jgg@nvidia.com> <3-v2-de8b10590bf5+400-smmuv3_newapi_p1_jgg@nvidia.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <3-v2-de8b10590bf5+400-smmuv3_newapi_p1_jgg@nvidia.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231114_071813_383983_D963DE7C X-CRM114-Status: GOOD ( 18.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Nov 13, 2023 at 01:53:10PM -0400, Jason Gunthorpe wrote: > 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 Reviewed-by: Moritz Fischer > --- > 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(-) > > 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, > }; > > -- > 2.42.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel