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 X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D241CC2D0A3 for ; Tue, 3 Nov 2020 20:40:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87AE522277 for ; Tue, 3 Nov 2020 20:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436039; bh=K8Qm99nZlFsLcr3tHOpBLRNE8KeIUfRgLcW6fKBPqmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=viWGQKzGibl3ad8Sfw0yQaDg3JCxpoFxkkTrjyuVGDgqjT7K04MrmmAmE+ZhAuZOG uK9R6B04Gx4imasi/QTUwgUAiD8qa10nOPzv1LkOBAhCLloHTeqxol4Doo8R9kdJIX /q5o9zDzKlKqGA3sELI9qKmKVSsL0P8s63Bs6o8E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730240AbgKCUki (ORCPT ); Tue, 3 Nov 2020 15:40:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:51878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729702AbgKCUkc (ORCPT ); Tue, 3 Nov 2020 15:40:32 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5300422226; Tue, 3 Nov 2020 20:40:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436031; bh=K8Qm99nZlFsLcr3tHOpBLRNE8KeIUfRgLcW6fKBPqmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WbHpHmjnM/pdyFXkD5wsN4Ajr3HOQ8G9OpBPwt9iNCFY+TUhP9k8k8MgkCr4kdG3M SQhnDaxfS2eM2KIRtdIMPCFA3EOIafW41RX2+Qf30Z5lkfhxlb0iqwLVHTM2Xb/fmX uWjfcX1HbR+75ntMyFFvhZxdwpzEkXoFv6rvRHCw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guchun Chen , Hawking Zhang , Alex Deucher , Sasha Levin Subject: [PATCH 5.9 074/391] drm/amdgpu: restore ras flags when user resets eeprom(v2) Date: Tue, 3 Nov 2020 21:32:05 +0100 Message-Id: <20201103203352.185549880@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@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: Guchun Chen [ Upstream commit bf0b91b78f002faa1be1902a75eeb0797f9fbcf3 ] RAS flags needs to be cleaned as well when user requires one clean eeprom. v2: RAS flags shall be restored after eeprom reset succeeds. Signed-off-by: Guchun Chen Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 1bedb416eebd0..b4fb5a473df5a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -367,12 +367,19 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f, const char __user * static ssize_t amdgpu_ras_debugfs_eeprom_write(struct file *f, const char __user *buf, size_t size, loff_t *pos) { - struct amdgpu_device *adev = (struct amdgpu_device *)file_inode(f)->i_private; + struct amdgpu_device *adev = + (struct amdgpu_device *)file_inode(f)->i_private; int ret; - ret = amdgpu_ras_eeprom_reset_table(&adev->psp.ras.ras->eeprom_control); + ret = amdgpu_ras_eeprom_reset_table( + &(amdgpu_ras_get_context(adev)->eeprom_control)); - return ret == 1 ? size : -EIO; + if (ret == 1) { + amdgpu_ras_get_context(adev)->flags = RAS_DEFAULT_FLAGS; + return size; + } else { + return -EIO; + } } static const struct file_operations amdgpu_ras_debugfs_ctrl_ops = { -- 2.27.0