From patchwork Wed May 12 14:48:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 435605 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5035545jao; Wed, 12 May 2021 10:31:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygZXiirXDjnK0npeUrF/N73k5RLP2Ud3qdgpATJKDDpxZ5KFLpVjYImjzSLiRB65AYi8j/ X-Received: by 2002:a05:6e02:1d9e:: with SMTP id h30mr30953564ila.214.1620840665919; Wed, 12 May 2021 10:31:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620840665; cv=none; d=google.com; s=arc-20160816; b=ZGwqncK9XYbAZDtQ7NKPshwYz+pRpUicMaAVhTcuuFEjtSfFXMJkT0xy3HZM1PHLQ3 JCRzF/EdHoV1/0RRFGGNbdoQOfJLOpMaXMyZntyO/J9Sf86gzvbYyxdfOq53dqHIgvUi tvsID2msy3EtfNdl0j/RL9QXYXDIQ11prwZL7RsF8q6AusP/jxSpKAlRK54Wf1mNKlt5 +2dnETYGxnK1nPqvoZBSil8NSlG1YLyEPYSFMbVWX0XwOODQ13ZoJq7yTmqkUEftC0DN Ha6mfZWdaSBDbglF0iCgI+kwv1qD63avJ0DO7ER0ZgEoYaMRblKqRuQVBRGYsY3bolbN z4Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8O9zZE8b3xmBR0Z1/YSBuUG6p5LKON+rhZ006cmgbH0=; b=nag7Xp9kHpLM5n/7Pim5mGF651D0/f/pqc2xR2gUlVJSw8qkhreTsFNbq245R1L5Po B8KkfPjzeSDT03v9JPYP9/E1kfU2uU8VZm1sQPoSmTS58I9dkQzeExeLUQh2jwzXXtCo imMpYxuPQoM+S/nRtq5kem0yzzaMLOgvQPEOAw1UvJmpaYYB5c6cuecEq7QvjqD8A0OR RKhk0t8PJamixzB5ez8yxpyNbyHRvaij3MIPOIyf/dbNh+teIPyPREhEXs73mOBEIy4S LnNR6vBc5eP82m2Qqg1Qniqg61wqfMhI71M+qIxlLLDfqhqvbkZSpMGUVcpTSEB6MwWH JRTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gr96cgzI; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q8si330223ior.12.2021.05.12.10.31.05; Wed, 12 May 2021 10:31:05 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gr96cgzI; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239204AbhELQUN (ORCPT + 12 others); Wed, 12 May 2021 12:20:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:49188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235733AbhELQOZ (ORCPT ); Wed, 12 May 2021 12:14:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB0826134F; Wed, 12 May 2021 15:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834122; bh=4qNypdK8nMY4Zsqcd7e8B+90UExoKbmN3+HzmkxVTKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gr96cgzIu8jlxsWk3h9rluBXKnNfmMExgWaIDia8tnlM5KLZNfVkEsgcHxe5qC1S6 TblsiSvOOX9m/ALIWjmSA+jIRz99kDp79x7RdRqI3s5NMQvmsybXpGtCdgj4+VsdGO z5dEccSlsAlnsU9flR1A8JdgZsl3J1mW4dsVk4Ag= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rui Zhu , Zhen Lei , Will Deacon , Sasha Levin Subject: [PATCH 5.11 417/601] iommu/arm-smmu-v3: add bit field SFM into GERROR_ERR_MASK Date: Wed, 12 May 2021 16:48:14 +0200 Message-Id: <20210512144841.565308269@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit 655c447c97d7fe462e6cd9e15809037be028bc70 ] In arm_smmu_gerror_handler(), the value of the SMMU_GERROR register is filtered by GERROR_ERR_MASK. However, the GERROR_ERR_MASK does not contain the SFM bit. As a result, the subsequent error processing is not performed when only the SFM error occurs. Fixes: 48ec83bcbcf5 ("iommu/arm-smmu: Add initial driver support for ARM SMMUv3 devices") Reported-by: Rui Zhu Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210324081603.1074-1-thunder.leizhen@huawei.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 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 96c2e9565e00..190f723a5bcd 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -115,7 +115,7 @@ #define GERROR_PRIQ_ABT_ERR (1 << 3) #define GERROR_EVTQ_ABT_ERR (1 << 2) #define GERROR_CMDQ_ERR (1 << 0) -#define GERROR_ERR_MASK 0xfd +#define GERROR_ERR_MASK 0x1fd #define ARM_SMMU_GERRORN 0x64