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 CBD69C001DF for ; Fri, 4 Aug 2023 10:47:56 +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:Message-ID:In-Reply-To: Date:From:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=1/wzN4/zOET6hgbP6b2OHaV98YU5N9gg3th1lLj5Gik=; b=W1jRQjvgsYkkAd 86UPxvLz7k2WHB4baQmcfIyyeMg/Vt1hNx2aMHI9+fDYMKU3hHvo6Gqo9LX6GVxQLaVWHLtY7RLc+ 3TnNGsKqZxUB9sc35dPHZFGWC7D3TdDFvsLA6ppLNRaHThzs0dDYatKUFEczt7uqLhXdQ5OfARJLj GG1dvBPNX4aRdc0aDfLVB34f1nllxQ7fBMKKfvMI9lyYnmM4zoGY0wH3/0XiOae0/AXB68Qz7leYw MyP44rRlXaASHGl3I47cGNo/uog026cJWV2mR3aSFAC1moXIebfDoEaPv/vNCOxZJYHB4TqlLiE2X 5aHKjcPNOFX3Dm2RXKEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qRsLD-00CGuT-1Q; Fri, 04 Aug 2023 10:47:31 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qRsL9-00CGt8-35 for linux-arm-kernel@lists.infradead.org; Fri, 04 Aug 2023 10:47:29 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 796B961FA5; Fri, 4 Aug 2023 10:47:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E819C433C7; Fri, 4 Aug 2023 10:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691146046; bh=U3cbAdIj+K+K1m1QVXxZB4fjxjtT0/nTQJZ0g5E+yCc=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=J4Dt8lARMs7/DiJO5lGjkFBy4Lxa6rTWU8d6lk79M7arUDQjzqYp1LC5wkwp6t9Aq pSNBSL9ggnoLofcdluq4Nqshs0QgtA5q0uxlvvYTgOHr42LEED3I3IwwRl6tdUpsD3 kYSbKL+l+qJ0/k5Kd44Ts8sIHhPgk6ANG8lYTkok= Subject: Patch "iommu/arm-smmu-v3: Add explicit feature for nesting" has been added to the 6.4-stable tree To: baolu.lu@linux.intel.com,eahariha@linux.microsoft.com,easwar.hariharan@microsoft.com,gregkh@linuxfoundation.org,iommu@lists.linux.dev,jean-philippe@linaro.org,joro@8bytes.org,kirill.shutemov@linux.intel.com,krckatom@amazon.de,linux-arm-kernel@lists.infradead.org,nicolinc@nvidia.com,robin.murphy@arm.com,u.kleine-koenig@pengutronix.de,vladimir.oltean@nxp.com,will@kernel.org,yangyicong@hisilicon.com Cc: From: Date: Fri, 04 Aug 2023 12:47:13 +0200 In-Reply-To: <20230802172620.1628017-4-eahariha@linux.microsoft.com> Message-ID: <2023080413-reload-valid-a90e@gregkh> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230804_034728_079302_9CE5203F X-CRM114-Status: GOOD ( 15.56 ) 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="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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.4-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue.git= ;a=3Dsummary 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.4 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:27:04 2023 From: Easwar Hariharan Date: Wed, 2 Aug 2023 17:26:19 +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" , "Joe= rg Roedel" , "Lu Baolu" , "Jean-= Philippe Brucker" , "Uwe Kleine-K=F6nig" , "Vladimir Oltean" , "Yic= ong Yang" , "Tomas Krcka" , "= Kirill A. Shutemov" , linux-arm-kernel@lis= ts.infradead.org (moderated list:ARM SMMU DRIVERS), iommu@lists.linux.dev (= open list:IOMMU SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Message-ID: <20230802172620.1628017-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.16= 83731256.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 @@ -3674,6 +3674,10 @@ static int arm_smmu_device_hw_probe(stru = smmu->ias =3D max(smmu->ias, smmu->oas); = + if ((smmu->features & ARM_SMMU_FEAT_TRANS_S1) && + (smmu->features & ARM_SMMU_FEAT_TRANS_S2)) + smmu->features |=3D 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.ker= nel.org are queue-6.4/iommu-arm-smmu-v3-document-nesting-related-errata.patch queue-6.4/iommu-arm-smmu-v3-add-explicit-feature-for-nesting.patch queue-6.4/iommu-arm-smmu-v3-document-mmu-700-erratum-2812531.patch queue-6.4/iommu-arm-smmu-v3-work-around-mmu-600-erratum-1076982.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel