From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 23 Apr 2016 12:12:10 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core, to resolve conflict
X-Git-Tag: v4.7-rc1~191^2~31
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee;p=linux.git

Merge branch 'perf/urgent' into perf/core, to resolve conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee
diff --cc arch/x86/events/intel/rapl.c
index e657de1923c2,1705c9d75e44..c9b7489ae8ee
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@@ -698,77 -691,52 +698,78 @@@ static int __init init_rapl_pmus(void
  	return 0;
  }
  
 +#define X86_RAPL_MODEL_MATCH(model, init)	\
 +	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&init }
 +
 +struct intel_rapl_init_fun {
 +	bool apply_quirk;
 +	int cntr_mask;
 +	struct attribute **attrs;
 +};
 +
 +static const struct intel_rapl_init_fun snb_rapl_init __initconst = {
 +	.apply_quirk = false,
 +	.cntr_mask = RAPL_IDX_CLN,
 +	.attrs = rapl_events_cln_attr,
 +};
 +
 +static const struct intel_rapl_init_fun hsx_rapl_init __initconst = {
 +	.apply_quirk = true,
 +	.cntr_mask = RAPL_IDX_SRV,
 +	.attrs = rapl_events_srv_attr,
 +};
 +
 +static const struct intel_rapl_init_fun hsw_rapl_init __initconst = {
 +	.apply_quirk = false,
 +	.cntr_mask = RAPL_IDX_HSW,
 +	.attrs = rapl_events_hsw_attr,
 +};
 +
 +static const struct intel_rapl_init_fun snbep_rapl_init __initconst = {
 +	.apply_quirk = false,
 +	.cntr_mask = RAPL_IDX_SRV,
 +	.attrs = rapl_events_srv_attr,
 +};
 +
 +static const struct intel_rapl_init_fun knl_rapl_init __initconst = {
 +	.apply_quirk = true,
 +	.cntr_mask = RAPL_IDX_KNL,
 +	.attrs = rapl_events_knl_attr,
 +};
 +
  static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
 -	[0] = { .vendor = X86_VENDOR_INTEL, .family = 6 },
 -	[1] = {},
 +	X86_RAPL_MODEL_MATCH(42, snb_rapl_init),	/* Sandy Bridge */
 +	X86_RAPL_MODEL_MATCH(58, snb_rapl_init),	/* Ivy Bridge */
 +	X86_RAPL_MODEL_MATCH(63, hsx_rapl_init),	/* Haswell-Server */
 +	X86_RAPL_MODEL_MATCH(79, hsx_rapl_init),	/* Broadwell-Server */
 +	X86_RAPL_MODEL_MATCH(60, hsw_rapl_init),	/* Haswell */
 +	X86_RAPL_MODEL_MATCH(69, hsw_rapl_init),	/* Haswell-Celeron */
++	X86_RAPL_MODEL_MATCH(70, hsw_rapl_init),	/* Haswell GT3e */
 +	X86_RAPL_MODEL_MATCH(61, hsw_rapl_init),	/* Broadwell */
 +	X86_RAPL_MODEL_MATCH(71, hsw_rapl_init),	/* Broadwell-H */
 +	X86_RAPL_MODEL_MATCH(45, snbep_rapl_init),	/* Sandy Bridge-EP */
 +	X86_RAPL_MODEL_MATCH(62, snbep_rapl_init),	/* IvyTown */
 +	X86_RAPL_MODEL_MATCH(87, knl_rapl_init),	/* Knights Landing */
 +	{},
  };
  
 +MODULE_DEVICE_TABLE(x86cpu, rapl_cpu_match);
 +
  static int __init rapl_pmu_init(void)
  {
 -	bool apply_quirk = false;
 +	const struct x86_cpu_id *id;
 +	struct intel_rapl_init_fun *rapl_init;
 +	bool apply_quirk;
  	int ret;
  
 -	if (!x86_match_cpu(rapl_cpu_match))
 +	id = x86_match_cpu(rapl_cpu_match);
 +	if (!id)
  		return -ENODEV;
  
 -	switch (boot_cpu_data.x86_model) {
 -	case 42: /* Sandy Bridge */
 -	case 58: /* Ivy Bridge */
 -		rapl_cntr_mask = RAPL_IDX_CLN;
 -		rapl_pmu_events_group.attrs = rapl_events_cln_attr;
 -		break;
 -	case 63: /* Haswell-Server */
 -	case 79: /* Broadwell-Server */
 -		apply_quirk = true;
 -		rapl_cntr_mask = RAPL_IDX_SRV;
 -		rapl_pmu_events_group.attrs = rapl_events_srv_attr;
 -		break;
 -	case 60: /* Haswell */
 -	case 69: /* Haswell-Celeron */
 -	case 70: /* Haswell GT3e */
 -	case 61: /* Broadwell */
 -	case 71: /* Broadwell-H */
 -		rapl_cntr_mask = RAPL_IDX_HSW;
 -		rapl_pmu_events_group.attrs = rapl_events_hsw_attr;
 -		break;
 -	case 45: /* Sandy Bridge-EP */
 -	case 62: /* IvyTown */
 -		rapl_cntr_mask = RAPL_IDX_SRV;
 -		rapl_pmu_events_group.attrs = rapl_events_srv_attr;
 -		break;
 -	case 87: /* Knights Landing */
 -		apply_quirk = true;
 -		rapl_cntr_mask = RAPL_IDX_KNL;
 -		rapl_pmu_events_group.attrs = rapl_events_knl_attr;
 -		break;
 -	default:
 -		return -ENODEV;
 -	}
 +	rapl_init = (struct intel_rapl_init_fun *)id->driver_data;
 +	apply_quirk = rapl_init->apply_quirk;
 +	rapl_cntr_mask = rapl_init->cntr_mask;
 +	rapl_pmu_events_group.attrs = rapl_init->attrs;
  
  	ret = rapl_check_hw_unit(apply_quirk);
  	if (ret)