Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5319e5ad authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 9ab975a0 6d6f2833

arch/x86/events/intel/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3866,7 +3866,7 @@ __init int intel_pmu_init(void) 
				c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 1;

			}

			c->idxmsk64 &=

				~(~0UL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed));

				~(~0ULL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed));

			c->weight = hweight64(c->idxmsk64);

		}

	}

arch/x86/events/intel/uncore_snbep.c

+7 −0
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ 
#define KNL_CHA_MSR_PMON_BOX_FILTER_TID		0x1ff

#define KNL_CHA_MSR_PMON_BOX_FILTER_STATE	(7 << 18)

#define KNL_CHA_MSR_PMON_BOX_FILTER_OP		(0xfffffe2aULL << 32)

#define KNL_CHA_MSR_PMON_BOX_FILTER_REMOTE_NODE	(0x1ULL << 32)

#define KNL_CHA_MSR_PMON_BOX_FILTER_LOCAL_NODE	(0x1ULL << 33)

#define KNL_CHA_MSR_PMON_BOX_FILTER_NNC		(0x1ULL << 37)



/* KNL EDC/MC UCLK */

#define KNL_UCLK_MSR_PMON_CTR0_LOW		0x400
@@ -1902,6 +1905,10 @@ static int knl_cha_hw_config(struct intel_uncore_box *box, 
		reg1->reg = HSWEP_C0_MSR_PMON_BOX_FILTER0 +

			    KNL_CHA_MSR_OFFSET * box->pmu->pmu_idx;

		reg1->config = event->attr.config1 & knl_cha_filter_mask(idx);



		reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_REMOTE_NODE;

		reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_LOCAL_NODE;

		reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_NNC;

		reg1->idx = idx;

	}

	return 0;

arch/x86/events/msr.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void msr_event_update(struct perf_event *event) 
	if (unlikely(event->hw.event_base == MSR_SMI_COUNT))

		delta = sign_extend64(delta, 31);



	local64_add(now - prev, &event->count);

	local64_add(delta, &event->count);

}



static void msr_event_start(struct perf_event *event, int flags)