From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Len Brown <len.brown@intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Dasaratharaman Chandramouli
<dasaratharaman.chandramouli@intel.com>
Subject: Re: linux-next: build failure after merge of the pm tree
Date: Wed, 15 Apr 2015 12:30:19 +1000 [thread overview]
Message-ID: <20150415123019.069ab670@canb.auug.org.au> (raw)
In-Reply-To: <20150413142442.2f7107e5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2841 bytes --]
Hi Len,
On Mon, 13 Apr 2015 14:24:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Rafael,
>
> After merging the pm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from arch/x86/include/asm/msr.h:131:0,
> from arch/x86/include/asm/processor.h:20,
> from arch/x86/include/asm/thread_info.h:23,
> from include/linux/thread_info.h:54,
> from arch/x86/include/asm/preempt.h:6,
> from include/linux/preempt.h:18,
> from include/linux/smp.h:55,
> from include/linux/kernel_stat.h:4,
> from drivers/cpufreq/intel_pstate.c:14:
> drivers/cpufreq/intel_pstate.c: In function 'knl_get_turbo_pstate':
> drivers/cpufreq/intel_pstate.c:622:9: error: 'MSR_NHM_TURBO_RATIO_LIMIT' undeclared (first use in this function)
> rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);
> ^
> arch/x86/include/asm/paravirt.h:153:26: note: in definition of macro 'rdmsrl'
> val = paravirt_read_msr(msr, &_err); \
> ^
> drivers/cpufreq/intel_pstate.c:622:9: note: each undeclared identifier is reported only once for each function it appears in
> rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);
> ^
> arch/x86/include/asm/paravirt.h:153:26: note: in definition of macro 'rdmsrl'
> val = paravirt_read_msr(msr, &_err); \
> ^
>
> Caused by commit 6acfd09a439a ("tools/power turbostat: define and dump
> MSR_TURBO_RATIO_LIMIT2") interacting with commit b34ef932d79a
> ("intel_pstate: Knights Landing support"). This should have been
> resolved in commit 08fb40f3fbeb ("Merge branches 'powercap' and
> 'pm-tools'").
>
> I have added the following patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 13 Apr 2015 14:11:11 +1000
> Subject: [PATCH] intel_pstate: fix bad merge (MSR_NHM_TURBO_RATIO_LIMIT rename)
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/cpufreq/intel_pstate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 875154d5f60b..5ecd2689a8fc 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -619,7 +619,7 @@ static int knl_get_turbo_pstate(void)
> u64 value;
> int nont, ret;
>
> - rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);
> + rdmsrl(MSR_TURBO_RATIO_LIMIT, value);
> nont = core_get_max_pstate();
> ret = (((value) >> 8) & 0xFF);
> if (ret <= nont)
This is now required after the merge of the idle tree (since the code
was removed from the pm tree).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-04-15 2:30 UTC|newest]
Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 4:24 linux-next: build failure after merge of the pm tree Stephen Rothwell
2015-04-13 12:06 ` Rafael J. Wysocki
2015-04-15 2:30 ` Stephen Rothwell [this message]
-- 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-04-28 1:00 Stephen Rothwell
2022-04-28 3:07 ` Zhang Rui
2022-04-28 8:53 ` Zhang Rui
2022-04-28 8:56 ` Zhang Rui
2022-04-28 12:32 ` 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-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=20150415123019.069ab670@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dasaratharaman.chandramouli@intel.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/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).