Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <6c2aae03-f873-c673-ab93-d665831a2def@amd.com>
Date:   Wed, 13 Apr 2022 09:59:00 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.2
Subject: Re: [PATCHv4] drm/amdgpu: disable ASPM on Intel Alder Lake based
 systems
Content-Language: en-US
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
References: <20220412215000.897344-1-richard.gong@amd.com>
From:   "Lazar, Lijo" <lijo.lazar@amd.com>
In-Reply-To: <20220412215000.897344-1-richard.gong@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dUxyWE5qdG40eG9hY1FSaWxJUHZuaDNjcnJRdDJFQ3BHdGhMakpFQkRBak5F?=
 =?utf-8?B?TGVZWDRrM0F5SjZwS3J0bksrcWxQcUZJcHU2UXgyUTJEUko0ZHRkcHRXMzVM?=
 =?utf-8?B?QmQwanRudzFkKzBra0JLWmJLa2NKditjN0tyNUMvdVpkaXZFUkFSTVJkdVdF?=
 =?utf-8?B?dkwyWStONG5NSVhOdVJVWjVlbzB4bWxBM3RST0RlSkxydFJVYTFWNXNhdmhH?=
 =?utf-8?B?L0tMM3lJUFdhRGd6L1NUQlpIWVpnODdQRjBEbE00a3NCWEg2bi9HRm85VFFW?=
 =?utf-8?B?bG9KUnZsZ1hwSTV1cW03UWxHeUpHVWphdTdEVXd4MllqVW5DZldDWVJuTWRl?=
 =?utf-8?B?WTJCdG04UjlQUGIwWmRVSExsdUY2a3l3S2o0UXdHTjRKMDNHOFlPZnJXcHBU?=
 =?utf-8?B?NmprQWcyTk1CQXJMYzd3QmUwVUpOcHVoQ2t4ODIvaThKc2xMNmNLNStlZzhy?=
 =?utf-8?B?RGcrYUZWMjBtNkt6U0FtV1pMS1h1eHk2ZlF4SXN2UG5iV3RFdlVrVVRJNjBT?=
 =?utf-8?B?N0F0MnRCRmZUMWtmTFIrRU1BWmZKMk1KbWZEWTN2a0hvMEI3dGNOaTd6RDlu?=
 =?utf-8?B?WXcrOUNhTC9reWxaMGh2ZFpnOFp4aWd2aE9pRkRnYWVVNmlSdGRaajduWkVJ?=
 =?utf-8?B?QXZTR2hhcGtWV0MvK21HR2FpV2sxM25WeURYR1BZSmtvR1NESWtHWGxYYlpn?=
 =?utf-8?B?c2h0eFBGaWhLUlFtYmNrVjE2cWJaaHBCdSthMjdCOWJJZTJPVTdVSmNTQzZI?=
 =?utf-8?B?T054NTMrMTlOdTFFd0VVVkN4RDhxLy95T1VSNnFFSE1jVUJkRzR5WnRZVDho?=
 =?utf-8?B?M29tTmhjMGdCejJvdGpEMWJGeS9pd3FJRmFrM1pjZmNNdlZSUG9QaTRiZzMw?=
 =?utf-8?B?d1E0NTQ3ZHUzWjFDcDFaaStoWjBnN2F2VG9pNmg3RUtDMCswWDEzdFhJaHBE?=
 =?utf-8?B?RitVNHh6L2JOTXRrYzU2M3JpUE05a0tlWEpkbnB1OWlrVUdTNTRheCtDNU85?=
 =?utf-8?B?SUxvVzRBMmNvQlpvVFA4TU1JVStWT0ZxVWJaOVMzdHVKMnFXa2lUZmZhNWoz?=
 =?utf-8?B?aGpBU3J4ZnBkV3NNaUc3TUhqZ3dDSklMT1VDWTlxbWdjNFBKQlBWVHVuY2xM?=
 =?utf-8?B?WG45cHlmUDJYSENTejVsRWV0VkJZT044blN1Y0tZYU9SaWI1Ym5EOHdHSWRv?=
 =?utf-8?B?dERLbC9zeXI1Nll0Y1BvdEh2SW1JZmh2TGhGNU9KOExUajZ1UFphdDMwM0E3?=
 =?utf-8?B?cGR2RE9WYk10dnNzUHFBdWJrY0MzaWtvck5YcGFyQktyTmFaSFNNbmRIelVy?=
 =?utf-8?B?T293Z0tWYit6TStSbWpkWnlqV2VkeEk3MGYyVmJ6bHVDNjJieVlBaGUvZWtX?=
 =?utf-8?B?OGxncmJCcmIxRUZRblZLN1ZKalY0ZTZ5N2dHVmJwdk1nVmxDaUpDeHM1VWdh?=
 =?utf-8?B?dXoxeWkzK0RVMnM5bGVIM3R0Q0MrYmdodURzajkvcFh0NnIyaklqZFJaMTZj?=
 =?utf-8?B?YXltOTlSbkUrN05LOGFXZkt2U2wzTjFIVEREd2NmZld2dXpJWDY1aHJ0bHkw?=
 =?utf-8?B?cXF1U1NRSHpTWkltQ1pmZk12aXE2TDF0U2NSU3p2aUJScHZQTXd6R3cxUkZI?=
 =?utf-8?B?VXVJSUt3WUVOcmR2amFPTjJTTUVYNGdNSHBXdlhIVlNYQVpwN2RVVzJFNVlZ?=
 =?utf-8?B?SCtRcGJLK2xaTGd3aVZRYVhJaG53bDNBdE5mdGRBZlBMbW10bUNZc0pia3Y1?=
 =?utf-8?B?TXdoZDZqMjlkMzMzckNkLzhQd2t4VFRoeTVlSms3SDZjQ01pWlA1NmIyemEy?=
 =?utf-8?B?RHhiSFRUMFpmSjYzdW43MDF4M3V3Y08zNFhIcXZYZEhRU1BuZ0I0RkpBR09E?=
 =?utf-8?B?N1ZjRmEzWkxlTCtDaUN0WkFCODJob2pPRWlCZnhWVFFreU1zQTVEYlNjQkVz?=
 =?utf-8?B?VFZkaWRFYWc4L05JWUdkc3ZKVExmSitaK0VCODZQWGdlVWNjTzNsV0ZVU2la?=
 =?utf-8?B?K1RnenpUcm8rWHVEeW5Jek5HY05BVHNOY3kxaTZwNWg0Y0ViOE5SYmhaSElT?=
 =?utf-8?B?UFNXbENIdHZ4U3o4WnpMaDQ0QUdFN1dTRktOTnl4OURBSDFvMGhMekprOHFW?=
 =?utf-8?B?bXFZL2lJdzRMNlJpUG9hQ0lqYTA0K3k4dTBYcWhNU0tyVjBLdVpHRERuYVJH?=
 =?utf-8?B?blBoR0pzRXF0ZzJRSWw1S2xIcm0rRlZFTVNTRUNKU0tSV25JUU1nUlJhUFBu?=
 =?utf-8?B?UHJUejhka2pSTVZUYjArU0ZvOUc0MjdaUHRzTDVhS0VTeXJNbjBmQ05YeUY2?=
 =?utf-8?B?d0lwblBadTdha0F1OU9iOGU3ZkpKbTBZa3J4Vm9oeE55UVBjVnJzUT09?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c5003b4f-b680-468d-3537-08da1d062bc1
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB4614.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 04:29:17.1969
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: WonVccqFIBC2RN1p8hk68LBMBdLDK1ZaoKHs3bMdPGPscI52IgTc2ieW8mnhLaY8
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3978
X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


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 ||
>