Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4733643pxj; Wed, 12 May 2021 11:59:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwybv6C7GXc40W4DiBrV0I/f4anGRf1x7CM1m9np6+G4xXAW1SnV8uNLMPDgo7KPZUHOk4q X-Received: by 2002:aa7:c2cc:: with SMTP id m12mr45389448edp.1.1620845881951; Wed, 12 May 2021 11:58:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620845881; cv=none; d=google.com; s=arc-20160816; b=Uz00Juzc5hkHIhjgGjqw5Sh+9weNF2V9GrA4Acc+Ix1kYpdrCuxZwP76VxnAWiV/3K dK27WujaOSb1SIU1UB2GTl4N5dYfduI71u4JaCIHzEkW1fa8kkRBEwzmGnYmuUOURVJV D2oG7vKKSiX4b/3XwR39a2rPdw3CfN7IPuSmcrbA3aWgPvehOC2883jMAyJ21EEV8VUS bQYYGYQtWPzaRGxJ6SzK3mcw5Z7ygy24wVQe8FJr8tL+3c0pI8YPv8RDCsNIIcDuPo8E eVyeCpYf4jR5p1JO3UT73t8Ybu7h174bcMI1WcwDgzL+prf8DNoyDmNitQnU2hX/aZBX hboA== 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=54mtqX+tNbBAbaR8E+8PMBPj0MKq3U/1xz3Q52/MKJU=; b=vktvcCnO1bdc7dnhTEmx3zIPEsKcRW/2RT0FDky/ZU/mIMGHyN4ktYEq0nwnz9S6/B +Y+GorCfI+5khOYhK7ykVquQ/8Kghgikn3QNwaR09n8bRUmYsc5UuO3XOwSmV/7ccNIG N+CAdYvbM5thcAqDQ56jMUzWugekSOlRvw43R+56Ba2s/3mJ+FrG/yxkFNX3tPP+upDb bRvMZx6Zl5Zt4qh0P/TgJDmJtBWhAIYdm3xZz6Gq0Yy3gr2xN++3mYVGCb7ck5vcH3Bf /T8DKVDt0C3ZD5nGN7BaUp3Ot5B/yYwwDLGlDXTIcocMGbSqTCbfWzkENrb8Teku9epZ 6S6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="K5xdN/iO"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 hb7si664995ejc.507.2021.05.12.11.57.37; Wed, 12 May 2021 11:58:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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="K5xdN/iO"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1359674AbhELSxv (ORCPT + 99 others); Wed, 12 May 2021 14:53:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:35700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243982AbhELQmV (ORCPT ); Wed, 12 May 2021 12:42:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 464F161CFB; Wed, 12 May 2021 16:09:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835751; bh=9KnNYZwONucYcR4j458Q8cVqt1K5CRmSX9Xa3KQ+CUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K5xdN/iOwAOotiSViz4cgWNumARMH0Yhl73bHjyk08BMizeIgJYEmbr22TykYwJ/b 5x9tZ9bAOLqp1LU5L+igprapGe+Qp6ce54UyY6NGOd+mfBEVCVXC6OZlVNcXJnbrTD SstX0w3Rj2dX5hYG/+nZ2RZj6PdO0Vg8+PH4Ofec= 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.12 470/677] iommu/arm-smmu-v3: add bit field SFM into GERROR_ERR_MASK Date: Wed, 12 May 2021 16:48:36 +0200 Message-Id: <20210512144852.974577489@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) 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 f985817c967a..230b6f6b3901 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 -- 2.30.2