Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp836983rwb; Mon, 26 Sep 2022 06:31:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM53fiTs+/vptcrhlQZqGIAF6/iaGNrOYBkr4jLnliBY/PUpkyKOuV2AhSc05vrTVk6qeltz X-Received: by 2002:a05:6402:90e:b0:443:ec4b:2b03 with SMTP id g14-20020a056402090e00b00443ec4b2b03mr22077747edz.71.1664199101398; Mon, 26 Sep 2022 06:31:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664199101; cv=none; d=google.com; s=arc-20160816; b=Jhe0DJFz2bzQWOklkxt++6TrlnYA86/B2sWhyzaREfAKzFEvliUwXNriqs3ttCrPC3 MUkqWEZ7OA4yqNohbEaQ848ea28GbTZl8vPsUj0l5uSVrS002UhefV+JkpbzgDw0wEGY vf/YS38deZ6C7mWUzWAekpdRJ//NYuLlQg+ir1z+H28V1upUj3WW+5p10KFijnAfhhYR vXjZBI80Rh5zumxowNCjC8DIMWyDKt7L/gq0gxrdxLwuLICVm7zA2vSHamJz0m578Kw3 24seDmSxVsDVnHp5Yhr5L1Tfw8OpqhEMk6BwSweNjMsbUc1jwZ7JwenGG5nZQvxgDjsm joug== 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=Le7avlohuuTNO//cybFUe6bhpvIgg2kvMTK2DryGTJ4=; b=OFgvt1HMc4a46+h8XnzQVXJUPPAHxcx7H7p3A1mR0uujpg8c+cqsp8ct64isFw/2Ov hlLhDO0ZCDkNrIQic9zwNt7yERXfx/+n5n2TxFQ/0837KtGxJjpj1yjnGuB3VpezCKZT Z/aUXBLTfG/A4mh4vsuGvNhrUzDluztn0z0KXqfpi7TFG+lPj4rS0I6D+cNFhy2hc5kz 45o1N1syVeuzVRIM5/mc6si8fx2rUd7wUtcA/uYs47j+QnrXJL1zWi4yP4M1ajkk9UUc pwlRChooQ9qglgiN4O8Hmzb01RmEM5uuxPaJqbgWwaHwZfKBOx2r8tsHVW3a6xtgxmxd SNtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lUFgjLXT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wt1-20020a170906ee8100b0073d866e5d4dsi18311611ejb.98.2022.09.26.06.31.11; Mon, 26 Sep 2022 06:31:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lUFgjLXT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S235255AbiIZMXy (ORCPT + 99 others); Mon, 26 Sep 2022 08:23:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235428AbiIZMXY (ORCPT ); Mon, 26 Sep 2022 08:23:24 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F160E726A9; Mon, 26 Sep 2022 04:05:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 2EF44CE1119; Mon, 26 Sep 2022 10:50:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4831CC433C1; Mon, 26 Sep 2022 10:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664189413; bh=ON79Ezb0W4s0GNf/NoqKu+FimfoSIUQjcZclqHc3mXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lUFgjLXT/BCIzWCh/YyBnOunHKxYhw5alYQyaW/UGwg76Z3WI3D58Dxeomgo6bHpR sVMk5DgIr977na1NHhcGFh0O/GvJrLOBSS6npn/FK8/yozf+Voewg97RCTGXu+opnQ ytAjQDaznUqPKDJSmCDO5rBssnkvFTOg+xvquN2c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Candice Li , Hawking Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 5.19 180/207] drm/amdgpu: Skip reset error status for psp v13_0_0 Date: Mon, 26 Sep 2022 12:12:49 +0200 Message-Id: <20220926100814.672275789@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100806.522017616@linuxfoundation.org> References: <20220926100806.522017616@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Candice Li [ Upstream commit 86875d558b91cb46f43be112799c06ecce60ec1e ] No need to reset error status since only umc ras supported on psp v13_0_0. Signed-off-by: Candice Li Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index dac202ae864d..9193ca5d6fe7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1805,7 +1805,8 @@ static void amdgpu_ras_log_on_err_counter(struct amdgpu_device *adev) amdgpu_ras_query_error_status(adev, &info); if (adev->ip_versions[MP0_HWIP][0] != IP_VERSION(11, 0, 2) && - adev->ip_versions[MP0_HWIP][0] != IP_VERSION(11, 0, 4)) { + adev->ip_versions[MP0_HWIP][0] != IP_VERSION(11, 0, 4) && + adev->ip_versions[MP0_HWIP][0] != IP_VERSION(13, 0, 0)) { if (amdgpu_ras_reset_error_status(adev, info.head.block)) dev_warn(adev->dev, "Failed to reset error counter and error status"); } -- 2.35.1