Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755879AbbDUTbc (ORCPT ); Tue, 21 Apr 2015 15:31:32 -0400 Received: from mail-qk0-f179.google.com ([209.85.220.179]:34735 "EHLO mail-qk0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755286AbbDUTba (ORCPT ); Tue, 21 Apr 2015 15:31:30 -0400 MIME-Version: 1.0 In-Reply-To: References: <1429643395-25411-1-git-send-email-sonnyrao@chromium.org> From: Sonny Rao Date: Tue, 21 Apr 2015 12:31:08 -0700 X-Google-Sender-Auth: 5-qHq7vZ6TyQatggYE2yBfqco1o Message-ID: Subject: Re: [PATCH] perf/x86/intel/uncore: Move PCI IDs for IMC to uncore driver To: Bjorn Helgaas Cc: "linux-kernel@vger.kernel.org" , Stephane Eranian , Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo , Thomas Gleixner , "H. Peter Anvin" , "x86@kernel.org" , "linux-pci@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2222 Lines: 60 On Tue, Apr 21, 2015 at 12:21 PM, Bjorn Helgaas wrote: > On Tue, Apr 21, 2015 at 2:09 PM, Sonny Rao wrote: >> This keeps all the related PCI IDs together in the driver where they >> are used. >> >> Signed-off-by: Sonny Rao > > Acked-by: Bjorn Helgaas > >> --- >> arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 6 +++++- >> include/linux/pci_ids.h | 4 ---- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c >> index ca75e70..02c1a13 100644 >> --- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c >> +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c >> @@ -1,7 +1,11 @@ >> /* Nehalem/SandBridge/Haswell uncore support */ >> #include "perf_event_intel_uncore.h" >> >> -/* Uncore IMC PCI Id */ >> +/* Uncore IMC PCI Ids */ > > "IDs" would be more consistent. > Oops, will fix. >> +#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 */ >> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h >> index 38cff8f..2f7b9a4 100644 >> --- a/include/linux/pci_ids.h >> +++ b/include/linux/pci_ids.h >> @@ -2541,10 +2541,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 >> -- >> 2.1.2 >> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/