Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp586847iog; Mon, 13 Jun 2022 08:38:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vsxv6N/et+xGCxzXcK36mJzvztOLUyX6nlaYDiahO/JbfQkoQeTsE3hXAL0o/EPwKhPBVo X-Received: by 2002:a05:6402:524c:b0:42e:320:bfbc with SMTP id t12-20020a056402524c00b0042e0320bfbcmr342105edd.65.1655134721554; Mon, 13 Jun 2022 08:38:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655134721; cv=none; d=google.com; s=arc-20160816; b=jovs7niDijTUflLMEwwL3MqxKQqKHuye8l6WdwUJo89Hdn5VIRLOu60F83V+P5Ud20 xS30yfXuj8DLpa/XVprWY7K/r88oQerZbZdeN4ABrz9wHKBcffSAT6ubc6XV3c3bT58z GuF6P0iiHVbYpZ0dgFZRjUHQBr57j8UGcOzqgPlX+kZHvVLg5TgFsr8Et1Zoqix06KY6 9fK1h/+anXImJg0BHpDMncyiNUg1/HruanLV1JyKRl61BXaVtg5eGLHb5OEflllwGX92 yLclZ61nAaoSEo+M+QI8yLUX/u0YiI0Xz0WInU0ICmKS3W+wUWbHHVN0G1uXDUpFl6xF Dl+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Xg57fnQEAcYJRBws/IOJ/cx1G9Yjr9bb8+4e6ELdUhI=; b=lb0LdCcWS7jDYPAMFKKVf7oxV/fs47ih7JKt/ZYk2YYoXV0Ghm90amLsdPFPFXLUBJ 3FKvlfmtTmemHAz6D4SLXZe6LSGtn531xnX/v/7iNoWGygKAafVeHGbH19aiLTp9Kl8c gQDMYXxQ9ctN0hB7d6A8E2N0RaiVJpyMNbsChIHhpogf/w9LhmF3V8ce30x870MwpQB7 fvaexfDxhiKWbeQWIHLlKMzDH/LSeks/Klx7Y6Rb4VkMbtJxco6WWXgJZ5VY3uWd6q9e Tw09aRu1xSWRKTQ12YMcm0K1ZQHr4H8Vray3qrNPKB+EWbu4icEimgU3/8mPzURSwx/T kvjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ipqOgMCG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l11-20020a056402254b00b0042de68c0303si9033786edb.628.2022.06.13.08.38.16; Mon, 13 Jun 2022 08:38:41 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ipqOgMCG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376557AbiFMNWC (ORCPT + 99 others); Mon, 13 Jun 2022 09:22:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376753AbiFMNT3 (ORCPT ); Mon, 13 Jun 2022 09:19:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FDE164D15; Mon, 13 Jun 2022 04:22:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 91F7460EAD; Mon, 13 Jun 2022 11:22:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3746C34114; Mon, 13 Jun 2022 11:22:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655119339; bh=V+2fr26x6mH1tjdXZJG+wmFJjeJtUEdbGyA7Ms03VpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ipqOgMCGdknEUPqfAg4BoMs6kAjFhEk298rSs0cARcpiTFyCFEXg101GFML8TVW1g VNdkyB1Gct90GLBGBHOSy8KGYPQEnJrihNFG5tdZ2bzJivzvr3H1PbB+Ub30WAU9tw pPssVgx8kRiJbzJi6s4eByXNoTsS3ygNxfkLZ9Cg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lijo Lazar , Yang Wang , Alex Deucher , Sasha Levin Subject: [PATCH 5.15 200/247] drm/amd/pm: Fix missing thermal throttler status Date: Mon, 13 Jun 2022 12:11:42 +0200 Message-Id: <20220613094929.012909765@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094922.843438024@linuxfoundation.org> References: <20220613094922.843438024@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,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: X-Mailing-List: linux-kernel@vger.kernel.org From: Lijo Lazar [ Upstream commit b0f4d663fce6a4232d3c20ce820f919111b1c60b ] On aldebaran, when thermal throttling happens due to excessive GPU temperature, the reason for throttling event is missed in warning message. This patch fixes it. Signed-off-by: Lijo Lazar Reviewed-by: Yang Wang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c index c9cfeb094750..d0c6b864d00a 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c @@ -1627,6 +1627,7 @@ static const struct throttling_logging_label { uint32_t feature_mask; const char *label; } logging_label[] = { + {(1U << THROTTLER_TEMP_GPU_BIT), "GPU"}, {(1U << THROTTLER_TEMP_MEM_BIT), "HBM"}, {(1U << THROTTLER_TEMP_VR_GFX_BIT), "VR of GFX rail"}, {(1U << THROTTLER_TEMP_VR_MEM_BIT), "VR of HBM rail"}, -- 2.35.1