From patchwork Mon Oct 24 11:31:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8354 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp391669wru; Mon, 24 Oct 2022 04:33:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM53YIgfjl1GkdN62dE39rEKGqRu7//AcJk4P9G74rE1EJs1lvUsBFyZB9mri552UTW13d5U X-Received: by 2002:a63:5702:0:b0:44b:290:f24f with SMTP id l2-20020a635702000000b0044b0290f24fmr27861111pgb.558.1666611221686; Mon, 24 Oct 2022 04:33:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666611221; cv=none; d=google.com; s=arc-20160816; b=ATBOryYARMZ+i3gPZTwK9Lw+EeLhgWsQQ7IMU3O5h3YOnAje5QOoeMKU/ty8gL9Na7 comNYE/M8iYwKa8/wVoj7eq4KpIZ26m3SVC2C/RNMUMOad3xhm6xF7MAkzjrUxFu3iKr mdaj/iHXfL2c5QUY9xz4DEDayVswbuCLq6mjXfgaXYvbWEm46I+9K8OvvPQEPUWsweX2 vtWYrOlQoSooNL91zD7LEUlGgOVvk3xPWeCa6yKUgxgqpIMUAZHCRX05x/blAH5XZ0xu XVkEy6ban/tjW89cb0SxkAShkej0aRcKavAp6+NetlsSrrxoqegUqrQ2OSOqXeMG9YNw g7Gg== 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=zpDZvMvVKTACofpHR7Eb1m8EEHASUSUsgzrV/AXtgmY=; b=dQJE1X/rECMPTaXnaYvlUaw50CH17WQ7a7W2hWkB691IAxcjS3NFWbMPvRmlPBr6lC x2+WBi5ejOQj0B8whQK005KLPNWEfibwINgZDC5Fr87LLfvkFqlkcE9C/Rmyv0S3L7cv J/HFzmO/LvPomWcwPHCbfs2fjoq/D0oMmSchPpjDatQTlgDZk4BvnjgWdx7WS1l2wZlj CPlF+uPrfU9a4aXJtI3sxy1IQ+STIlQtZtnnnGQfd+lga7zD0MvAN/p6uqdFtPWChwk/ Jg8SvCoJQbS0/sCrVjiwPr4nKCb7p/BzTBEzn4eBU5U5OoRLSWGo7GWeIb0AtnjmdmR4 /Ezw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RBBJJXLx; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h38-20020a63f926000000b0046ed15b5318si9034074pgi.98.2022.10.24.04.33.27; Mon, 24 Oct 2022 04:33: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=RBBJJXLx; 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 S230285AbiJXLcB (ORCPT + 99 others); Mon, 24 Oct 2022 07:32:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230272AbiJXLb5 (ORCPT ); Mon, 24 Oct 2022 07:31:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F88955C58; Mon, 24 Oct 2022 04:31:52 -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 7BB6C6125D; Mon, 24 Oct 2022 11:31:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F441C433C1; Mon, 24 Oct 2022 11:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611110; bh=pA708DfDAlUs9/8gMiAzDR60U/q1IY8dcr1tgyu+yFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RBBJJXLxWGB5ZKRU7hJnDalV/cSFwKv/BvSh361z4uoYcDV2ORhZl81wlprhK6jHv rTnZNPZF7Z59sis5ZJBLgrl5gkXR5/mj8sXhXLZyxJ34s9nxE9V4x/vkB84jXP1Dk3 WnfUqc9KxzzPyj78JHOQtSdhQY7sV/0LcpSmqyis= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tim Huang , Mario Limonciello , Alex Deucher Subject: [PATCH 6.0 13/20] drm/amd/pm: update SMU IP v13.0.4 driver interface version Date: Mon, 24 Oct 2022 13:31:15 +0200 Message-Id: <20221024112934.963501610@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112934.415391158@linuxfoundation.org> References: <20221024112934.415391158@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747568528411281129?= X-GMAIL-MSGID: =?utf-8?q?1747568528411281129?= From: Tim Huang commit 853fdb49160e9c30674fd8e4a2eabc06bf70b13a upstream. Update the SMU driver interface version to V7. Signed-off-by: Tim Huang Reviewed-by: Mario Limonciello Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 6.0.x Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h | 17 ++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_4.h @@ -27,7 +27,7 @@ // *** IMPORTANT *** // SMU TEAM: Always increment the interface version if // any structure is changed in this file -#define PMFW_DRIVER_IF_VERSION 5 +#define PMFW_DRIVER_IF_VERSION 7 typedef struct { int32_t value; @@ -163,8 +163,8 @@ typedef struct { uint16_t DclkFrequency; //[MHz] uint16_t MemclkFrequency; //[MHz] uint16_t spare; //[centi] - uint16_t UvdActivity; //[centi] uint16_t GfxActivity; //[centi] + uint16_t UvdActivity; //[centi] uint16_t Voltage[2]; //[mV] indices: VDDCR_VDD, VDDCR_SOC uint16_t Current[2]; //[mA] indices: VDDCR_VDD, VDDCR_SOC @@ -199,6 +199,19 @@ typedef struct { uint16_t DeviceState; uint16_t CurTemp; //[centi-Celsius] uint16_t spare2; + + uint16_t AverageGfxclkFrequency; + uint16_t AverageFclkFrequency; + uint16_t AverageGfxActivity; + uint16_t AverageSocclkFrequency; + uint16_t AverageVclkFrequency; + uint16_t AverageVcnActivity; + uint16_t AverageDRAMReads; //Filtered DF Bandwidth::DRAM Reads + uint16_t AverageDRAMWrites; //Filtered DF Bandwidth::DRAM Writes + uint16_t AverageSocketPower; //Filtered value of CurrentSocketPower + uint16_t AverageCorePower; //Filtered of [sum of CorePower[8]]) + uint16_t AverageCoreC0Residency[8]; //Filtered of [average C0 residency % per core] + uint32_t MetricsCounter; //Counts the # of metrics table parameter reads per update to the metrics table, i.e. if the metrics table update happens every 1 second, this value could be up to 1000 if the smu collected metrics data every cycle, or as low as 0 if the smu was asleep the whole time. Reset to 0 after writing. } SmuMetrics_t; typedef struct {