Revert "perf/x86/intel/uncore: Remove SBOX support for Broadwell server"
Subsystems (2)
PATCH 1/2 Revert "perf/x86/intel/uncore: Remove SBOX support for Broadwell server"
This reverts commit 3b94a891667c ("perf/x86/intel/uncore: Remove SBOX support for Broadwell server"). Note that this commit will cause a GP fault during boot on Broadwell CPUs that do not have SBOXes. This is in preparation for a follow-up change which fixes the SBOX support for Broadwell CPUs.
--- arch/x86/events/intel/uncore_snbep.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/x86/events/intel/uncore_snbep.c +21 -0
@@ -3028,10 +3028,27 @@ static struct intel_uncore_type bdx_uncore_cbox = { .format_group = &hswep_uncore_cbox_format_group, }; +static struct intel_uncore_type bdx_uncore_sbox = { + .name ="sbox" , + .num_counters =4 , + .num_boxes =4 , + .perf_ctr_bits =48 , + .event_ctl =HSWEP_S0_MSR_PMON_CTL0 , + .perf_ctr =HSWEP_S0_MSR_PMON_CTR0 , + .event_mask =HSWEP_S_MSR_PMON_RAW_EVENT_MASK , + .box_ctl =HSWEP_S0_MSR_PMON_BOX_CTL , + .msr_offset =HSWEP_SBOX_MSR_OFFSET , + .ops = &hswep_uncore_sbox_msr_ops, + .format_group = &hswep_uncore_sbox_format_group, +}; + +#define BDX_MSR_UNCORE_SBOX 3 +static struct intel_uncore_type *bdx_msr_uncores[] = { &bdx_uncore_ubox, &bdx_uncore_cbox, &hswep_uncore_pcu, + &bdx_uncore_sbox,NULL , };
@@ -3040,6 +3057,10 @@ void bdx_uncore_cpu_init(void)if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores) bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores; uncore_msr_uncores = bdx_msr_uncores; + +/* BDX-DE doesn't have SBOX */ +if (boot_cpu_data.x86_model ==86 ) + uncore_msr_uncores[BDX_MSR_UNCORE_SBOX ] =NULL ; }static struct intel_uncore_type bdx_uncore_ha = {
Signature · 1 line
2.8.0.rc3.226.g39d4020
PATCH 2/2 perf/x86/intel/uncore: Fix SBOX support for Broadwell CPUs.
This fixes SBOX support for Broadwell CPUs by checking the Power Control Unit CAPID4 register to determine the number of available SBOXes on the particular CPU before trying to enable them.
This patch has been tested on E5-2620 v4 (no SBOXes) and E5-2697 v4 (4 SBOXes).
--- arch/x86/events/intel/uncore_snbep.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore_snbep.c +20 -2
@@ -3054,13 +3054,26 @@ static struct intel_uncore_type *bdx_msr_uncores[] = {void bdx_uncore_cpu_init (void ) { +int pkg =topology_phys_to_logical_pkg (0 ); +if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores) bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores; - uncore_msr_uncores = bdx_msr_uncores;/* BDX-DE doesn't have SBOX */ if (boot_cpu_data.x86_model ==86 ) - uncore_msr_uncores[BDX_MSR_UNCORE_SBOX ] =NULL ; + bdx_msr_uncores[BDX_MSR_UNCORE_SBOX ] =NULL ; +/* Detect systems with no SBOXes */ +else if (uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3 ]) { +u32 capid4; + +pci_read_config_dword ( + uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3 ], +0x94 , &capid4); +if (((capid4 >>6 ) &0x3 ) ==0 ) + bdx_msr_uncores[BDX_MSR_UNCORE_SBOX ] =NULL ; + } + + uncore_msr_uncores = bdx_msr_uncores; }static struct intel_uncore_type bdx_uncore_ha = {
@@ -3277,6 +3290,11 @@ static const struct pci_device_id bdx_uncore_pci_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x6f46), .driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV, 2), }, + {/* PCU.3 (for Capability registers) */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x6fc0), + .driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV, + HSWEP_PCI_PCU_3), + }, {/* end: all zeroes */ } };
Signature · 1 line
2.8.0.rc3.226.g39d4020
RE: [PATCH 2/2] perf/x86/intel/uncore: Fix SBOX support for Broadwell CPUs.
Quoted 10 lines
This fixes SBOX support for Broadwell CPUs by checking the Power Control Unit CAPID4 register to determine the number of available SBOXes on the particular CPU before trying to enable them.
This patch has been tested on E5-2620 v4 (no SBOXes) and E5-2697 v4 (4 SBOXes).
Signed-off-by Oskar Senft <[email protected]>Tested-by Mark van Dijk <[email protected]>
Quoted 57 lines
Fixes 3b94a891667c30fb4624221497d77fc65d950345--- arch/x86/events/intel/uncore_snbep.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)arch/x86/events/intel/uncore_snbep.c +15
-2@@ -3054,13 +3054,26 @@ static struct intel_uncore_type *bdx_msr_uncores[] = {void bdx_uncore_cpu_init (void ) { +int pkg =topology_phys_to_logical_pkg (0 ); +if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores) bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores; - uncore_msr_uncores = bdx_msr_uncores;/* BDX-DE doesn't have SBOX */ if (boot_cpu_data.x86_model ==86 ) - uncore_msr_uncores[BDX_MSR_UNCORE_SBOX ] =NULL ; + bdx_msr_uncores[BDX_MSR_UNCORE_SBOX ] =NULL ; +/* Detect systems with no SBOXes */ +else if (uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3 ]) { +u32 capid4; + +pci_read_config_dword ( + uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3 ], +0x94 , &capid4); +if (((capid4 >>6 ) &0x3 ) ==0 ) + bdx_msr_uncores[BDX_MSR_UNCORE_SBOX ] =NULL ; + } + + uncore_msr_uncores = bdx_msr_uncores; }static struct
intel_uncore_typebdx_uncore_ha= { @@ -3277,6 +3290,11
@@ static const structpci_device_idbdx_uncore_pci_ids[] = {arch/x86/events/intel/uncore_snbep.c +0
-0PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x6f46), .driver_data =
UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV, 2),arch/x86/events/intel/uncore_snbep.c +3
-0}, + {/* PCU.3 (for Capability registers) */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x6fc0), + .driver_data =UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,
arch/x86/events/intel/uncore_snbep.c +2
-1+ HSWEP_PCI_PCU_3), + }, {/* end: all zeroes */ } }; --2.8.0.rc3.226.g39d4020