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=-6.3 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 ED692C388F9 for ; Tue, 27 Oct 2020 11:34:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 57BD122263 for ; Tue, 27 Oct 2020 11:34:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H/IBpGkb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57BD122263 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A69186EB41; Tue, 27 Oct 2020 11:34:24 +0000 (UTC) Received: from mail-yb1-xb42.google.com (mail-yb1-xb42.google.com [IPv6:2607:f8b0:4864:20::b42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DDB26EB41 for ; Tue, 27 Oct 2020 11:34:23 +0000 (UTC) Received: by mail-yb1-xb42.google.com with SMTP id a4so924121ybq.13 for ; Tue, 27 Oct 2020 04:34:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=04jTmiYK9Y2F1PIfSpkLe78ZG108YjMPNtcQqDWwOl0=; b=H/IBpGkbaHko1ffBnF7N3SZq3+Ta9YUppbBypqzIl1+Mmv6Q4eG41Hnio65W/aZjGp Z6qGH2EOQT0ziy08pE72xt5+J/4cs7oV3xyhX0Xw8ipuhujyTZneRMaew1MY7G/VCyTq 7iow6vT+n1CJmFGNU9nv65UqUz8tFMK1SmlVrPfEV3D9BkKSfnXZnXaNFJvMWRfPXYqW VMkSw8HvdDU1FYzTJ2vuIiXKlUJSmohPIUikHN4Jo2V10cd+eKVlHnQFD3F2QLxuSJEl 1V8VVxh70IRslbuUyLoLx0uUlOk+iyGpmQS/rkg7fTN8luoG0k2WrpnBtW9d2UwyOlym w/6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=04jTmiYK9Y2F1PIfSpkLe78ZG108YjMPNtcQqDWwOl0=; b=mXwNQaEA0YGym3WqtOb3qp4ypRa1RmnfgrVyAb1LCPyS7FGbLf9fkFH+BTJjxn8kQ5 4/nydiH46cwOdzglxXhtMkWJfDa68VZmrja+rpPti66yafx9+Ltbynv3UUPVYb9QXQ9s TxNQuF5XmWcMpXk80UhJ4KEWT2xB7F7ZFeEUHs+b7J8uIpIQcXaeS4vZWLJbcVCfGSrZ dSr7R6i15maYryhtdcr2XVDIwpWJCeRBxXr2uqECfCKCpu0pSZYuXwS3zEGyMvnioYdD tIDS5XhaCHuuQ0+WJwZSZ1k2h19BUTYAZQ3VN2+nea8RJ02j16buqVZo+tVFKWIjAK25 Hs1w== X-Gm-Message-State: AOAM533gNrkEfMk6QbPwPaNM2NkRlhDScmPBvSIQ+kWFdgd6OJMn8DvE Uw7S6QwpFkwCbgjC0zmR3RNLX+a/dgrrtCg67KsRJDL0J4E= X-Google-Smtp-Source: ABdhPJxe5eoBbSkeaRZzlXqHxkUW5rZCtBmpuW8tAb7yezamt4uIgDkMIL1YKbnlG4WBKnHkFw/VjVlw7Kndjzrd/fI= X-Received: by 2002:a25:2389:: with SMTP id j131mr2346831ybj.25.1603798462217; Tue, 27 Oct 2020 04:34:22 -0700 (PDT) MIME-Version: 1.0 References: <20201027024025.32269-1-evan.quan@amd.com> In-Reply-To: From: Sandeep Date: Tue, 27 Oct 2020 17:04:11 +0530 Message-ID: Subject: Re: [PATCH 1/2] drm/amd/pm: enable baco reset for Hawaii To: Evan Quan X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Deucher, Alexander" , amd-gfx@lists.freedesktop.org Content-Type: multipart/mixed; boundary="===============1481027293==" Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" --===============1481027293== Content-Type: multipart/alternative; boundary="000000000000a1c2da05b2a56d74" --000000000000a1c2da05b2a56d74 Content-Type: text/plain; charset="UTF-8" On Tue, 27 Oct, 2020, 17:01 Sandeep, wrote: > > On Tue, 27 Oct, 2020, 08:10 Evan Quan, wrote: > >> Which can be used for S4(hibernation) support. >> >> Change-Id: I6e4962c120a3baed14cea04ed1742ff11a273d34 >> Signed-off-by: Evan Quan >> --- >> drivers/gpu/drm/amd/amdgpu/cik.c | 4 +++- >> drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++--- >> 2 files changed, 7 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c >> b/drivers/gpu/drm/amd/amdgpu/cik.c >> index 03ff8bd1fee8..5442df094102 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/cik.c >> +++ b/drivers/gpu/drm/amd/amdgpu/cik.c >> @@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev) >> >> switch (adev->asic_type) { >> case CHIP_BONAIRE: >> - case CHIP_HAWAII: >> /* disable baco reset until it works */ >> /* smu7_asic_get_baco_capability(adev, &baco_reset); */ >> baco_reset = false; >> break; >> + case CHIP_HAWAII: >> + baco_reset = cik_asic_supports_baco(adev); >> + break; >> default: >> baco_reset = false; >> break; >> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c >> b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c >> index 3be40114e63d..45f608838f6e 100644 >> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c >> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c >> @@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = >> { CMD_READMODIFYWRITE, mmBACO_CNTL, >> BACO_CNTL__BACO_BCLK_OFF_MASK, BACO_CNTL__BACO_BCLK_OFF__SHIFT, >> 0, 0x00 }, >> { CMD_READMODIFYWRITE, mmBACO_CNTL, >> BACO_CNTL__BACO_POWER_OFF_MASK, BACO_CNTL__BACO_POWER_OFF__SHIFT, >> 0, 0x00 }, >> { CMD_DELAY_MS, 0, 0, 0, 20, 0 }, >> - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, >> 0xffffffff, 0x20 }, >> + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, >> 0xffffffff, 0x200 }, >> { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ISO_DIS_MASK, >> BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 }, >> - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c }, >> + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c00 >> }, >> { CMD_READMODIFYWRITE, mmBACO_CNTL, >> BACO_CNTL__BACO_ANA_ISO_DIS_MASK, BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0, >> 0x01 }, >> { CMD_READMODIFYWRITE, mmBACO_CNTL, >> BACO_CNTL__BACO_RESET_EN_MASK, BACO_CNTL__BACO_RESET_EN__SHIFT, 0, 0x00 }, >> - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, >> 0, 5, 0x10 }, >> + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, >> 0, 5, 0x100 }, >> { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_EN_MASK, >> BACO_CNTL__BACO_EN__SHIFT, 0, 0x00 }, >> { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_MODE_MASK, 0, >> 0xffffffff, 0x00 } >> }; >> @@ -155,6 +155,7 @@ static const struct baco_cmd_entry exit_baco_tbl[] = >> static const struct baco_cmd_entry clean_baco_tbl[] = >> { >> { CMD_WRITE, mmBIOS_SCRATCH_6, 0, 0, 0, 0 }, >> + { CMD_WRITE, mmBIOS_SCRATCH_7, 0, 0, 0, 0 }, >> { CMD_WRITE, mmCP_PFP_UCODE_ADDR, 0, 0, 0, 0 } >> }; >> >> -- >> 2.29.0 >> > > > Not sure why I'm cc'd on this, I'm not a maintainer, nor does this patch > seem related to any patches I've contributed. > > - Sandeep > Ok, I just saw the other email. I'll try testing the patch and see if it fixes the hibernation bug. - Sandeep > --000000000000a1c2da05b2a56d74 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, 27 Oct, 2020, 17:01 Sandeep, <sandy.8925@gmail.com> wrote:

