From patchwork Fri Oct 11 00:36:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 13831627 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D04C828FF; Fri, 11 Oct 2024 00:36:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728607007; cv=none; b=AlegcHwkcwp4jEZD/RuRgQsZ/oPlqsYxvz7c0EL/92pS+JpZfMESf8oICjQ9X2yEX1Hl5QPjT+nrB9j8F4FFdUmUvX+M93Z2SuyJbGd6omfMy8vQPDsrGeF/9y3u9Q7gi/CPZR5m1EzE3jtP9e9ll/FD5/HARy/at3GyW4PvhyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728607007; c=relaxed/simple; bh=E0OSVMmcSEdiYVrWimSgTaqNzfUCX+2YnRAyIdQqQOY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=FyN2nIyjIto5HgEMlO7LrVANgtxVyknMhCxBRChQav1qWlPn3uMD553MTcPMsdUvgsy33yPJMuAFNyPEI9nOr0MThXEcZaLLbEBjhoIdK86TNRD4xwY2fwtsHx4hinpMAev40FyogBt07c4jv2Fk/bYry81d986Rew6YzJ/TEMo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=g5mvIu1M; arc=none smtp.client-ip=198.175.65.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="g5mvIu1M" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728607006; x=1760143006; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=E0OSVMmcSEdiYVrWimSgTaqNzfUCX+2YnRAyIdQqQOY=; b=g5mvIu1MvubQ49S+0MdjHVn6btTv9mDbPa/qVR2rLoozyt4w0Uss5VXA KdqVbOp4qSQtoeP1rTcLhUxYUBQZKZ6vWDWyN9OjVO5iLEZzlf5ARwpiP Ky+p/S0VHryydHSwAYYzcmHBuKxGbI/dOxti7V2/Hu2THrDbTjUJ3R+wk 6CDBFkmtjDvPqOb708Pk5ryQhGvQAS+/ktW1ntz6ipf8I487g0OG5DI/j IW3rhLq80QiDQWqopIML8hpy64e9NW0vlNy4RYCZePEqO1HHDEESJabGy 4pgX4XkI0FXakAgS69ngC9WBgsYXCoec7FTFPVvvP7wDtfKXFPNysmtg8 A==; X-CSE-ConnectionGUID: wrzY1YTFRGOQSnNQE5M6sg== X-CSE-MsgGUID: JYWCpNDDSwK6bn29uKmzUA== X-IronPort-AV: E=McAfee;i="6700,10204,11221"; a="50535452" X-IronPort-AV: E=Sophos;i="6.11,194,1725346800"; d="scan'208";a="50535452" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2024 17:36:45 -0700 X-CSE-ConnectionGUID: MdxVHel6TMWy1GADZDhLKA== X-CSE-MsgGUID: OawCZuxeSwaGFW7ovrosUw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,194,1725346800"; d="scan'208";a="76399769" Received: from cmdeoliv-mobl.amr.corp.intel.com (HELO debox1-desk4.lan) ([10.125.111.90]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2024 17:36:44 -0700 From: "David E. Box" To: david.e.box@linux.intel.com, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, rjw@rjwysocki.net, srinivas.pandruvada@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH V2 1/2] platform/x86/intel/pmc: Refactor platform resume functions to use cnl_resume() Date: Thu, 10 Oct 2024 17:36:38 -0700 Message-ID: <20241011003640.1613812-1-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Several platform resume functions currently call pmc_core_send_ltr_ignore() and pmc_core_resume_common(), both of which are already called by cnl_resume(). Simplify the code by having these functions call cnl_resume() directly. Signed-off-by: David E. Box --- V2 - New patch. Split from V1 drivers/platform/x86/intel/pmc/arl.c | 3 +-- drivers/platform/x86/intel/pmc/lnl.c | 3 +-- drivers/platform/x86/intel/pmc/mtl.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) base-commit: 9852d85ec9d492ebef56dc5f229416c925758edc diff --git a/drivers/platform/x86/intel/pmc/arl.c b/drivers/platform/x86/intel/pmc/arl.c index e10527c4e3e0..05dec4f5019f 100644 --- a/drivers/platform/x86/intel/pmc/arl.c +++ b/drivers/platform/x86/intel/pmc/arl.c @@ -687,9 +687,8 @@ static void arl_d3_fixup(void) static int arl_resume(struct pmc_dev *pmcdev) { arl_d3_fixup(); - pmc_core_send_ltr_ignore(pmcdev, 3, 0); - return pmc_core_resume_common(pmcdev); + return cnl_resume(pmcdev); } int arl_core_init(struct pmc_dev *pmcdev) diff --git a/drivers/platform/x86/intel/pmc/lnl.c b/drivers/platform/x86/intel/pmc/lnl.c index e7a8077d1a3e..be029f12cdf4 100644 --- a/drivers/platform/x86/intel/pmc/lnl.c +++ b/drivers/platform/x86/intel/pmc/lnl.c @@ -546,9 +546,8 @@ static void lnl_d3_fixup(void) static int lnl_resume(struct pmc_dev *pmcdev) { lnl_d3_fixup(); - pmc_core_send_ltr_ignore(pmcdev, 3, 0); - return pmc_core_resume_common(pmcdev); + return cnl_resume(pmcdev); } int lnl_core_init(struct pmc_dev *pmcdev) diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c index 91f2fa728f5c..fc6a89b8979f 100644 --- a/drivers/platform/x86/intel/pmc/mtl.c +++ b/drivers/platform/x86/intel/pmc/mtl.c @@ -988,9 +988,8 @@ static void mtl_d3_fixup(void) static int mtl_resume(struct pmc_dev *pmcdev) { mtl_d3_fixup(); - pmc_core_send_ltr_ignore(pmcdev, 3, 0); - return pmc_core_resume_common(pmcdev); + return cnl_resume(pmcdev); } int mtl_core_init(struct pmc_dev *pmcdev) From patchwork Fri Oct 11 00:36:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 13831628 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3C5C10F9; Fri, 11 Oct 2024 00:36:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728607009; cv=none; b=GpNq5MwiBSM3lESfIjCJyKxywwjrngIHKmKdlQN1EXHbqX9JQywDoBZ4yICnDVmA6TjjU0oO9VhGeChTeLZ0rZq/YPW8dtsswwbCO2s4Rf7ESR0GSdJL7YT+UR6byo4zCeV2A2LKzv15IIUKzyF2U8kiphDdHRN8t8iDzWZXPvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728607009; c=relaxed/simple; bh=Z6CVqcG557SUWaq/QGPMxq8yHGcM0g/bHCQmbZdBjf0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BnnkIAY03/WjdopfIXpRm6v+vNzvrvb2J3vmZsZFa4d0JRzCn46cR1KCei5ytWxnV0+GAZysOeI/paVKbKRBAx2tTjItxQAcBg9b71ld9IiUpEZtpuO1zaoDriXgX/JfD1BPsSjX8if0L8Pfx5hnfskCrC9qXAvRs1AYdbsSRas= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fdkRLejR; arc=none smtp.client-ip=198.175.65.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fdkRLejR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728607007; x=1760143007; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Z6CVqcG557SUWaq/QGPMxq8yHGcM0g/bHCQmbZdBjf0=; b=fdkRLejRPfZKYfePYsq2ugpgr82ahLqtR4cImTXYsA8m+7pn98o8mh8g Wrz49M/VFbiwtRGBCjRvKZuKBcfaLwO0KJhQd0BF/VD90lC4fnh1AnUxg W+xVLijot5d5AEOhPxiXPtRS/W7qHl2eY3p65093dh5N9XX/IfqYRuLw7 o69s0HfnA4OO54wanfPMtpGrZ5NnVMtLdvStjKBSymGsn302lneBdHGZV h25+u0xiogTfcvvtAkn8ozjEgoR55aE3emnYjr0ysWLwyONX0WMAEZW4u VUzz1erRfUJIM+/1N9rY6DzageyYwyOEVVztmyat3gKh7wmNEKTgullvk Q==; X-CSE-ConnectionGUID: Va2oUk2vTJSAJiXx/XrYCg== X-CSE-MsgGUID: 6fMN9eTmStWHvv6CmNBXiw== X-IronPort-AV: E=McAfee;i="6700,10204,11221"; a="50535457" X-IronPort-AV: E=Sophos;i="6.11,194,1725346800"; d="scan'208";a="50535457" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2024 17:36:45 -0700 X-CSE-ConnectionGUID: 3VHoaaQbTSam826OQ4wNuw== X-CSE-MsgGUID: bFSnIXywRKyRKlq5jo8OYQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,194,1725346800"; d="scan'208";a="76399770" Received: from cmdeoliv-mobl.amr.corp.intel.com (HELO debox1-desk4.lan) ([10.125.111.90]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Oct 2024 17:36:45 -0700 From: "David E. Box" To: david.e.box@linux.intel.com, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, rjw@rjwysocki.net, srinivas.pandruvada@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH V2 2/2] platform/x86/intel/pmc: Disable C1 auto-demotion during suspend Date: Thu, 10 Oct 2024 17:36:39 -0700 Message-ID: <20241011003640.1613812-2-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241011003640.1613812-1-david.e.box@linux.intel.com> References: <20241011003640.1613812-1-david.e.box@linux.intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On some platforms, aggressive C1 auto-demotion may lead to failure to enter the deepest C-state during suspend-to-idle, causing high power consumption. To prevent this, disable C1 auto-demotion during suspend and re-enable on resume. Signed-off-by: David E. Box --- V2 - Remove #define DEBUG - Move refactor of cnl_resume() to separate patch - Use smp_call_function() to disable and restore C1_AUTO_DEMOTE - Add comment that the MSR is per core, not per package. - Add comment that the online cpu mask remains unchanged during suspend due to frozen userspace. drivers/platform/x86/intel/pmc/cnp.c | 53 ++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/drivers/platform/x86/intel/pmc/cnp.c b/drivers/platform/x86/intel/pmc/cnp.c index 513c02670c5a..f12d4f0f9e93 100644 --- a/drivers/platform/x86/intel/pmc/cnp.c +++ b/drivers/platform/x86/intel/pmc/cnp.c @@ -8,6 +8,8 @@ * */ +#include +#include #include "core.h" /* Cannon Lake: PGD PFET Enable Ack Status Register(s) bitmap */ @@ -206,8 +208,52 @@ const struct pmc_reg_map cnp_reg_map = { .etr3_offset = ETR3_OFFSET, }; + +/* + * Disable C1 auto-demotion + * + * Aggressive C1 auto-demotion may lead to failure to enter the deepest C-state + * during suspend-to-idle, causing high power consumption. To prevent this, we + * disable C1 auto-demotion during suspend and re-enable on resume. + * + * Note that, although MSR_PKG_CST_CONFIG_CONTROL has 'package' in its name, it + * is actually a per-core MSR on client platforms, affecting only a single CPU. + * Therefore, it must be configured on all online CPUs. The online cpu mask is + * unchanged during the phase of suspend/resume as user space is frozen. + */ + +static DEFINE_PER_CPU(u64, pkg_cst_config); + +static void disable_c1_auto_demote(void *unused) +{ + int cpunum = smp_processor_id(); + u64 val; + + rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, val); + per_cpu(pkg_cst_config, cpunum) = val; + val &= ~NHM_C1_AUTO_DEMOTE; + wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, val); + pr_debug("%s: cpu:%d cst %llx\n", __func__, cpunum, val); +} + +static void restore_c1_auto_demote(void *unused) +{ + int cpunum = smp_processor_id(); + + pr_debug("%s: cpu:%d cst %llx\n", __func__, cpunum, + per_cpu(pkg_cst_config, cpunum)); + wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, per_cpu(pkg_cst_config, cpunum)); +} + void cnl_suspend(struct pmc_dev *pmcdev) { + if (!pm_suspend_via_firmware()) { + preempt_disable(); + disable_c1_auto_demote(NULL); + smp_call_function(disable_c1_auto_demote, NULL, 0); + preempt_enable(); + } + /* * Due to a hardware limitation, the GBE LTR blocks PC10 * when a cable is attached. To unblock PC10 during suspend, @@ -218,6 +264,13 @@ void cnl_suspend(struct pmc_dev *pmcdev) int cnl_resume(struct pmc_dev *pmcdev) { + if (!pm_suspend_via_firmware()) { + preempt_disable(); + restore_c1_auto_demote(NULL); + smp_call_function(restore_c1_auto_demote, NULL, 0); + preempt_enable(); + } + pmc_core_send_ltr_ignore(pmcdev, 3, 0); return pmc_core_resume_common(pmcdev);