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

Commit 0140e614 authored by Sonny Rao's avatar Sonny Rao Committed by Ingo Molnar
Browse files

perf/x86/intel/uncore: Move PCI IDs for IMC to uncore driver 



This keeps all the related PCI IDs together in the driver where
they are used.

Signed-off-by: default avatarSonny Rao <sonnyrao@chromium.org>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1429644791-25724-1-git-send-email-sonnyrao@chromium.org


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

arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c

+5 −1
Original line number Diff line number Diff line 
/* Nehalem/SandBridge/Haswell uncore support */

#include "perf_event_intel_uncore.h"



/* Uncore IMC PCI Id */

/* Uncore IMC PCI IDs */

#define PCI_DEVICE_ID_INTEL_SNB_IMC	0x0100

#define PCI_DEVICE_ID_INTEL_IVB_IMC	0x0154

#define PCI_DEVICE_ID_INTEL_IVB_E3_IMC	0x0150

#define PCI_DEVICE_ID_INTEL_HSW_IMC	0x0c00

#define PCI_DEVICE_ID_INTEL_HSW_U_IMC	0x0a04



/* SNB event control */

include/linux/pci_ids.h

+0 −4
Original line number Diff line number Diff line
@@ -2539,10 +2539,6 @@ 


#define PCI_VENDOR_ID_INTEL		0x8086

#define PCI_DEVICE_ID_INTEL_EESSC	0x0008

#define PCI_DEVICE_ID_INTEL_SNB_IMC	0x0100

#define PCI_DEVICE_ID_INTEL_IVB_IMC	0x0154

#define PCI_DEVICE_ID_INTEL_IVB_E3_IMC	0x0150

#define PCI_DEVICE_ID_INTEL_HSW_IMC	0x0c00

#define PCI_DEVICE_ID_INTEL_PXHD_0	0x0320

#define PCI_DEVICE_ID_INTEL_PXHD_1	0x0321

#define PCI_DEVICE_ID_INTEL_PXH_0	0x0329