Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4680767pxj; Wed, 12 May 2021 10:44:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPMbLQhWXXIarcS/F6os+3Ty1C7bkhi6kEiFDjX9xkiLfgZ+8mqeKtyOa/OLaYQ+6oyxYe X-Received: by 2002:a05:6402:268c:: with SMTP id w12mr46480837edd.234.1620841393214; Wed, 12 May 2021 10:43:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620841393; cv=none; d=google.com; s=arc-20160816; b=TC8XNuBcG0tHxq3GIJ3sin28smbFOVvZfX2qhgOcONIL1mmKqArJ8TmF7+XIiOmjZt o8btpAHsNOYUG04ygCToiodLOFnmMbCuSXYOCl+Y7yCOtTZNroStva8JK+hTrGyN1/w4 S9Q9uw4/ZoHlXWen54r6x5GsJhZWdA71wAgxZi4cFgfkLBdWwloHMffOq9OJZQfQE6EZ gldgnAxoDxpzVTNxdXQcrIfYnjVhDERsUgqpbhi0TK0V/b/3/BmJEzI90IYyTWBG58jD ZbmO4zNH8Iu4GYGCal0VrIoYifVAqZ0bIb+0QdTB/C1OInUEx8yZ5kKI59rtqC4DWamf FWJQ== 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=sEs6NZPAMZCcr6nkSJIDqbW409Vks9CHXuZ54ZqyQ3Od1OJyhfJ/S96cUR5kUOrOuA Ursf86aGMZ5I1vsDZUoDF4BL5X3/guAE1y+0x6BUkotUfqYtjcE75TjCV7SPW/PB1LWE l+tHG7KRzslVcR95AYk8KddX29PWp4GLW1rtcOboayROKFwV3yRtwDYMqB8rrSiQS5FV ZBNRtNsofiJ2Nj49ktl8jTjCx0QmqJbx+hBIDU/WEntfYIv2Y/A1VW+8CA8lagKDkBDS ODY99P7p4JWSqAG4LxYNT1QKaTUTE8gQxJvBgxP8Cs0EhGHSNsp25tMhZSnnpcYObkzV kmIw== 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 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 y13si360623edc.322.2021.05.12.10.42.44; Wed, 12 May 2021 10:43:13 -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=gr96cgzI; 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 S236730AbhELRks (ORCPT + 99 others); Wed, 12 May 2021 13:40:48 -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 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 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 -- 2.30.2