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

Commit dae25530 authored by Harish Chegondi's avatar Harish Chegondi Committed by Ingo Molnar
Browse files

perf/x86/intel/uncore: Remove hard coding of PMON box control MSR offset 



Call uncore_pci_box_ctl() function to get the PMON box control MSR offset
instead of hard coding the offset. This would allow us to use this
snbep_uncore_pci_init_box() function for other PCI PMON devices whose box
control MSR offset is different from SNBEP_PCI_PMON_BOX_CTL.

Signed-off-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andi Kleen <andi.kleen@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Harish Chegondi <harish.chegondi@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/872e8ef16cfc38e5ff3b45fac1094e6f1722e4ad.1449470704.git.harish.chegondi@intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1e7b9390

arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c

+2 −1
Original line number Diff line number Diff line
@@ -315,8 +315,9 @@ static u64 snbep_uncore_pci_read_counter(struct intel_uncore_box *box, struct pe 
static void snbep_uncore_pci_init_box(struct intel_uncore_box *box)

{

	struct pci_dev *pdev = box->pci_dev;

	int box_ctl = uncore_pci_box_ctl(box);



	pci_write_config_dword(pdev, SNBEP_PCI_PMON_BOX_CTL, SNBEP_PMON_BOX_CTL_INT);

	pci_write_config_dword(pdev, box_ctl, SNBEP_PMON_BOX_CTL_INT);

}



static void snbep_uncore_msr_disable_box(struct intel_uncore_box *box)