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 C255BC4167B for ; Mon, 27 Nov 2023 16:35: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:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2XACu+oXPPHQNlcrPAJTpMrCqnmZ015UAZcnMHY/TOs=; b=iQ6xfnNTQGySrB aLYbfxHER/T4E3D5nV6Y42kFTDjtNgSB8x6DM3G+lBB6xC8Jo2eu9b33UvIW2UNRPVF+wZCnV0owh OtOWXm1g4VM2weCYcquqdkT1njeOT/I4e2OXZDNvOl9+2SEbDr2rZyvpbtDm6X/QgVLuxoW+8mC7d Z+oaoTHlG7pSMjyyPuQDYyzZ9JF26yDdF6QyFJqnTzHOvSW4VK1rH92lij3xDbDtWJ1oQcw4Z1VOG Vfw13coLRBNhv6G3clb6brlZJeJlUkV3NP/x4pv+xz/xufoZU6eoLEBF+a6RHfZXi/wpZozgrJxr+ hDOq/negRKiprD5JeK2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r7eZx-003198-08; Mon, 27 Nov 2023 16:35:25 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r7eZu-00317q-0a for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2023 16:35:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701102920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=susxgUUvPMFkutjPWBrrSUKtFzx0kXy9jzHUt8UI4Uo=; b=aajbRa9v/KSrRwJuiEAdkrq9KL32eSHZVk6EZ6Itb7cScl/yG2mmc1Cei4MRy9WFyug1FN +GuxB8ClWKLYToJS+zcrPQ2ljVVJfMl2SPAW4e7MgONpofhBww2z6Gs+pwi+t5raY8Exc0 PlbHlfSVA+JfeqPOiQ7vC1tlJHRuB+E= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-668-17ltjOOIOFyiFNj1YNT9rA-1; Mon, 27 Nov 2023 11:35:19 -0500 X-MC-Unique: 17ltjOOIOFyiFNj1YNT9rA-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-67a3b01018fso17631996d6.3 for ; Mon, 27 Nov 2023 08:35:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701102919; x=1701707719; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=susxgUUvPMFkutjPWBrrSUKtFzx0kXy9jzHUt8UI4Uo=; b=ZITjN1hqaI4c3ThedwBPXx4FfLAEQ9BgXeoKFb5LX9fWtOkIFvpNbKjCYeVnuQoMR5 pPEqGMWZuW+9Tk+jPo2KuvQzPyNpW/veBW2eGjfoat2K2xk5oUJ48R09fHRvldHAZbxe RjQ+ZR6qwHBsletmuJdn0jiYThaWgPWVkHhYJFkG3zoMLF8/gnezO3YT4ETKLsz+482l UDOV5spj4KNI+DylCvlpqRMDSxHo37vCXgrOYRzJ+pmh58+pTLv3AxLpb/a/OipASiOE 08hxEZyUM8UwSfAq7opaYUyStgIUd27YrDqu9+9zMhln//gJgiZxW1zcrcc1zXTI7rcU 4I3g== X-Gm-Message-State: AOJu0YyjuXG0MSMT+oIG5GlJafWrnpSe17m/Q9cp4oUESltl98QMFhfO OVSm6ZSzHPMvA73unnIGDd3f6hwOU8BtG1mGUfHMcx8Y6nXm+7vqgzBfnFcilhE6zMsYPq9rJ2d JAnpXVxFw2wHmLJnoXitC0Qnt33EO29vPL/4= X-Received: by 2002:a05:6214:e62:b0:679:e2cb:2a30 with SMTP id jz2-20020a0562140e6200b00679e2cb2a30mr15109474qvb.52.1701102918939; Mon, 27 Nov 2023 08:35:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IHpcUvrZy7MUMrtsmfY5/NY1ufiYrppS50jGz4CSHhJceiWicX5v8fVoCq+ko4cKw0at/Uumw== X-Received: by 2002:a05:6214:e62:b0:679:e2cb:2a30 with SMTP id jz2-20020a0562140e6200b00679e2cb2a30mr15109455qvb.52.1701102918692; Mon, 27 Nov 2023 08:35:18 -0800 (PST) Received: from ?IPV6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id gy4-20020a056214242400b0067a49af5ccfsm830912qvb.119.2023.11.27.08.35.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Nov 2023 08:35:18 -0800 (PST) Message-ID: <08409d7b-369b-4696-97a4-29ce8e1ba549@redhat.com> Date: Mon, 27 Nov 2023 17:35:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 03/19] iommu/arm-smmu-v3: Remove ARM_SMMU_DOMAIN_NESTED To: Jason Gunthorpe , iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Michael Shavit , Nicolin Chen , Shameerali Kolothum Thodi References: <3-v2-de8b10590bf5+400-smmuv3_newapi_p1_jgg@nvidia.com> From: Eric Auger In-Reply-To: <3-v2-de8b10590bf5+400-smmuv3_newapi_p1_jgg@nvidia.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231127_083522_296542_616172A0 X-CRM114-Status: GOOD ( 16.19 ) 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 11/13/23 18:53, 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: Eric Auger Eric > --- > 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, > }; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel