[PATCH 1/2] perf/x86/rapl: Add support for Intel Arrow Lake

[PATCH 1/2] perf/x86/rapl: Add support for Intel Arrow Lake

[Zhang Rui]

Arrow Lake RAPL support is the same as previous Sky Lake.
Add Arrow Lake model for RAPL.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 arch/x86/events/rapl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index fb2b1961e5a3..6bfb78d5b37e 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -808,6 +808,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&model_skl),
 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&model_skl),
 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&model_skl),
+	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H,		&model_skl),
+	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE,		&model_skl),
 	{},
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);
-- 
2.34.1

[PATCH 2/2] perf/x86/rapl: Add support for Intel Lunar Lake

[Zhang Rui]

Lunar Lake RAPL support is the same as previous Sky Lake.
Add Lunar Lake model for RAPL.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 arch/x86/events/rapl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 6bfb78d5b37e..ebb67a243f0f 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -810,6 +810,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&model_skl),
 	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H,		&model_skl),
 	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE,		&model_skl),
+	X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M,		&model_skl),
 	{},
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);
-- 
2.34.1

[tip: perf/core] perf/x86/rapl: Add support for Intel Lunar Lake

[tip-bot2 for Zhang Rui]

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     acf68d98cae8a60dc4af2e9feaaa799bf0aa5c04
Gitweb:        https://git.kernel.org/tip/acf68d98cae8a60dc4af2e9feaaa799bf0aa5c04
Author:        Zhang Rui <rui.zhang@intel.com>
AuthorDate:    Wed, 10 Apr 2024 20:45:54 +08:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 10 Apr 2024 14:48:18 +02:00

perf/x86/rapl: Add support for Intel Lunar Lake

Lunar Lake RAPL support is the same as previous Sky Lake.
Add Lunar Lake model for RAPL.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240410124554.448987-2-rui.zhang@intel.com
---
 arch/x86/events/rapl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 00bb6ea..ca5f687 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -808,6 +808,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&model_skl),
 	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H,		&model_skl),
 	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE,		&model_skl),
+	X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M,		&model_skl),
 	{},
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);

[tip: perf/core] perf/x86/rapl: Add support for Intel Arrow Lake

[tip-bot2 for Zhang Rui]

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     fb70fe74beaa809e13e7f469b116d54ef7cd19e9
Gitweb:        https://git.kernel.org/tip/fb70fe74beaa809e13e7f469b116d54ef7cd19e9
Author:        Zhang Rui <rui.zhang@intel.com>
AuthorDate:    Wed, 10 Apr 2024 20:45:53 +08:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 10 Apr 2024 14:48:18 +02:00

perf/x86/rapl: Add support for Intel Arrow Lake

Arrow Lake RAPL support is the same as previous Sky Lake.
Add Arrow Lake model for RAPL.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240410124554.448987-1-rui.zhang@intel.com
---
 arch/x86/events/rapl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 8ef08b5..00bb6ea 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -806,6 +806,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
 	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&model_skl),
 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&model_skl),
 	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&model_skl),
+	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H,		&model_skl),
+	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE,		&model_skl),
 	{},
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);

Re: [PATCH 1/2] perf/x86/rapl: Add support for Intel Arrow Lake

[Liang, Kan]

On 2024-04-10 8:45 a.m., Zhang Rui wrote:
> Arrow Lake RAPL support is the same as previous Sky Lake.
> Add Arrow Lake model for RAPL.
> 
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>

The series looks good to me.

Reviewed-by: Kan Liang <kan.liang@linux.intel.com>

Thanks,
Kan
> ---
>  arch/x86/events/rapl.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
> index fb2b1961e5a3..6bfb78d5b37e 100644
> --- a/arch/x86/events/rapl.c
> +++ b/arch/x86/events/rapl.c
> @@ -808,6 +808,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
>  	X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S,	&model_skl),
>  	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE,		&model_skl),
>  	X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L,	&model_skl),
> +	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H,		&model_skl),
> +	X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE,		&model_skl),
>  	{},
>  };
>  MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);