From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E6435250 for ; Fri, 4 Aug 2023 11:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 278C5C433CB; Fri, 4 Aug 2023 11:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691148012; bh=LEAeWHG7FLtSlEe2ZwBH/HB+Y3LjqyOo0OkcRCHs4sw=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=leyog2yhGdIhMyX7rgususQx3y2y5OssJAqZw2llaLyyb9kY5zdJ7+N8W5BFmhNgm HbGDWM0AGzMuXDvcSiZl7bYsVoNyw9DuNoy7VvI/gO3YZo9KZ8mr2PI/OB84qLg5Yu Z4m8mTeIlalxmj2IEPIMB+8AzbUi6kDTbTut55Xo= Subject: Patch "iommu/arm-smmu-v3: Add explicit feature for nesting" has been added to the 6.1-stable tree To: baolu.lu@linux.intel.com,eahariha@linux.microsoft.com,easwar.hariharan@microsoft.com,gregkh@linuxfoundation.org,iommu@lists.linux.dev,joro@8bytes.org,linux-arm-kernel@lists.infradead.org,nicolinc@nvidia.com,robin.murphy@arm.com,vladimir.oltean@nxp.com,will@kernel.org,yangyicong@hisilicon.com Cc: From: Date: Fri, 04 Aug 2023 13:19:59 +0200 In-Reply-To: <20230802172100.1599164-4-eahariha@linux.microsoft.com> Message-ID: <2023080459-imprecise-unpicked-2a4c@gregkh> Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore This is a note to let you know that I've just added the patch titled iommu/arm-smmu-v3: Add explicit feature for nesting to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: iommu-arm-smmu-v3-add-explicit-feature-for-nesting.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable-owner@vger.kernel.org Wed Aug 2 19:21:25 2023 From: Easwar Hariharan Date: Wed, 2 Aug 2023 17:20:59 +0000 Subject: iommu/arm-smmu-v3: Add explicit feature for nesting To: stable@vger.kernel.org Cc: easwar.hariharan@microsoft.com, Robin Murphy , Nicolin Chen , Will Deacon , Joerg Roedel , Vladimir Oltean , Yicong Yang , Lu Baolu , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), iommu@lists.linux.dev (open list:IOMMU SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Message-ID: <20230802172100.1599164-4-eahariha@linux.microsoft.com> From: Robin Murphy commit 1d9777b9f3d55b4b6faf186ba4f1d6fb560c0523 upstream In certain cases we may want to refuse to allow nested translation even when both stages are implemented, so let's add an explicit feature for nesting support which we can control in its own right. For now this merely serves as documentation, but it means a nice convenient check will be ready and waiting for the future nesting code. Signed-off-by: Robin Murphy Reviewed-by: Nicolin Chen Link: https://lore.kernel.org/r/136c3f4a3a84cc14a5a1978ace57dfd3ed67b688.1683731256.git.robin.murphy@arm.com Signed-off-by: Will Deacon Signed-off-by: Easwar Hariharan Signed-off-by: Greg Kroah-Hartman --- 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, 5 insertions(+) --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3654,6 +3654,10 @@ static int arm_smmu_device_hw_probe(stru smmu->ias = max(smmu->ias, smmu->oas); + if ((smmu->features & ARM_SMMU_FEAT_TRANS_S1) && + (smmu->features & ARM_SMMU_FEAT_TRANS_S2)) + smmu->features |= ARM_SMMU_FEAT_NESTING; + arm_smmu_device_iidr_probe(smmu); if (arm_smmu_sva_supported(smmu)) --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -645,6 +645,7 @@ struct arm_smmu_device { #define ARM_SMMU_FEAT_BTM (1 << 16) #define ARM_SMMU_FEAT_SVA (1 << 17) #define ARM_SMMU_FEAT_E2H (1 << 18) +#define ARM_SMMU_FEAT_NESTING (1 << 19) u32 features; #define ARM_SMMU_OPT_SKIP_PREFETCH (1 << 0) Patches currently in stable-queue which might be from stable-owner@vger.kernel.org are queue-6.1/iommu-arm-smmu-v3-document-nesting-related-errata.patch queue-6.1/iommu-arm-smmu-v3-add-explicit-feature-for-nesting.patch queue-6.1/iommu-arm-smmu-v3-document-mmu-700-erratum-2812531.patch queue-6.1/iommu-arm-smmu-v3-work-around-mmu-600-erratum-1076982.patch