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 D5518C07545 for ; Tue, 24 Oct 2023 18:48:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DE4D10E471; Tue, 24 Oct 2023 18:48:54 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F46E10E471 for ; Tue, 24 Oct 2023 18:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698173333; x=1729709333; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=5Zm8CKTJfVYV2t0aRhdkqi7b4PkC1YUGrClMQrdnlxc=; b=oF1H+0vqsDMHITmIDhZJJvqCE57MpzUhrjzzKQ9nF/ZWmIgwPoeVEgYZ d9lI4zUgCGa/IG0iH5e78Bmcs/OhVVqCwQ45BbhwurMVleFeBQq26DXea vAv+oO12fKVvZkCRdBImilPOgWZKeeS+y0FS4lCVCZOdeq4ttETUJzkcv LNPpx85ZfMVHGBe2gprAZqMbrDXFSkgGr+QBO65olEi8h1mtuz9lxJTlR evow+cNKPZM2AN03RhyjDBRFDvxlWwUB+/xsNlnbUB8Ihvt0oG7Cedb9n Sa+ySInmnk2+MGBq71xWC3II1vqbMFHbATwvKi8GFf2gipGyhHSBMbIzV A==; X-IronPort-AV: E=McAfee;i="6600,9927,10873"; a="377515064" X-IronPort-AV: E=Sophos;i="6.03,248,1694761200"; d="scan'208";a="377515064" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2023 11:48:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10873"; a="875167071" X-IronPort-AV: E=Sophos;i="6.03,248,1694761200"; d="scan'208";a="875167071" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmsmga002.fm.intel.com with SMTP; 24 Oct 2023 11:48:37 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 24 Oct 2023 21:48:36 +0300 Date: Tue, 24 Oct 2023 21:48:36 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: "Rafael J. Wysocki" Message-ID: References: <20231004183455.27797-1-ville.syrjala@linux.intel.com> <6d207eef73fb2ad32264921ae7d1a536b6b8da61.camel@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH] powercap: intel_rapl: Don't warn about BIOS locked limits during resume 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: , Cc: "linux-pm@vger.kernel.org" , "intel-gfx@lists.freedesktop.org" , "Wysocki, Rafael J" , "linux-kernel@vger.kernel.org" , "Pandruvada, Srinivas" , "Zhang, Rui" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Oct 24, 2023 at 08:31:34PM +0200, Rafael J. Wysocki wrote: > On Tue, Oct 24, 2023 at 7:11 PM Ville Syrjälä > wrote: > > > > On Wed, Oct 04, 2023 at 09:59:47PM +0300, Ville Syrjälä wrote: > > > On Wed, Oct 04, 2023 at 06:45:22PM +0000, Pandruvada, Srinivas wrote: > > > > On Wed, 2023-10-04 at 21:34 +0300, Ville Syrjala wrote: > > > > > From: Ville Syrjälä > > > > > > > > > > Restore enough of the original behaviour to stop spamming > > > > > dmesg with warnings about BIOS locked limits when trying > > > > > to restore them during resume. > > > > > > > > > > This still doesn't 100% match the original behaviour > > > > > as we no longer attempt to blindly restore the BIOS locked > > > > > limits. No idea if that makes any difference in practice. > > > > > > > > > I lost the context here. Why can't we simply change pr_warn to pr_debug > > > > here? > > > > > > I presume someone wanted to make it pr_warn() for a reason. > > > I don't mind either way. > > > > Ping. Can someone make a decision on how this should get fixed > > so we get this moving forward? > > I thought we were going to replace the pr_warn() with pr_debug(). I didn't get any answer whether anyone wants to keep the pr_warn(). If everyone is happy with pr_debug() that then I can send a patch for it. > > > > > > Cc: Zhang Rui > > > > > Cc: Wang Wendy > > > > > Cc: Rafael J. Wysocki > > > > > Cc: Srinivas Pandruvada > > > > > Fixes: 9050a9cd5e4c ("powercap: intel_rapl: Cleanup Power Limits > > > > > support") > > > > > Signed-off-by: Ville Syrjälä > > > > > --- > > > > > drivers/powercap/intel_rapl_common.c | 28 ++++++++++++++++++++------ > > > > > -- > > > > > 1 file changed, 20 insertions(+), 8 deletions(-) > > > > > > > > > > diff --git a/drivers/powercap/intel_rapl_common.c > > > > > b/drivers/powercap/intel_rapl_common.c > > > > > index 40a2cc649c79..9a6a40c83f82 100644 > > > > > --- a/drivers/powercap/intel_rapl_common.c > > > > > +++ b/drivers/powercap/intel_rapl_common.c > > > > > @@ -882,22 +882,34 @@ static int rapl_read_pl_data(struct rapl_domain > > > > > *rd, int pl, > > > > > return rapl_read_data_raw(rd, prim, xlate, data); > > > > > } > > > > > > > > > > -static int rapl_write_pl_data(struct rapl_domain *rd, int pl, > > > > > - enum pl_prims pl_prim, > > > > > - unsigned long long value) > > > > > +static int rapl_write_pl_data_nowarn(struct rapl_domain *rd, int pl, > > > > > + enum pl_prims pl_prim, > > > > > + unsigned long long value) > > > > > { > > > > > enum rapl_primitives prim = get_pl_prim(rd, pl, pl_prim); > > > > > > > > > > if (!is_pl_valid(rd, pl)) > > > > > return -EINVAL; > > > > > > > > > > - if (rd->rpl[pl].locked) { > > > > > - pr_warn("%s:%s:%s locked by BIOS\n", rd->rp->name, > > > > > rd->name, pl_names[pl]); > > > > > + if (rd->rpl[pl].locked) > > > > > return -EACCES; > > > > > - } > > > > > > > > > > return rapl_write_data_raw(rd, prim, value); > > > > > } > > > > > + > > > > > +static int rapl_write_pl_data(struct rapl_domain *rd, int pl, > > > > > + enum pl_prims pl_prim, > > > > > + unsigned long long value) > > > > > +{ > > > > > + int ret; > > > > > + > > > > > + ret = rapl_write_pl_data_nowarn(rd, pl, pl_prim, value); > > > > > + if (ret == -EACCES) > > > > > + pr_warn("%s:%s:%s locked by BIOS\n", rd->rp->name, > > > > > rd->name, pl_names[pl]); > > > > > + > > > > > + return ret; > > > > > +} > > > > > + > > > > > /* > > > > > * Raw RAPL data stored in MSRs are in certain scales. We need to > > > > > * convert them into standard units based on the units reported in > > > > > @@ -1634,8 +1646,8 @@ static void power_limit_state_restore(void) > > > > > rd = power_zone_to_rapl_domain(rp->power_zone); > > > > > for (i = POWER_LIMIT1; i < NR_POWER_LIMITS; i++) > > > > > if (rd->rpl[i].last_power_limit) > > > > > - rapl_write_pl_data(rd, i, PL_LIMIT, > > > > > - rd- > > > > > >rpl[i].last_power_limit); > > > > > + rapl_write_pl_data_nowarn(rd, i, > > > > > PL_LIMIT, > > > > > + rd- > > > > > >rpl[i].last_power_limit); > > > > > } > > > > > cpus_read_unlock(); > > > > > } > > > > > > > > > > -- -- Ville Syrjälä Intel