On Tue, 27 Oct, 2020, = 08:10 Evan Quan, <evan.quan@amd.com> wrote:
Which can be used for S4(hibernation) support.

Change-Id: I6e4962c120a3baed14cea04ed1742ff11a273d34
Signed-off-by: Evan Quan <evan.quan@amd.com>
---
=C2=A0drivers/gpu/drm/amd/amdgpu/cik.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0| 4 +++-
=C2=A0drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++---
=C2=A02 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/= cik.c
index 03ff8bd1fee8..5442df094102 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 switch (adev->asic_type) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 case CHIP_BONAIRE:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0case CHIP_HAWAII:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* disable baco res= et until it works */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* smu7_asic_get_ba= co_capability(adev, &baco_reset); */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 baco_reset =3D fals= e;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0case CHIP_HAWAII:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0baco_reset =3D cik_= asic_supports_baco(adev);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 default:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 baco_reset =3D fals= e;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break;
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c b/drivers/gpu= /drm/amd/pm/powerplay/hwmgr/ci_baco.c
index 3be40114e63d..45f608838f6e 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c
@@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = =3D
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__= BACO_BCLK_OFF_MASK,=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0BACO_CNTL__BACO= _BCLK_OFF__SHIFT, 0, 0x00 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__= BACO_POWER_OFF_MASK,=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 BACO_CNTL__BACO_POWE= R_OFF__SHIFT, 0, 0x00 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_DELAY_MS, 0, 0, 0, 20, 0 },
-=C2=A0 =C2=A0 =C2=A0 =C2=A0{ CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_= BF_MASK, 0, 0xffffffff, 0x20 },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_= BF_MASK, 0, 0xffffffff, 0x200 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__= BACO_ISO_DIS_MASK, BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 },
-=C2=A0 =C2=A0 =C2=A0 =C2=A0{ CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_= MASK, 0, 5, 0x1c },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_= MASK, 0, 5, 0x1c00 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__= BACO_ANA_ISO_DIS_MASK, BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0, 0x01 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__= BACO_RESET_EN_MASK, BACO_CNTL__BACO_RESET_EN__SHIFT, 0, 0x00 },
-=C2=A0 =C2=A0 =C2=A0 =C2=A0{ CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_= CONFIG_DONE_MASK, 0, 5, 0x10 },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_= CONFIG_DONE_MASK, 0, 5, 0x100 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__= BACO_EN_MASK, BACO_CNTL__BACO_EN__SHIFT, 0, 0x00 },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_MOD= E_MASK, 0, 0xffffffff, 0x00 }
=C2=A0};
@@ -155,6 +155,7 @@ static const struct baco_cmd_entry exit_baco_tbl[] =3D<= br> =C2=A0static const struct baco_cmd_entry clean_baco_tbl[] =3D
=C2=A0{
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_WRITE, mmBIOS_SCRATCH_6, 0, 0, 0, 0 }, +=C2=A0 =C2=A0 =C2=A0 =C2=A0{ CMD_WRITE, mmBIOS_SCRATCH_7, 0, 0, 0, 0 }, =C2=A0 =C2=A0 =C2=A0 =C2=A0 { CMD_WRITE, mmCP_PFP_UCODE_ADDR, 0, 0, 0, 0 }<= br> =C2=A0};

--
2.29.0

=
Not sure why I'm cc'd on this, I'm = not a maintainer, nor does this patch seem related to any patches I've = contributed.

- Sandeep

Ok, I just saw the other email. I'll try testing the patch and se= e if it fixes the hibernation bug.

- Sandeep
--000000000000a1c2da05b2a56d74-- --===============1481027293== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx --===============1481027293==--