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

Commit d1e8f4a8 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ingo Molnar
Browse files

perf/x86/intel/uncore: Add filter support for IvyBridge-EP QPI boxes 



The encoding for filter registers of IvyBridge-EP uncore QPI boxes is
completely the same as SandyBridge-EP.

Signed-off-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: eranian@google.com
Cc: "Yan Zheng" <zheng.z.yan@intel.com>
Link: http://lkml.kernel.org/r/1383197815-17706-1-git-send-email-zheng.z.yan@intel.com


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

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+51 −10
Original line number Diff line number Diff line
@@ -1099,6 +1099,24 @@ static struct attribute *ivt_uncore_qpi_formats_attr[] = { 
	&format_attr_umask.attr,

	&format_attr_edge.attr,

	&format_attr_thresh8.attr,

	&format_attr_match_rds.attr,

	&format_attr_match_rnid30.attr,

	&format_attr_match_rnid4.attr,

	&format_attr_match_dnid.attr,

	&format_attr_match_mc.attr,

	&format_attr_match_opc.attr,

	&format_attr_match_vnw.attr,

	&format_attr_match0.attr,

	&format_attr_match1.attr,

	&format_attr_mask_rds.attr,

	&format_attr_mask_rnid30.attr,

	&format_attr_mask_rnid4.attr,

	&format_attr_mask_dnid.attr,

	&format_attr_mask_mc.attr,

	&format_attr_mask_opc.attr,

	&format_attr_mask_vnw.attr,

	&format_attr_mask0.attr,

	&format_attr_mask1.attr,

	NULL,

};
@@ -1312,6 +1330,18 @@ static struct intel_uncore_type ivt_uncore_imc = { 
	IVT_UNCORE_PCI_COMMON_INIT(),

};



static struct intel_uncore_ops ivt_uncore_qpi_ops = {

	.init_box	= ivt_uncore_pci_init_box,

	.disable_box	= snbep_uncore_pci_disable_box,

	.enable_box	= snbep_uncore_pci_enable_box,

	.disable_event	= snbep_uncore_pci_disable_event,

	.enable_event	= snbep_qpi_enable_event,

	.read_counter	= snbep_uncore_pci_read_counter,

	.hw_config	= snbep_qpi_hw_config,

	.get_constraint	= uncore_get_constraint,

	.put_constraint	= uncore_put_constraint,

};



static struct intel_uncore_type ivt_uncore_qpi = {

	.name			= "qpi",

	.num_counters		= 4,
@@ -1321,7 +1351,8 @@ static struct intel_uncore_type ivt_uncore_qpi = { 
	.event_ctl		= SNBEP_PCI_PMON_CTL0,

	.event_mask		= IVT_QPI_PCI_PMON_RAW_EVENT_MASK,

	.box_ctl		= SNBEP_PCI_PMON_BOX_CTL,

	.ops		= &ivt_uncore_pci_ops,

	.num_shared_regs	= 1,

	.ops			= &ivt_uncore_qpi_ops,

	.format_group		= &ivt_uncore_qpi_format_group,

};
@@ -1429,6 +1460,16 @@ static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = { 
		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe3e),

		.driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_R3QPI, 2),

	},

	{ /* QPI Port 0 filter  */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe86),

		.driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,

						   SNBEP_PCI_QPI_PORT0_FILTER),

	},

	{ /* QPI Port 0 filter  */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe96),

		.driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,

						   SNBEP_PCI_QPI_PORT1_FILTER),

	},

	{ /* end: all zeroes */ }

};