From nobody Sun Apr 5 13:04:12 2026 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.178]) (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 30AA81A9F87 for ; Wed, 1 Apr 2026 00:39:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775003974; cv=none; b=oDaHeJHBVC3nY1Zys6rlN9rBS1v6loN3OKXbEBbJrkNI5Ctx8Lmtcl6u/bDzQNAoqwClxIyV/f5z7CXDSezxaOy6G79yGPtxpSQVCCAumBRkGEXwu/TqB91ZxpeGueqGMs0wJzPudnS6QD0r91hbNfNetbqcHmzlRcwW3bM48TU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775003974; c=relaxed/simple; bh=xoYVdTk23TPn6JIaf7yY0qqI000iCFBtQjQUAdfGGDk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ed5/4Eyt8jOi1cdj50MgleXjLCPAsyZ8b7ii4jJ9xF8l9SNWjNwFu+6HL4iD1/3DW+q4l4vN4VyW41UjPftFYbqb4qYvwI5lV3098IaL2qWC3NV93CgJp2IV8s7O8U4rMVLw5HLA7DKEl9UEGk4eM3P2E8h157UVER7umr+aEwY= 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=SxeAPEN7; arc=none smtp.client-ip=74.125.82.178 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="SxeAPEN7" Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-2c7d8bbad06so1463856eec.1 for ; Tue, 31 Mar 2026 17:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775003972; x=1775608772; 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=SxeAPEN7m0UUHHtG0MX5fxi86LFmaL+RIC5yEwq7Gd1M9bqWjYg1TSReKkx/+bh/IQ 7ZBGl2zPHMyQn3QGsF5d/UjguBjyTn6Ow1fuUP1gLsubJrfx0KyAP9o1Lt/MNTWWqMyo zi7GxcTx1lYha1dVqpNtyzTRkwEg53XWZZOUAhARvsrkvggi+Ihj2qyWh6PHXXPN6jMR urVKZaeGEJPlxsg7zfa1hVBSdm8QlrrNcX/ghLp2bxoy1CGPCzVq/pGUH9whcH5tiYCR yYIRpnKKSpfFmodJo1k9NWsgiKQZRtNrQfIUMevwFfUUG+jFRQZI++KXWAdzr1NvcBYs VD/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775003972; x=1775608772; 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=l5Tl0BvpOfUPxG65COoJO77MhZ5gggvtq+lmXNCKK7SH88anrhN1dTTxFk6SpSKeCF VVhNMGgcesC/ZYDteNG/wmXJpohSp8wyXPNT+SgrY185QTUNGP3c3c5qj8dYGkdzHK0y d6wW1R+IPibhqh4p+pce76BIa83TSfOXBo+PWczghyOBGbXf5A2NRt58KR0QQsi7YgKb Kq4mLUnG10ZSOOMaXBzKQZyWj9eN2rH/v8kdqA21mJcaGG/iyHI2FuKWpV64i39+rJAL nRlgT43K+40vhulAkFUQVJmphVKCtzp1dWwyqUqA/6XtOLSAJJ5+mkbKOEd73XhDo9+8 2b6w== X-Forwarded-Encrypted: i=1; AJvYcCV2sx5GW6V5reOwlMIw50lraavpVVgYG4JTMkGID1RVCli63C1NcmVNnSqGYGnsJc00ihihmMJG8QEsR6Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yyy79jv4b9p+Tiev5dOWKthEQsvWJLnhztCn7UZz10BfjiTHq1H U1Gp+LVtJvZkOfWoXuqXSgZzncCkixGKYsoMZKS+8g6a75AB1g2UWXEZ X-Gm-Gg: ATEYQzzaBH3YACQ9WpXiVptPk5mEg2VFsw9yoowL6qlZCD/ibIgnW6HHtY99ZLFP1HN 4WGDm95XK/Xyqm1qDPrBf+BW4z6qEKzhxR2cBWomjdcRInxZy68VJJyRgIpIg9ijB8DnxQoLqTs BgKYTXgjP5+9p3xaePJ9Q71YcoEiQlVIVDuuUkwMTqxjNiui7XYeHqGj7qg61RBwBXilLIdAxrE Fg27/9EcucQAi3mryN74+nvBY+iIszCoYhdkFX88oBFf32IzxInrFQRxC+fyLdWp52UFQPe+zaB ovF8xvn6fqCCwry/Ez44NzcGyEBb4BUzH22/9i96GqSgrhLcMb4gFINsaSlzSl0aGC7LUadf5UL vb2JYDG2rvqRP18ind2e73ksC5qLOtW04h+MBsafXWr+dhKcGW2z98Lg3pREMKt7rSfji0KnlkG Ura52bE0Lf+5Ord+o9wVONzIPHWL0KXZQAMxlryvpLa/uXWpQ9YpxjBkE= X-Received: by 2002:a05:7300:3205:b0:2be:837d:cc4d with SMTP id 5a478bee46e88-2c9309851dfmr1044767eec.5.1775003972186; Tue, 31 Mar 2026 17:39:32 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d::8bd]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c3c3bd9894sm11543019eec.4.2026.03.31.17.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 17:39:31 -0700 (PDT) From: Rosen Penev To: stable@vger.kernel.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xinhui Pan , David Airlie , Simona Vetter , Harry Wentland , Leo Li , Rodrigo Siqueira , Ray Wu , Wayne Lin , Mario Limonciello , Roman Li , Eric Yang , Tony Cheng , Mauro Rossi , =?UTF-8?q?Timur=20Krist=C3=B3f?= , Alex Hung , 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: [PATCHv2 for 6.12 02/10] drm/amd/amdgpu: disable ASPM in some situations Date: Tue, 31 Mar 2026 17:39:00 -0700 Message-ID: <20260401003908.3438-3-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260401003908.3438-1-rosenp@gmail.com> References: <20260401003908.3438-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