From: Zhang Rui <rui.zhang@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the pm tree
Date: Thu, 28 Apr 2022 16:53:50 +0800 [thread overview]
Message-ID: <d4c9337e369d2bd0a3a8c0bf9fffcc18937a08e8.camel@intel.com> (raw)
In-Reply-To: <20220428110030.7090a45b@canb.auug.org.au>
On Thu, 2022-04-28 at 11:00 +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the pm tree, today's linux-next build (x86_64
> allmodconfig)
> failed like this:
>
> drivers/idle/intel_idle.c: In function 'adl_idle_state_table_update':
> drivers/idle/intel_idle.c:1701:17: error: 'disable_promotion_to_c1e'
> undeclared (first use in this function)
> 1701 | disable_promotion_to_c1e = true;
> | ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/idle/intel_idle.c:1701:17: note: each undeclared identifier
> is reported only once for each function it appears in
> drivers/idle/intel_idle.c:1706:9: error: implicit declaration of
> function 'c1e_promotion_enable' [-Werror=implicit-function-
> declaration]
> 1706 | c1e_promotion_enable();
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/idle/intel_idle.c: At top level:
> drivers/idle/intel_idle.c:1854:13: error: conflicting types for
> 'c1e_promotion_enable'; have 'void(void)' [-Werror]
> 1854 | static void c1e_promotion_enable(void)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/idle/intel_idle.c:1854:13: error: static declaration of
> 'c1e_promotion_enable' follows non-static declaration
> drivers/idle/intel_idle.c:1706:9: note: previous implicit declaration
> of 'c1e_promotion_enable' with type 'void(void)'
> 1706 | c1e_promotion_enable();
> | ^~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 39c184a6a9a7 ("intel_idle: Fix the 'preferred_cstates' module
> parameter")
>
> interacting with commit
>
> cc6e234b8264 ("intel_idle: Add AlderLake support")
>
> Presumably this should have been fixed up in commit
>
> 55ecda6f25ef ("Merge branch 'intel-idle' into linux-next")
>
> I have used the pm tree from next-20220427 for today.
>
TBH, I'm not quite sure about the Fixes tag below.
Although commit 39c184a6a9a7 is merged later and breaks commit
cc6e234b8264, but given that commit 39c184a6a9a7 is for -rc material
and commit cc6e234b8264 and this patch are for next merge window, so I
still use the orginal ADL intel_idle commit for Fixes tag.
thanks,
rui
From 9b784d7f9ea5593a92eb6d616523b5f47464e981 Mon Sep 17 00:00:00 2001
From: Zhang Rui <rui.zhang@intel.com>
Date: Thu, 28 Apr 2022 09:37:10 +0800
Subject: [PATCH] intel_idle: fix C1E handling for AlderLake
commit cc6e234b8264 ("intel_idle: Add AlderLake support") disables the C1E
promotion using the 'disable_promotion_to_c1e' variable, but enables the
the C1E promotion by invoking c1e_promotion_enable() directly.
Then, commit 39c184a6a9a7 ("intel_idle: Fix the 'preferred_cstates' module
parameter") removes the 'disable_promotion_to_c1e' variable and introduces
a new tri-state 'c1e_promotion' variable that can be used for both
enabling and disabling C1E promotion, on a per CPU basis.
Switch to use the new 'c1e_promotion' variable to fix the build failure,
and also to do C1E promotion bit update on all CPUs.
Fixes: commit cc6e234b8264 ("intel_idle: Add AlderLake support")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/idle/intel_idle.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 7c081ed26b64..2de6e0a2d9a1 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -1698,12 +1698,12 @@ static void __init adl_idle_state_table_update(void)
cpuidle_state_table[1].flags |= CPUIDLE_FLAG_UNUSABLE;
/* Disable C1E by clearing the "C1E promotion" bit. */
- disable_promotion_to_c1e = true;
+ c1e_promotion = C1E_PROMOTION_DISABLE;
return;
}
end:
/* Make sure C1E is enabled by default */
- c1e_promotion_enable();
+ c1e_promotion = C1E_PROMOTION_ENABLE;
}
/**
--
2.17.1
next prev parent reply other threads:[~2022-04-28 8:53 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 1:00 linux-next: build failure after merge of the pm tree Stephen Rothwell
2022-04-28 3:07 ` Zhang Rui
2022-04-28 8:53 ` Zhang Rui [this message]
2022-04-28 8:56 ` Zhang Rui
2022-04-28 12:32 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2024-02-08 3:42 Stephen Rothwell
2024-01-24 0:51 Stephen Rothwell
2024-01-24 15:56 ` Wysocki, Rafael J
2023-12-18 23:37 Stephen Rothwell
2023-11-21 2:46 Stephen Rothwell
2023-07-14 1:00 Stephen Rothwell
2023-07-14 18:19 ` Wysocki, Rafael J
2023-07-14 18:50 ` Rafael J. Wysocki
2023-04-03 10:18 Stephen Rothwell
2023-04-03 1:25 Stephen Rothwell
2023-04-03 1:16 Stephen Rothwell
2023-04-03 1:06 Stephen Rothwell
2022-06-29 0:23 Stephen Rothwell
2022-06-29 13:01 ` Rafael J. Wysocki
2022-01-04 0:15 Stephen Rothwell
2022-01-04 7:29 ` Heiner Kallweit
2022-01-04 8:02 ` Stephen Rothwell
2022-01-04 14:43 ` Heiner Kallweit
2022-01-04 14:57 ` Rafael J. Wysocki
2021-12-01 23:28 Stephen Rothwell
2021-12-02 10:04 ` Daniel Lezcano
2021-12-03 16:50 ` Rafael J. Wysocki
2021-12-03 17:22 ` Daniel Lezcano
2021-02-05 0:51 Stephen Rothwell
[not found] ` <CAHp75VfiyAtxg+wqZ30kSzCfFFsLndLjzrUc1njZG0x6vQeyBQ@mail.gmail.com>
2021-02-05 11:15 ` Andy Shevchenko
2021-02-08 19:30 ` Rafael J. Wysocki
2021-02-08 19:47 ` Andy Shevchenko
2021-02-08 19:48 ` Andy Shevchenko
2021-02-09 14:32 ` Rafael J. Wysocki
2021-02-09 16:04 ` Andy Shevchenko
2020-12-09 9:57 Stephen Rothwell
2020-03-17 7:52 Stephen Rothwell
2020-03-18 11:44 ` Stephen Rothwell
2020-03-18 11:52 ` Colin Ian King
2020-03-18 12:18 ` Stephen Rothwell
2020-03-19 5:42 ` Stephen Rothwell
2020-03-19 9:32 ` Rafael J. Wysocki
2019-07-31 5:34 Stephen Rothwell
2019-07-31 10:27 ` Rafael J. Wysocki
2019-07-15 0:02 Stephen Rothwell
2019-07-15 9:44 ` Rafael J. Wysocki
2019-07-04 9:41 Stephen Rothwell
2019-07-04 9:48 ` Viresh Kumar
2019-07-04 10:33 ` Rafael J. Wysocki
2019-07-01 3:37 Stephen Rothwell
2019-07-01 7:48 ` Viresh Kumar
2018-05-24 14:16 Mark Brown
2016-09-14 4:27 Stephen Rothwell
2016-09-14 21:38 ` Rafael J. Wysocki
2016-07-22 1:56 Stephen Rothwell
2016-07-22 2:26 ` Steve Muckle
2016-07-22 12:08 ` Rafael J. Wysocki
2016-07-22 12:16 ` Fengguang Wu
2016-07-11 1:46 Stephen Rothwell
2016-07-11 4:48 ` Mika Westerberg
2016-07-11 5:29 ` Stephen Rothwell
2016-07-11 12:57 ` Rafael J. Wysocki
2016-06-02 2:12 Stephen Rothwell
2016-04-01 1:27 Stephen Rothwell
2016-04-01 20:51 ` Rafael J. Wysocki
2015-12-09 1:54 Stephen Rothwell
2015-12-09 2:00 ` Viresh Kumar
2015-11-01 6:57 Stephen Rothwell
2015-11-02 0:37 ` Rafael J. Wysocki
2015-04-13 4:24 Stephen Rothwell
2015-04-13 12:06 ` Rafael J. Wysocki
2015-04-15 2:30 ` Stephen Rothwell
2015-02-09 2:26 Stephen Rothwell
2015-02-09 2:53 ` Jiang Liu
2015-02-09 3:22 ` Rafael J. Wysocki
2015-02-09 5:36 ` Jiang Liu
2015-02-09 6:23 ` Lorenzo Pieralisi
2015-02-09 15:10 ` Rafael J. Wysocki
2015-02-09 15:21 ` Jiang Liu
2015-02-09 15:50 ` Lorenzo Pieralisi
2015-02-09 3:19 ` Rafael J. Wysocki
2015-02-09 3:53 ` Lorenzo Pieralisi
2014-08-11 1:57 Stephen Rothwell
2014-08-12 1:10 ` Rafael J. Wysocki
2013-12-18 1:00 Stephen Rothwell
2013-12-18 1:17 ` Rafael J. Wysocki
2013-07-05 1:24 Stephen Rothwell
2013-07-05 1:37 ` Rafael J. Wysocki
2013-03-03 23:58 Stephen Rothwell
2013-03-04 11:54 ` Rafael J. Wysocki
2013-01-30 8:48 Stephen Rothwell
2013-01-30 12:50 ` Rafael J. Wysocki
2013-01-14 0:03 Stephen Rothwell
2013-01-14 12:37 ` Rafael J. Wysocki
2013-01-14 13:22 ` Sedat Dilek
2013-01-14 18:54 ` Rafael J. Wysocki
2012-11-28 4:02 Stephen Rothwell
2012-11-28 9:32 ` Rafael J. Wysocki
2012-11-26 6:09 Stephen Rothwell
2012-11-26 10:10 ` Rafael J. Wysocki
2012-09-25 4:30 Stephen Rothwell
2012-09-25 11:51 ` Rafael J. Wysocki
2012-06-20 5:01 Stephen Rothwell
2012-06-20 22:54 ` Rafael J. Wysocki
2012-01-27 1:53 Stephen Rothwell
2012-01-27 9:35 ` Rafael J. Wysocki
2011-11-10 2:31 Stephen Rothwell
2011-11-10 12:11 ` Rafael J. Wysocki
2011-11-10 15:48 ` Tejun Heo
2011-11-11 12:27 ` Rafael J. Wysocki
2011-09-28 4:51 Stephen Rothwell
2011-09-28 5:11 ` Ming Lei
2011-09-28 13:58 ` Rafael J. Wysocki
2011-09-28 14:47 ` Ming Lei
2011-09-28 19:32 ` Rafael J. Wysocki
2011-09-29 1:32 ` Ming Lei
2011-09-29 9:26 ` Rafael J. Wysocki
2011-09-29 9:32 ` Ming Lei
2011-09-29 20:25 ` Rafael J. Wysocki
2011-09-28 14:47 ` Rafael J. Wysocki
2011-08-19 13:47 Stephen Rothwell
2011-08-19 21:31 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d4c9337e369d2bd0a3a8c0bf9fffcc18937a08e8.camel@intel.com \
--to=rui.zhang@intel.com \
--cc=artem.bityutskiy@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).