From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 830CC1D52B; Mon, 15 Apr 2024 14:41:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713192101; cv=none; b=e/hDsP5Y080jThtwJ+KVj67PtIPueElO6hJ9WAwl9LSMno+EgqJcJFWSQrx1TD12eW6LRq7iXZnsVDMAcferceFpUd5vHOSEIu44MNmBMM12slKgk3SlO6CjLQhSN2Dpksb3aPXPjtd6wFUpyMxCyYwX0y4jHRo59MMsnQIVBIk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713192101; c=relaxed/simple; bh=GuiXkQdJEFkGTpe8Qbdx9j2sPPm6e2iKqDrRPSK2Cg0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e4Ih+U/9j1vUZUtqSAVmm09km0CuCAd+87HWIG/BEiUgckKI7aC6NjujBTE2qmFZ/mxcEriUZ1CBj7VUMpKqJTqWelh5+wpvkBSRUtNziahKzoyLd2iQ3QzFNbvjIvy//4Oe92zKTRiiNwqSnU4dtM2fMZgboRAEbtid/bBNWuY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ViiI8GH7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ViiI8GH7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA919C113CC; Mon, 15 Apr 2024 14:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713192101; bh=GuiXkQdJEFkGTpe8Qbdx9j2sPPm6e2iKqDrRPSK2Cg0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ViiI8GH7LOFNabS0D/k4xD89U34/VYFXmHDOYCaUvKoTf6c7nUy75W0c9FGWhQPET 5VItqnhODR4C0ZHzFMIm97YeRZnmwiYCZtGYluEZK2C3MFySeW4IEGH+7YilOLzRHF hc7FbNoB1t5kgrgJ4BLhrNSwLqdZzZyl9qVY4xGw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lijo Lazar , Alex Deucher , Yang Wang , Hawking Zhang Subject: [PATCH 6.1 67/69] drm/amdgpu: Reset dGPU if suspend got aborted Date: Mon, 15 Apr 2024 16:21:38 +0200 Message-ID: <20240415141948.187647539@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415141946.165870434@linuxfoundation.org> References: <20240415141946.165870434@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lijo Lazar commit 8b2be55f4d6c1099d7f629b0ed7535a5be788c83 upstream. For SOC21 ASICs, there is an issue in re-enabling PM features if a suspend got aborted. In such cases, reset the device during resume phase. This is a workaround till a proper solution is finalized. Signed-off-by: Lijo Lazar Reviewed-by: Alex Deucher Reviewed-by: Yang Wang Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/soc21.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/soc21.c +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c @@ -780,10 +780,35 @@ static int soc21_common_suspend(void *ha return soc21_common_hw_fini(adev); } +static bool soc21_need_reset_on_resume(struct amdgpu_device *adev) +{ + u32 sol_reg1, sol_reg2; + + /* Will reset for the following suspend abort cases. + * 1) Only reset dGPU side. + * 2) S3 suspend got aborted and TOS is active. + */ + if (!(adev->flags & AMD_IS_APU) && adev->in_s3 && + !adev->suspend_complete) { + sol_reg1 = RREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_81); + msleep(100); + sol_reg2 = RREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_81); + + return (sol_reg1 != sol_reg2); + } + + return false; +} + static int soc21_common_resume(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; + if (soc21_need_reset_on_resume(adev)) { + dev_info(adev->dev, "S3 suspend aborted, resetting..."); + soc21_asic_reset(adev); + } + return soc21_common_hw_init(adev); }