From 2b072442f4962231a8516485012bb2d2551ef2fe Mon Sep 17 00:00:00 2001
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
Date: Wed, 15 Mar 2023 20:07:23 +0800
Subject: drm/amdgpu/nv: Apply ASPM quirk on Intel ADL + AMD Navi

S2idle resume freeze can be observed on Intel ADL + AMD WX5500. This is
caused by commit 0064b0ce85bb ("drm/amd/pm: enable ASPM by default").

The root cause is still not clear for now.

So extend and apply the ASPM quirk from commit e02fe3bc7aba
("drm/amdgpu: vi: disable ASPM on Intel Alder Lake based systems"), to
workaround the issue on Navi cards too.

Fixes: 0064b0ce85bb ("drm/amd/pm: enable ASPM by default")
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2458
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
---
 drivers/gpu/drm/amd/amdgpu/nv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/gpu/drm/amd/amdgpu/nv.c')

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 22e25ca285f8..ebe0e2d7dbd1 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -578,7 +578,7 @@ static void nv_pcie_gen3_enable(struct amdgpu_device *adev)
 
 static void nv_program_aspm(struct amdgpu_device *adev)
 {
-	if (!amdgpu_device_should_use_aspm(adev))
+	if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_aspm_support_quirk())
 		return;
 
 	if (!(adev->flags & AMD_IS_APU) &&
-- 
cgit v1.2.3

s/perf/scripts/python?id=71f2cc64d027d712f29bf8d09d3e123302d5f245&amp;follow=1'>diff</a><a href='/linux/stats/tools/perf/scripts/python'>stats</a></td><td class='form'><form class='right' method='get' action='/linux/log/tools/perf/scripts/python'>
<input type='hidden' name='id' value='71f2cc64d027d712f29bf8d09d3e123302d5f245'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/linux/log/?id=71f2cc64d027d712f29bf8d09d3e123302d5f245&amp;follow=1'>root</a>/<a href='/linux/log/tools?id=71f2cc64d027d712f29bf8d09d3e123302d5f245&amp;follow=1'>tools</a>/<a href='/linux/log/tools/perf?id=71f2cc64d027d712f29bf8d09d3e123302d5f245&amp;follow=1'>perf</a>/<a href='/linux/log/tools/perf/scripts?id=71f2cc64d027d712f29bf8d09d3e123302d5f245&amp;follow=1'>scripts</a>/<a href='/linux/log/tools/perf/scripts/python?id=71f2cc64d027d712f29bf8d09d3e123302d5f245&amp;follow=1'>python</a> (<a href='/linux/log/tools/perf/scripts/python?id=71f2cc64d027d712f29bf8d09d3e123302d5f245'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/linux/log/tools/perf/scripts/python?id=71f2cc64d027d712f29bf8d09d3e123302d5f245&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
<tr><td><span title='2018-11-08 17:50:37 +0100'>2018-11-08</span></td><td><a href='/linux/commit/fs/ceph/file.c?id=c2c6d3ce0d9a1fae4472fc10755372d022a487a4&amp;follow=1'>ceph: add destination file data sync before doing any remote copy</a></td><td>Luis Henriques</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+9</span></td></tr>
<tr><td><span title='2018-11-04 15:37:52 -0800'>2018-11-04</span></td><td><a href='/linux/commit/Makefile?id=651022382c7f8da46cb4872a545ee1da6d097d2a&amp;follow=1'>Linux 4.20-rc1</a><span class='decoration'><a class='tag-annotated-deco' href='/linux/tag/?h=v4.20-rc1'>v4.20-rc1</a></span></td><td>Linus Torvalds</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+2</span></td></tr>
<tr><td><span title='2018-11-04 00:40:03 +0100'>2018-11-04</span></td><td><a href='/linux/commit/kernel/sched/topology.c?id=993f0b0510dad98b4e6e39506834dab0d13fd539&amp;follow=1'>sched/topology: Fix off by one bug</a></td><td>Peter Zijlstra</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2018-11-03 10:09:38 -0700'>2018-11-03</span></td><td><a href='/linux/commit/mm/memory_hotplug.c?id=dd33ad7b251f900481701b2a82d25de583867708&amp;follow=1'>memory_hotplug: cond_resched in __remove_pages</a></td><td>Michal Hocko</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2018-11-03 10:09:38 -0700'>2018-11-03</span></td><td><a href='/linux/commit/fs/bfs/inode.c?id=9f2df09a33aa2c76ce6385d382693f98d7f2f07e&amp;follow=1'>bfs: add sanity check at bfs_fill_super()</a></td><td>Tetsuo Handa</td><td>1</td><td><span class='deletions'>-3</span>/<span class='insertions'>+6</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/kernel/sysctl.c?id=6f0483d1f91b612186abeaebf3ce43bf805eb9f7&amp;follow=1'>kernel/sysctl.c: remove duplicated include</a></td><td>Michael Schupikov</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+0</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/kernel/kexec_file.c?id=3383b36040522505546cb112f0a543a5998edfb6&amp;follow=1'>kernel/kexec_file.c: remove some duplicated includes</a></td><td>zhong jiang</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+0</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/mm/shmem.c?id=89c83fb539f95491be80cdd5158e6f0ce329e317&amp;follow=1'>mm, thp: consolidate THP gfp handling into alloc_hugepage_direct_gfpmask</a></td><td>Michal Hocko</td><td>5</td><td><span class='deletions'>-77</span>/<span class='insertions'>+40</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/fs/ocfs2/move_extents.c?id=6194ae4242dec0c9d604bc05df83aa9260a899e4&amp;follow=1'>ocfs2: fix clusters leak in ocfs2_defrag_extent()</a></td><td>Larry Chen</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+17</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/fs/ocfs2/dlmglue.c?id=3a3d1e51042895c58d4797831921c940b28d8c4b&amp;follow=1'>ocfs2: dlmglue: clean up timestamp handling</a></td><td>Arnd Bergmann</td><td>1</td><td><span class='deletions'>-17</span>/<span class='insertions'>+9</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/fs/ocfs2/buffer_head_io.c?id=cf76c78595ca87548ca5e45c862ac9e0949c4687&amp;follow=1'>ocfs2: don't put and assigning null to bh allocated outside</a></td><td>Changwei Ge</td><td>1</td><td><span class='deletions'>-18</span>/<span class='insertions'>+59</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/fs/ocfs2/dir.c?id=29aa30167a0a2e6045a0d6d2e89d8168132333d5&amp;follow=1'>ocfs2: fix a misuse a of brelse after failing ocfs2_check_dir_entry</a></td><td>Changwei Ge</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/fs/ocfs2/file.c?id=9e985787750db8aae87f02b67e908f28ac4d6b83&amp;follow=1'>ocfs2: don't use iocb when EIOCBQUEUED returns</a></td><td>Changwei Ge</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+2</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/fs/ocfs2/journal.c?id=21158ca85b73ddd0088076a5209cfd040513a8b5&amp;follow=1'>ocfs2: without quota support, avoid calling quota recovery</a></td><td>Guozhonghua</td><td>1</td><td><span class='deletions'>-17</span>/<span class='insertions'>+34</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/fs/ocfs2/stackglue.h?id=a634644751c46238df58bbfe992e30c1668388db&amp;follow=1'>ocfs2: remove ocfs2_is_o2cb_active()</a></td><td>Gang He</td><td>3</td><td><span class='deletions'>-10</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/mm/mempolicy.c?id=ac5b2c18911ffe95c08d69273917f90212cf5659&amp;follow=1'>mm: thp: relax __GFP_THISNODE for MADV_HUGEPAGE mappings</a></td><td>Andrea Arcangeli</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+30</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/include/linux/notifier.h?id=94e297c50b529f5d01cfd1dbc808d61e95180ab7&amp;follow=1'>include/linux/notifier.h: SRCU: fix ctags</a></td><td>Sam Protsenko</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2018-11-03 10:09:37 -0700'>2018-11-03</span></td><td><a href='/linux/commit/mm/memcontrol.c?id=e68599a3c3ad0f3171a7cb4e48aa6f9a69381902&amp;follow=1'>mm: handle no memcg case in memcg_kmem_charge() properly</a></td><td>Roman Gushchin</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2018-11-02 22:31:25 -0700'>2018-11-02</span></td><td><a href='/linux/commit/arch/arm/boot/dts/stm32mp157c.dtsi?id=00a6a845c0b66e7ffb9adb6b3a9ce2ae97a0c172&amp;follow=1'>ARM: dts: stm32: update HASH1 dmas property on stm32mp157c</a></td><td>Alexandre Torgue</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2018-11-02 22:31:24 -0700'>2018-11-02</span></td><td><a href='/linux/commit/arch/arm/plat-orion/mpp.c?id=d4f79cb872bd4faa44eb133c1aee5f3411342c54&amp;follow=1'>ARM: orion: avoid VLA in orion_mpp_conf</a></td><td>Arnd Bergmann</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+6</span></td></tr>
<tr><td><span title='2018-11-02 19:45:01 -0400'>2018-11-02</span></td><td><a href='/linux/commit/net/9p/trans_virtio.c?id=2cbfdf4df58330f6cb493500387427dae1c5551d&amp;follow=1'>iov_iter: Fix 9p virtio breakage</a></td><td>Marc Zyngier</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td><span title='2018-11-02 14:09:42 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/file.c?id=b98e26df07549d4649ac5b8f24c49f5c722bbc7e&amp;follow=1'>cifs: fix signed/unsigned mismatch on aio_read patch</a></td><td>Steve French</td><td>1</td><td><span class='deletions'>-6</span>/<span class='insertions'>+11</span></td></tr>
<tr><td><span title='2018-11-02 14:09:42 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/cifsfs.c?id=8c6c9bed8773375b1d54ccca2911ec892c59db5d&amp;follow=1'>cifs: don't dereference smb_file_target before null check</a></td><td>Colin Ian King</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+5</span></td></tr>
<tr><td><span title='2018-11-02 14:09:42 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/cifsfs.c?id=be4eb68846dc4450a9a4998d7c16d9f4955f9988&amp;follow=1'>CIFS: Add direct I/O functions to file_operations</a></td><td>Long Li</td><td>1</td><td><span class='deletions'>-6</span>/<span class='insertions'>+4</span></td></tr>
<tr><td><span title='2018-11-02 14:09:42 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/file.c?id=8c5f9c1ab7cb45f6584ce312b14fb310a8fa28f3&amp;follow=1'>CIFS: Add support for direct I/O write</a></td><td>Long Li</td><td>2</td><td><span class='deletions'>-41</span>/<span class='insertions'>+164</span></td></tr>
<tr><td><span title='2018-11-02 14:09:41 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/file.c?id=6e6e2b86c29c6fcfa16ad9fdc7ea32027bea5d73&amp;follow=1'>CIFS: Add support for direct I/O read</a></td><td>Long Li</td><td>3</td><td><span class='deletions'>-39</span>/<span class='insertions'>+192</span></td></tr>
<tr><td><span title='2018-11-02 14:09:41 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/smb2pdu.h?id=0df444a00f32a3ab4d37c3c101bb960ee38a9617&amp;follow=1'>smb3: missing defines and structs for reparse point handling</a></td><td>Steve French</td><td>2</td><td><span class='deletions'>-0</span>/<span class='insertions'>+38</span></td></tr>
<tr><td><span title='2018-11-02 14:09:41 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/smb2pdu.c?id=dfe33f9abc08997e56f9bdf14fe9ac7ac0e14075&amp;follow=1'>smb3: allow more detailed protocol info on open files for debugging</a></td><td>Steve French</td><td>4</td><td><span class='deletions'>-0</span>/<span class='insertions'>+65</span></td></tr>
<tr><td><span title='2018-11-02 14:09:41 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/cifs_spnego.c?id=926674de6705f0f1dbf29a62fd758d0977f535d6&amp;follow=1'>smb3: on kerberos mount if server doesn't specify auth type use krb5</a></td><td>Steve French</td><td>1</td><td><span class='deletions'>-2</span>/<span class='insertions'>+4</span></td></tr>
<tr><td><span title='2018-11-02 14:09:41 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/trace.h?id=f8af49dd1702118e9520f946ce1cf591d553608f&amp;follow=1'>smb3: add trace point for tree connection</a></td><td>Steve French</td><td>2</td><td><span class='deletions'>-1</span>/<span class='insertions'>+44</span></td></tr>
<tr><td><span title='2018-11-02 14:09:41 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/inode.c?id=413d61008131c8ea22312164ba498075ce2fccc8&amp;follow=1'>cifs: fix spelling mistake, EACCESS -&gt; EACCES</a></td><td>Colin Ian King</td><td>2</td><td><span class='deletions'>-3</span>/<span class='insertions'>+3</span></td></tr>
<tr><td><span title='2018-11-02 14:09:41 -0500'>2018-11-02</span></td><td><a href='/linux/commit/fs/cifs/smb2ops.c?id=0c5d6cb6643f48ad3775322f3ebab6c7eb67484e&amp;follow=1'>cifs: fix return value for cifs_listxattr</a></td><td>Ronnie Sahlberg</td><td>1</td><td><span class='deletions'>-5</span>/<span class='insertions'>+6</span></td></tr>