perf/x86/uncore: Correct the number of CHAs on SPR
Subsystems (3)
PATCH 1/1 perf/x86/uncore: Correct the number of CHAs on SPR
From: Kan Liang <[email protected]>
The number of CHAs from the discovery table on some SPR variants is incorrect, because of a firmware issue. An accurate number can be read from the MSR UNC_CBO_CONFIG.
--- arch/x86/events/intel/uncore_snbep.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/x86/events/intel/uncore_snbep.c +11 -0
@@ -6138,6 +6138,7 @@ static struct intel_uncore_type spr_uncore_mdf = { };#define UNCORE_SPR_NUM_UNCORE_TYPES 12 +#define UNCORE_SPR_CHA 0#define UNCORE_SPR_IIO 1#define UNCORE_SPR_IMC 6#define UNCORE_SPR_UPI 8
@@ -6448,12 +6449,22 @@ static int uncore_type_max_boxes(struct intel_uncore_type **types,return max +1 ; } +#define SPR_MSR_UNC_CBO_CONFIG 0x2FFE +void spr_uncore_cpu_init (void ) { +struct intel_uncore_type *type; +u64 num_cbo; + uncore_msr_uncores =uncore_get_uncores (UNCORE_ACCESS_MSR ,UNCORE_SPR_MSR_EXTRA_UNCORES , spr_msr_uncores); + type =uncore_find_type_by_id (uncore_msr_uncores,UNCORE_SPR_CHA ); +if (type) { +rdmsrl (SPR_MSR_UNC_CBO_CONFIG , num_cbo); + type->num_boxes = num_cbo; + } spr_uncore_iio_free_running.num_boxes =uncore_type_max_boxes (uncore_msr_uncores,UNCORE_SPR_IIO ); }
Signature · 1 line
2.35.1
Quoted 10 lines · On Mon, May 8, 2023 at 7:05 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
The number of CHAs from the discovery table on some SPR variants is incorrect, because of a firmware issue. An accurate number can be read from the MSR
UNC_CBO_CONFIG.Fixes 949b11381f81 ("perf/x86/intel/uncore: Add Sapphire Rapids server CHA support")Reported-by Stephane Eranian <[email protected]>Signed-off-by Kan Liang <[email protected]>
Quoted 44 lines
--- arch/x86/events/intel/uncore_snbep.c | 11 +++++++++++ 1 file changed, 11 insertions(+)arch/x86/events/intel/uncore_snbep.c +11
-1@@ -6138,6 +6138,7 @@ static struct intel_uncore_type spr_uncore_mdf = { };#define UNCORE_SPR_NUM_UNCORE_TYPES 12 +#define UNCORE_SPR_CHA 0#define UNCORE_SPR_IIO 1#define UNCORE_SPR_IMC 6#define UNCORE_SPR_UPI 8@@ -6448,12 +6449,22 @@ static int uncore_type_max_boxes(struct intel_uncore_type **types,return max +1 ; } +#define SPR_MSR_UNC_CBO_CONFIG 0x2FFE +void spr_uncore_cpu_init (void ) { +struct intel_uncore_type *type; +u64 num_cbo; + uncore_msr_uncores =uncore_get_uncores (UNCORE_ACCESS_MSR ,UNCORE_SPR_MSR_EXTRA_UNCORES , spr_msr_uncores); + type =uncore_find_type_by_id (uncore_msr_uncores,UNCORE_SPR_CHA ); +if (type) { +rdmsrl (SPR_MSR_UNC_CBO_CONFIG , num_cbo); + type->num_boxes = num_cbo; + } spr_uncore_iio_free_running.num_boxes =uncore_type_max_boxes (uncore_msr_uncores,UNCORE_SPR_IIO ); } --2.35.1
Hi Peter,
Quoted 8 lines · Stephane Eranian
Quoted 7 lines · On Mon, May 8, 2023 at 7:05 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
The number of CHAs from the discovery table on some SPR variants is incorrect, because of a firmware issue. An accurate number can be read from the MSR
UNC_CBO_CONFIG.
Quoted 6 lines
Quoted 3 lines
Fixes 949b11381f81 ("perf/x86/intel/uncore: Add Sapphire Rapids server CHA support")Reported-by Stephane Eranian <[email protected]>Signed-off-by Kan Liang <[email protected]>Tested-by Stephane Eranian <[email protected]>
Gentle ping.
Do you have any comments for the patch?
Thanks,
Kan
Quoted 44 lines
Quoted 44 lines
--- arch/x86/events/intel/uncore_snbep.c | 11 +++++++++++ 1 file changed, 11 insertions(+)arch/x86/events/intel/uncore_snbep.c +11
-1@@ -6138,6 +6138,7 @@ static struct intel_uncore_type spr_uncore_mdf = { };#define UNCORE_SPR_NUM_UNCORE_TYPES 12 +#define UNCORE_SPR_CHA 0#define UNCORE_SPR_IIO 1#define UNCORE_SPR_IMC 6#define UNCORE_SPR_UPI 8@@ -6448,12 +6449,22 @@ static int uncore_type_max_boxes(struct intel_uncore_type **types,return max +1 ; } +#define SPR_MSR_UNC_CBO_CONFIG 0x2FFE +void spr_uncore_cpu_init (void ) { +struct intel_uncore_type *type; +u64 num_cbo; + uncore_msr_uncores =uncore_get_uncores (UNCORE_ACCESS_MSR ,UNCORE_SPR_MSR_EXTRA_UNCORES , spr_msr_uncores); + type =uncore_find_type_by_id (uncore_msr_uncores,UNCORE_SPR_CHA ); +if (type) { +rdmsrl (SPR_MSR_UNC_CBO_CONFIG , num_cbo); + type->num_boxes = num_cbo; + } spr_uncore_iio_free_running.num_boxes =uncore_type_max_boxes (uncore_msr_uncores,UNCORE_SPR_IIO ); } --2.35.1
Peter Zijlstra
maintainerQuoted 11 lines · Kan
Hi Peter,
Quoted 8 lines · Stephane Eranian
Quoted 7 lines · On Mon, May 8, 2023 at 7:05 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
The number of CHAs from the discovery table on some SPR variants is incorrect, because of a firmware issue. An accurate number can be read from the MSR
UNC_CBO_CONFIG.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Fixes 949b11381f81 ("perf/x86/intel/uncore: Add Sapphire Rapids server CHA support")Reported-by Stephane Eranian <[email protected]>Signed-off-by Kan Liang <[email protected]>Tested-by Stephane Eranian <[email protected]>Gentle ping.
Urgh, too much email.. Queued for perf/urgent.
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 38776cc45eb7603df4735a0410f42cffff8e71a1 Gitweb: https://git.kernel.org/tip/38776cc45eb7603df4735a0410f42cffff8e71a1 Author: Kan Liang <[email protected]> AuthorDate: Mon, 08 May 2023 07:02:06 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 24 May 2023 22:19:41 +02:00
perf/x86/uncore: Correct the number of CHAs on SPR
The number of CHAs from the discovery table on some SPR variants is incorrect, because of a firmware issue. An accurate number can be read from the MSR UNC_CBO_CONFIG.
--- arch/x86/events/intel/uncore_snbep.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/x86/events/intel/uncore_snbep.c +11 -0
@@ -6150,6 +6150,7 @@ static struct intel_uncore_type spr_uncore_mdf = { };#define UNCORE_SPR_NUM_UNCORE_TYPES 12 +#define UNCORE_SPR_CHA 0#define UNCORE_SPR_IIO 1#define UNCORE_SPR_IMC 6#define UNCORE_SPR_UPI 8
@@ -6460,12 +6461,22 @@ static int uncore_type_max_boxes(struct intel_uncore_type **types,return max +1 ; } +#define SPR_MSR_UNC_CBO_CONFIG 0x2FFE +void spr_uncore_cpu_init (void ) { +struct intel_uncore_type *type; +u64 num_cbo; + uncore_msr_uncores =uncore_get_uncores (UNCORE_ACCESS_MSR ,UNCORE_SPR_MSR_EXTRA_UNCORES , spr_msr_uncores); + type =uncore_find_type_by_id (uncore_msr_uncores,UNCORE_SPR_CHA ); +if (type) { +rdmsrl (SPR_MSR_UNC_CBO_CONFIG , num_cbo); + type->num_boxes = num_cbo; + } spr_uncore_iio_free_running.num_boxes =uncore_type_max_boxes (uncore_msr_uncores,UNCORE_SPR_IIO ); }