From nobody Thu Apr 2 20:39:33 2026 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B5792609E3 for ; Thu, 26 Mar 2026 23:47:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774568861; cv=none; b=W9ZQ8Hs6v5ulMcyRt8fPz4hA8dJ6hw7D0+l10bRJYtfTllmIMFRu99ASevtTOzoQYtSLL3nDdQgChVJ3Cy6nIgOVVbBq/kpPb8WxRJJKURrhMYOT6B7y+XtWw7Ir2ifa2X8Iy2B8AOnf/6k2gvUBpj6vGN1aZlPcC/fWnqdQH10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774568861; c=relaxed/simple; bh=xoYVdTk23TPn6JIaf7yY0qqI000iCFBtQjQUAdfGGDk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l4q1trxTlSaWEVD11xCt6waBQbRw2QM28fBi1AZXxkJw9UGFgDmP6/fLwKRbh8TzplWaGctFUwsdZGL64vENrQMbJrH4EDJ+JNWKHfBucIYcL0MYAXFsEaK8aExe+HyFkejSPYtDyNN5V7HdJl6L9MqyaW6R/1EyQVKD3DGAb2I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KPdGROls; arc=none smtp.client-ip=209.85.215.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KPdGROls" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-c73c990a96dso798934a12.0 for ; Thu, 26 Mar 2026 16:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774568859; x=1775173659; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mqMdpDaaRiGg+2ZN9NqktjEbPVOkWurGFYKafkS7Z0Q=; b=KPdGROlsexr77/+/oBXv2kXTVBjYRg7L0KUiLnQ4MkILHxgsqkIaRSuxnZdcG/rbpH gCXd+kqbqoQo19rvggGCbvcXFewdWvGc8pyd0Z/BVi8ctMc3JXDIwPHzo+s7XMX/Ykzf XrXpL8jQpLgb/lN/ZT44hT1LTSypruAI3KbRE2f49bWtwkGmA2yu3jRff8YEAVmM/b2O EAwvfSjNpho4uEtKsJfxFbZZWt8jBrSVDcdM1BjqlMRDVnocRrhbewHPHFPGJDkMj/Mt xH3BzISUxSHdIPkanK10mhjjxw7xiwn9Hfom5ci2mvpMwaTMLhJy3yS5L1wk9tKombBq RdRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774568859; x=1775173659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=mqMdpDaaRiGg+2ZN9NqktjEbPVOkWurGFYKafkS7Z0Q=; b=S6fI2PgFNdvroBhM6VbXga/MaZY604PBuFoCJOjKokpelkg9518nbF7WWi01MJ69US LxWi/nOasDzERO1r8DhLCi0HngG56dVieC1tUKe0NSYOE+UC2VUFJ6vW2HQWgOmTULkz cJWMj0G/yAxh9GEzWOYfX5FDJdiYe8DBvo+flmMlbApsOiPVps/IUuNpq09zc+s9lHDk z7AIpkw/ZoXDObCIbko7M+KaxbyKt8PqoxKN/xeO6GPPJVa+PsKElf5XbR1RgguVQ8Dc 3ZFwom6UOd0GuOrWEEI/jTFuZhVrDMo3l1OGRMQfCMANTvPvFhFikuqvDx1wSeHbu+i4 M8Dg== X-Forwarded-Encrypted: i=1; AJvYcCUWnG19xH0cbgUU7CymsZXDEhJ+Zr/lxcBumnEKSHAL7bpaFTjDZQpSoPv6ecmdXVVR/LUmQQ3hKU100ks=@vger.kernel.org X-Gm-Message-State: AOJu0YzabvAZzTOI0PeDfLOmzkMZ4CeY35hRTgxYfLGVmi7bZSdg0gTP NdNgVPaBCB9JZU8C3xD7pu0DLL0CqaQkmURDf1BGUNC+Y6FTSBRUvzvK X-Gm-Gg: ATEYQzxZluxSfDzYgjAUQ4IDrwhxgsbupXWaFXtpg9Sl2P3Rvr3Cl+BEqYQW+GEXCWI 9G3r5KE9NUSty+DkwjE6RciTqz31thqYXpW2WDiTep8q+w2pMwTuTDUN0sfF24GOmaBhk1DMtVl +BoYH5biUavPg7WQPZTT4kA2Zlyb5jW2KC440D0HGqC6YrDrUrWxuaPtVWuap7pRDUP5ot53VPG aHGeh+BkSnElLopnDqwUBzNe3b1lJr5ogo+mO/B2LRlMXKxh5VaihkUmEmPEP6p1bSz0r3PQTyN 3fnMg7JnVI53oS7z9Pev5uQiEfvwhLm1zEla2dnZt6gcL7jeF96wveUjsVpzvKY//sJ5TIutSwx 1fQkdUCalPn64JGn322Z0iUqfjneVA8q3Xm9eD+C0nSkusjhrCuVBcESezeoG2LA7CrmIQpivr1 0e2gcDl0mUI31yu4F6xSzML+Jcvw9aVlM1pbwgUD8293v0J+70ILyv8ZM= X-Received: by 2002:a05:6a21:3287:b0:398:9ae9:7112 with SMTP id adf61e73a8af0-39c8781ff90mr479262637.1.1774568859447; Thu, 26 Mar 2026 16:47:39 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7673933816sm3201162a12.21.2026.03.26.16.47.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 16:47:38 -0700 (PDT) From: Rosen Penev To: stable@vger.kernel.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Harry Wentland , Leo Li , Greg Kroah-Hartman , Bin Lan , He Zhe , Vitaly Prosyak , Alex Hung , Rodrigo Siqueira , =?UTF-8?q?Timur=20Krist=C3=B3f?= , Mario Limonciello , Ray Wu , Wayne Lin , Roman Li , Eric Yang , Tony Cheng , Mauro Rossi , amd-gfx@lists.freedesktop.org (open list:RADEON and AMDGPU DRM DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH for 6.12 2/9] drm/amd/amdgpu: disable ASPM in some situations Date: Thu, 26 Mar 2026 16:47:09 -0700 Message-ID: <20260326234716.16723-3-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326234716.16723-1-rosenp@gmail.com> References: <20260326234716.16723-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Kenneth Feng [ Upstream commit c770ef19673fb1defcbde2ee2b91c3c89bfcf164 ] disable ASPM with some ASICs on some specific platforms. required from PCIe controller owner. Signed-off-by: Kenneth Feng Reviewed-by: Yang Wang Signed-off-by: Alex Deucher Signed-off-by: Rosen Penev --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_device.c index dbee43c58741..eb3c6bfe2e6c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -84,6 +84,7 @@ =20 #if IS_ENABLED(CONFIG_X86) #include +#include #endif =20 MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin"); @@ -1758,6 +1759,35 @@ static bool amdgpu_device_pcie_dynamic_switching_sup= ported(struct amdgpu_device return true; } =20 +static bool amdgpu_device_aspm_support_quirk(struct amdgpu_device *adev) +{ +#if IS_ENABLED(CONFIG_X86) + struct cpuinfo_x86 *c =3D &cpu_data(0); + + if (!(amdgpu_ip_version(adev, GC_HWIP, 0) =3D=3D IP_VERSION(12, 0, 0) || + amdgpu_ip_version(adev, GC_HWIP, 0) =3D=3D IP_VERSION(12, 0, 1))) + return false; + + if (c->x86 =3D=3D 6 && + adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5) { + switch (c->x86_model) { + case VFM_MODEL(INTEL_ALDERLAKE): + case VFM_MODEL(INTEL_ALDERLAKE_L): + case VFM_MODEL(INTEL_RAPTORLAKE): + case VFM_MODEL(INTEL_RAPTORLAKE_P): + case VFM_MODEL(INTEL_RAPTORLAKE_S): + return true; + default: + return false; + } + } else { + return false; + } +#else + return false; +#endif +} + /** * amdgpu_device_should_use_aspm - check if the device should program ASPM * @@ -1782,6 +1812,8 @@ bool amdgpu_device_should_use_aspm(struct amdgpu_devi= ce *adev) } if (adev->flags & AMD_IS_APU) return false; + if (amdgpu_device_aspm_support_quirk(adev)) + return false; return pcie_aspm_enabled(adev->pdev); } =20 --=20 2.53.0