From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A7E05CD4F59 for ; Thu, 5 Sep 2024 08:55:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B87A10E7F7; Thu, 5 Sep 2024 08:55:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="H4FS1hga"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8DCD710E805 for ; Thu, 5 Sep 2024 08:55:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725526538; x=1757062538; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=6F72mxGq/Qsog6jzv3lDYj+pqXEEAUPrejKf+LUdfv0=; b=H4FS1hga5hUiVFeao7FpQnuTyE0FQ/YBXJTah7bRz1AsYMWa7jahakWF j8v8VMViUGDzfRybCgbonY35Bnq+M93vFIe6uWr5MNqz8Eyetdqc5ROPi TD6F8ts8WAUdBQJG6FuDdxX4n/grbMokH0+KjwSoiZyfviViRrjjbq2sw OoSPKKpQtiG2WdbqrOMMVlOC+bZiVy7Xw4rq9DQGj8kGE2AGKIau3tRTm 7kn94U0v9H2W2L+G8viKXPc2Nwh48svrIlVAMyeIUcoy3WEqLujc5EgOo 3wI0RZdLoIy27NWe2sQi+WS6FehMb7vUW2mqthAa6PoP6z4iqVWVmk0rf w==; X-CSE-ConnectionGUID: N2a/lq8cTde/o+DdFl6ufw== X-CSE-MsgGUID: z2RfnJmNTdSE9oR9jB2bPw== X-IronPort-AV: E=McAfee;i="6700,10204,11185"; a="28116758" X-IronPort-AV: E=Sophos;i="6.10,204,1719903600"; d="scan'208";a="28116758" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2024 01:55:29 -0700 X-CSE-ConnectionGUID: pQB3oT5CSEWP9QMkY3gezw== X-CSE-MsgGUID: fDzXH5aPR2SyGoqb70uwVQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,204,1719903600"; d="scan'208";a="70163379" Received: from black.fi.intel.com ([10.237.72.28]) by fmviesa004.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2024 01:55:26 -0700 Date: Thu, 5 Sep 2024 11:55:23 +0300 From: Raag Jadav To: "Nilawar, Badal" Cc: jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tursulin@ursulin.net, linux@roeck-us.net, andi.shyti@linux.intel.com, andriy.shevchenko@linux.intel.com, intel-gfx@lists.freedesktop.org, linux-hwmon@vger.kernel.org, anshuman.gupta@intel.com, riana.tauro@intel.com, ashutosh.dixit@intel.com, karthik.poosa@intel.com Subject: Re: [PATCH v1] drm/i915/hwmon: expose package temperature Message-ID: References: <20240828044512.2710381-1-raag.jadav@intel.com> <07c01d49-aa9c-429e-bd4d-65cf2648329e@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <07c01d49-aa9c-429e-bd4d-65cf2648329e@intel.com> X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Sep 05, 2024 at 11:56:15AM +0530, Nilawar, Badal wrote: > > > On 28-08-2024 10:15, Raag Jadav wrote: > > Add hwmon support for temp1_input attribute, which will expose package > > temperature in millidegree Celsius. With this in place we can monitor > > package temperature using lm-sensors tool. > > > > $ sensors > > i915-pci-0300 > > Adapter: PCI adapter > > in0: 990.00 mV > > fan1: 1260 RPM > > temp1: +45.0°C > > power1: N/A (max = 35.00 W) > > energy1: 12.62 kJ > > > > Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11276 > > Signed-off-by: Raag Jadav > > --- > > .../ABI/testing/sysfs-driver-intel-i915-hwmon | 8 ++++ > > drivers/gpu/drm/i915/i915_hwmon.c | 39 +++++++++++++++++++ > > drivers/gpu/drm/i915/intel_mchbar_regs.h | 4 ++ > > 3 files changed, 51 insertions(+) > > > > diff --git a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon > > index be4141a7522f..a885e5316d02 100644 > > --- a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon > > +++ b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon > > @@ -83,3 +83,11 @@ Contact: intel-gfx@lists.freedesktop.org > > Description: RO. Fan speed of device in RPM. > > Only supported for particular Intel i915 graphics platforms. > > + > > +What: /sys/bus/pci/drivers/i915/.../hwmon/hwmon/temp1_input > > +Date: November 2024 > > +KernelVersion: 6.12 > > +Contact: intel-gfx@lists.freedesktop.org > > +Description: RO. GPU package temperature in millidegree Celsius. > > + > > + Only supported for particular Intel i915 graphics platforms. > > diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c > > index 17d30f6b84b0..9f1a2300510b 100644 > > --- a/drivers/gpu/drm/i915/i915_hwmon.c > > +++ b/drivers/gpu/drm/i915/i915_hwmon.c > > @@ -7,6 +7,7 @@ > > #include > > #include > > #include > > +#include > > #include "i915_drv.h" > > #include "i915_hwmon.h" > > @@ -32,6 +33,7 @@ > > struct hwm_reg { > > i915_reg_t gt_perf_status; > > + i915_reg_t pkg_temp; > > i915_reg_t pkg_power_sku_unit; > > i915_reg_t pkg_power_sku; > > i915_reg_t pkg_rapl_limit; > > @@ -280,6 +282,7 @@ static const struct attribute_group *hwm_groups[] = { > > }; > > static const struct hwmon_channel_info * const hwm_info[] = { > > + HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT), > > HWMON_CHANNEL_INFO(in, HWMON_I_INPUT), > > HWMON_CHANNEL_INFO(power, HWMON_P_MAX | HWMON_P_RATED_MAX | HWMON_P_CRIT), > > HWMON_CHANNEL_INFO(energy, HWMON_E_INPUT), > > @@ -310,6 +313,36 @@ static int hwm_pcode_write_i1(struct drm_i915_private *i915, u32 uval) > > POWER_SETUP_SUBCOMMAND_WRITE_I1, 0, uval); > > } > > +static umode_t > > +hwm_temp_is_visible(const struct hwm_drvdata *ddat, u32 attr) > > +{ > > + struct i915_hwmon *hwmon = ddat->hwmon; > > + > > + if (attr == hwmon_temp_input && i915_mmio_reg_valid(hwmon->rg.pkg_temp)) > > + return 0444; > > + > > + return 0; > > +} > > + > > +static int > > +hwm_temp_read(struct hwm_drvdata *ddat, u32 attr, long *val) > > +{ > > + struct i915_hwmon *hwmon = ddat->hwmon; > > + intel_wakeref_t wakeref; > > + u32 reg_val; > > + > > + if (attr == hwmon_temp_input) { > > + with_intel_runtime_pm(ddat->uncore->rpm, wakeref) > > + reg_val = intel_uncore_read(ddat->uncore, hwmon->rg.pkg_temp); > > + > > + /* HW register value is in degrees, convert to millidegrees. */ > > + *val = REG_FIELD_GET(TEMP_MASK, reg_val) * MILLIDEGREE_PER_DEGREE; > > + return 0; > > + } > > + > > + return -EOPNOTSUPP; > > +} > Let's try to have synergy between previous attribute, such as hwm_fan_input, > and this one. This one's simple enough to be inline IMHO. Besides, it's already in synergy with hwm_in_read() which has similar implementation. Raag