From: "Lazar, Lijo" <lijo.lazar@amd.com> To: Richard Gong <richard.gong@amd.com>, alexander.deucher@amd.com, christian.koenig@amd.com, xinhui.pan@amd.com, airlied@linux.ie, daniel@ffwll.ch Cc: amd-gfx@lists.freedesktop.org, kernel test robot <lkp@intel.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, mario.limonciello@amd.com Subject: Re: [PATCHv4] drm/amdgpu: disable ASPM on Intel Alder Lake based systems Date: Wed, 13 Apr 2022 09:59:00 +0530 [thread overview] Message-ID: <6c2aae03-f873-c673-ab93-d665831a2def@amd.com> (raw) In-Reply-To: <20220412215000.897344-1-richard.gong@amd.com> On 4/13/2022 3:20 AM, Richard Gong wrote: > Active State Power Management (ASPM) feature is enabled since kernel 5.14. > There are some AMD GFX cards (such as WX3200 and RX640) that won't work > with ASPM-enabled Intel Alder Lake based systems. Using these GFX cards as > video/display output, Intel Alder Lake based systems will hang during > suspend/resume. > > The issue was initially reported on one system (Dell Precision 3660 with > BIOS version 0.14.81), but was later confirmed to affect at least 4 Alder > Lake based systems. > > Add extra check to disable ASPM on Intel Alder Lake based systems. > > Fixes: 0064b0ce85bb ("drm/amd/pm: enable ASPM by default") > Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1885 > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Richard Gong <richard.gong@amd.com> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Thanks, Lijo > --- > v4: s/CONFIG_X86_64/CONFIG_X86 > enhanced check logic > v3: s/intel_core_asom_chk/aspm_support_quirk_check > correct build error with W=1 option > v2: correct commit description > move the check from chip family to problematic platform > --- > drivers/gpu/drm/amd/amdgpu/vi.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c > index 039b90cdc3bc..b33e0a9bee65 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > @@ -81,6 +81,10 @@ > #include "mxgpu_vi.h" > #include "amdgpu_dm.h" > > +#if IS_ENABLED(CONFIG_X86) > +#include <asm/intel-family.h> > +#endif > + > #define ixPCIE_LC_L1_PM_SUBSTATE 0x100100C6 > #define PCIE_LC_L1_PM_SUBSTATE__LC_L1_SUBSTATES_OVERRIDE_EN_MASK 0x00000001L > #define PCIE_LC_L1_PM_SUBSTATE__LC_PCI_PM_L1_2_OVERRIDE_MASK 0x00000002L > @@ -1134,13 +1138,24 @@ static void vi_enable_aspm(struct amdgpu_device *adev) > WREG32_PCIE(ixPCIE_LC_CNTL, data); > } > > +static bool aspm_support_quirk_check(void) > +{ > + if (IS_ENABLED(CONFIG_X86)) { > + struct cpuinfo_x86 *c = &cpu_data(0); > + > + return !(c->x86 == 6 && c->x86_model == INTEL_FAM6_ALDERLAKE); > + } > + > + return true; > +} > + > static void vi_program_aspm(struct amdgpu_device *adev) > { > u32 data, data1, orig; > bool bL1SS = false; > bool bClkReqSupport = true; > > - if (!amdgpu_device_should_use_aspm(adev)) > + if (!amdgpu_device_should_use_aspm(adev) || !aspm_support_quirk_check()) > return; > > if (adev->flags & AMD_IS_APU || >
WARNING: multiple messages have this Message-ID (diff)
From: "Lazar, Lijo" <lijo.lazar@amd.com> To: Richard Gong <richard.gong@amd.com>, alexander.deucher@amd.com, christian.koenig@amd.com, xinhui.pan@amd.com, airlied@linux.ie, daniel@ffwll.ch Cc: mario.limonciello@amd.com, dri-devel@lists.freedesktop.org, kernel test robot <lkp@intel.com>, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCHv4] drm/amdgpu: disable ASPM on Intel Alder Lake based systems Date: Wed, 13 Apr 2022 09:59:00 +0530 [thread overview] Message-ID: <6c2aae03-f873-c673-ab93-d665831a2def@amd.com> (raw) In-Reply-To: <20220412215000.897344-1-richard.gong@amd.com> On 4/13/2022 3:20 AM, Richard Gong wrote: > Active State Power Management (ASPM) feature is enabled since kernel 5.14. > There are some AMD GFX cards (such as WX3200 and RX640) that won't work > with ASPM-enabled Intel Alder Lake based systems. Using these GFX cards as > video/display output, Intel Alder Lake based systems will hang during > suspend/resume. > > The issue was initially reported on one system (Dell Precision 3660 with > BIOS version 0.14.81), but was later confirmed to affect at least 4 Alder > Lake based systems. > > Add extra check to disable ASPM on Intel Alder Lake based systems. > > Fixes: 0064b0ce85bb ("drm/amd/pm: enable ASPM by default") > Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1885 > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Richard Gong <richard.gong@amd.com> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Thanks, Lijo > --- > v4: s/CONFIG_X86_64/CONFIG_X86 > enhanced check logic > v3: s/intel_core_asom_chk/aspm_support_quirk_check > correct build error with W=1 option > v2: correct commit description > move the check from chip family to problematic platform > --- > drivers/gpu/drm/amd/amdgpu/vi.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c > index 039b90cdc3bc..b33e0a9bee65 100644 > --- a/drivers/gpu/drm/amd/amdgpu/vi.c > +++ b/drivers/gpu/drm/amd/amdgpu/vi.c > @@ -81,6 +81,10 @@ > #include "mxgpu_vi.h" > #include "amdgpu_dm.h" > > +#if IS_ENABLED(CONFIG_X86) > +#include <asm/intel-family.h> > +#endif > + > #define ixPCIE_LC_L1_PM_SUBSTATE 0x100100C6 > #define PCIE_LC_L1_PM_SUBSTATE__LC_L1_SUBSTATES_OVERRIDE_EN_MASK 0x00000001L > #define PCIE_LC_L1_PM_SUBSTATE__LC_PCI_PM_L1_2_OVERRIDE_MASK 0x00000002L > @@ -1134,13 +1138,24 @@ static void vi_enable_aspm(struct amdgpu_device *adev) > WREG32_PCIE(ixPCIE_LC_CNTL, data); > } > > +static bool aspm_support_quirk_check(void) > +{ > + if (IS_ENABLED(CONFIG_X86)) { > + struct cpuinfo_x86 *c = &cpu_data(0); > + > + return !(c->x86 == 6 && c->x86_model == INTEL_FAM6_ALDERLAKE); > + } > + > + return true; > +} > + > static void vi_program_aspm(struct amdgpu_device *adev) > { > u32 data, data1, orig; > bool bL1SS = false; > bool bClkReqSupport = true; > > - if (!amdgpu_device_should_use_aspm(adev)) > + if (!amdgpu_device_should_use_aspm(adev) || !aspm_support_quirk_check()) > return; > > if (adev->flags & AMD_IS_APU || >
next prev parent reply other threads:[~2022-04-13 4:29 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-12 21:50 [PATCHv4] drm/amdgpu: disable ASPM on Intel Alder Lake based systems Richard Gong 2022-04-12 21:50 ` Richard Gong 2022-04-13 4:29 ` Lazar, Lijo [this message] 2022-04-13 4:29 ` Lazar, Lijo 2022-04-13 7:43 ` Paul Menzel 2022-04-13 7:43 ` Paul Menzel 2022-04-13 7:43 ` Paul Menzel 2022-04-13 13:00 ` Alex Deucher 2022-04-13 13:00 ` Alex Deucher 2022-04-13 13:00 ` Alex Deucher 2022-04-13 13:28 ` Limonciello, Mario 2022-04-13 13:28 ` Limonciello, Mario 2022-04-13 13:28 ` Limonciello, Mario 2022-04-14 7:52 ` Paul Menzel 2022-04-14 7:52 ` Paul Menzel 2022-04-14 7:52 ` Paul Menzel 2022-04-14 13:11 ` Alex Deucher 2022-04-14 13:11 ` Alex Deucher 2022-04-14 13:11 ` Alex Deucher 2022-04-19 21:46 ` Gong, Richard 2022-04-19 21:46 ` Gong, Richard 2022-04-20 20:29 ` Paul Menzel 2022-04-20 20:29 ` Paul Menzel 2022-04-20 20:29 ` Paul Menzel 2022-04-20 20:40 ` Alex Deucher 2022-04-20 20:40 ` Alex Deucher 2022-04-20 20:40 ` Alex Deucher 2022-04-20 20:48 ` Paul Menzel 2022-04-20 20:48 ` Paul Menzel 2022-04-20 20:48 ` Paul Menzel 2022-04-20 20:56 ` Gong, Richard 2022-04-20 20:56 ` Gong, Richard 2022-04-20 20:56 ` Gong, Richard 2022-04-20 21:02 ` Paul Menzel 2022-04-20 21:02 ` Paul Menzel 2022-04-20 21:02 ` Paul Menzel 2022-04-20 21:12 ` Gong, Richard 2022-04-20 21:12 ` Gong, Richard 2022-04-20 21:12 ` Gong, Richard 2022-04-20 21:15 ` Alex Deucher 2022-04-20 21:15 ` Alex Deucher 2022-04-20 21:15 ` Alex Deucher 2022-04-20 21:13 ` Alex Deucher 2022-04-20 21:13 ` Alex Deucher 2022-04-20 21:13 ` Alex Deucher 2022-04-20 21:16 ` Limonciello, Mario 2022-04-20 21:16 ` Limonciello, Mario 2022-04-20 21:16 ` Limonciello, Mario 2022-04-21 1:12 ` Gong, Richard 2022-04-21 1:12 ` Gong, Richard 2022-04-21 1:12 ` Gong, Richard 2022-04-21 5:35 ` Paul Menzel 2022-04-21 5:35 ` Paul Menzel 2022-04-21 5:35 ` Paul Menzel 2022-04-26 13:53 ` Gong, Richard 2022-04-26 13:53 ` Gong, Richard 2022-04-26 13:53 ` Gong, Richard 2022-05-01 7:08 ` Paul Menzel 2022-05-01 7:08 ` Paul Menzel 2022-05-01 7:08 ` Paul Menzel 2022-05-02 14:56 ` Gong, Richard 2022-05-02 14:56 ` Gong, Richard 2022-05-02 14:56 ` Gong, Richard 2022-05-03 12:25 ` Daniel Stone 2022-05-03 12:25 ` Daniel Stone 2022-05-03 12:44 ` Paul Menzel 2022-05-03 12:44 ` Paul Menzel 2022-04-13 15:40 ` Nathan Chancellor 2022-04-13 15:40 ` Nathan Chancellor 2022-04-13 15:40 ` Nathan Chancellor 2022-04-19 21:08 ` Gong, Richard 2022-04-19 21:08 ` Gong, Richard 2022-04-19 21:08 ` Gong, Richard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=6c2aae03-f873-c673-ab93-d665831a2def@amd.com \ --to=lijo.lazar@amd.com \ --cc=airlied@linux.ie \ --cc=alexander.deucher@amd.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=christian.koenig@amd.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lkp@intel.com \ --cc=mario.limonciello@amd.com \ --cc=richard.gong@amd.com \ --cc=xinhui.pan@amd.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.