Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1522913 > unrolled thread

[PATCH 1/2] Revert "perf/x86/intel/uncore: Remove SBOX support for Broadwell server"

Started byOskar Senft <osk@google.com>
First post2016-11-15 18:00 +0100
Last post2016-11-15 18:10 +0100
Articles 3 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/2] Revert "perf/x86/intel/uncore: Remove SBOX support for Broadwell server" Oskar Senft <osk@google.com> - 2016-11-15 18:00 +0100
    [PATCH 2/2] perf/x86/intel/uncore: Fix SBOX support for Broadwell CPUs. Oskar Senft <osk@google.com> - 2016-11-15 18:00 +0100
      RE: [PATCH 2/2] perf/x86/intel/uncore: Fix SBOX support for  Broadwell CPUs. "Liang, Kan" <kan.liang@intel.com> - 2016-11-15 18:10 +0100

#1522913 — [PATCH 1/2] Revert "perf/x86/intel/uncore: Remove SBOX support for Broadwell server"

FromOskar Senft <osk@google.com>
Date2016-11-15 18:00 +0100
Subject[PATCH 1/2] Revert "perf/x86/intel/uncore: Remove SBOX support for Broadwell server"
Message-ID<sDPfr-7tr-5@gated-at.bofh.it>
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.

Signed-off-by: Oskar Senft <osk@google.com>
---
 arch/x86/events/intel/uncore_snbep.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index 2724277..bcb54d7 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -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 = {
-- 
2.8.0.rc3.226.g39d4020

[toc] | [next] | [standalone]

#1522915 — [PATCH 2/2] perf/x86/intel/uncore: Fix SBOX support for Broadwell CPUs.

FromOskar Senft <osk@google.com>
Date2016-11-15 18:00 +0100
Subject[PATCH 2/2] perf/x86/intel/uncore: Fix SBOX support for Broadwell CPUs.
Message-ID<sDPfr-7tr-11@gated-at.bofh.it>
In reply to#1522913
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 <osk@google.com>
Tested-by: Mark van Dijk <mark@voidzero.net>
Fixes: 3b94a891667c30fb4624221497d77fc65d950345
---
 arch/x86/events/intel/uncore_snbep.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index bcb54d7..6f4f67e 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -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 */ }
 };
 
-- 
2.8.0.rc3.226.g39d4020

[toc] | [prev] | [next] | [standalone]

#1522924 — RE: [PATCH 2/2] perf/x86/intel/uncore: Fix SBOX support for Broadwell CPUs.

From"Liang, Kan" <kan.liang@intel.com>
Date2016-11-15 18:10 +0100
SubjectRE: [PATCH 2/2] perf/x86/intel/uncore: Fix SBOX support for Broadwell CPUs.
Message-ID<sDPp7-7LU-9@gated-at.bofh.it>
In reply to#1522915
> 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 <osk@google.com>
> Tested-by: Mark van Dijk <mark@voidzero.net>


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


> Fixes: 3b94a891667c30fb4624221497d77fc65d950345
> ---
>  arch/x86/events/intel/uncore_snbep.c | 22 ++++++++++++++++++++--
>  1 file changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/events/intel/uncore_snbep.c
> b/arch/x86/events/intel/uncore_snbep.c
> index bcb54d7..6f4f67e 100644
> --- a/arch/x86/events/intel/uncore_snbep.c
> +++ b/arch/x86/events/intel/uncore_snbep.c
> @@ -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 */ }
>  };
> 
> --
> 2.8.0.rc3.226.g39d4020

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web