Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754424AbbDUH3P (ORCPT ); Tue, 21 Apr 2015 03:29:15 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:35153 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753165AbbDUH3M (ORCPT ); Tue, 21 Apr 2015 03:29:12 -0400 Date: Tue, 21 Apr 2015 09:29:07 +0200 From: Ingo Molnar To: Sonny Rao 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, Bjorn Helgaas , linux-pci@vger.kernel.org Subject: Re: [PATCHv2] perf/x86/intel/uncore: add support for Haswell ULT IMC uncore Message-ID: <20150421072907.GA23549@gmail.com> References: <1429569247-16697-1-git-send-email-sonnyrao@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1429569247-16697-1-git-send-email-sonnyrao@chromium.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2321 Lines: 60 * Sonny Rao wrote: > This uncore is the same as the Haswell desktop part but uses a > different PCI ID. > > Signed-off-by: Sonny Rao > --- > arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > 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 3001015..ca75e70 100644 > --- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c > +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c > @@ -1,6 +1,9 @@ > /* Nehalem/SandBridge/Haswell uncore support */ > #include "perf_event_intel_uncore.h" > > +/* Uncore IMC PCI Id */ > +#define PCI_DEVICE_ID_INTEL_HSW_U_IMC 0x0a04 > + > /* SNB event control */ > #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff > #define SNB_UNC_CTL_UMASK_MASK 0x0000ff00 > @@ -472,6 +475,10 @@ static const struct pci_device_id hsw_uncore_pci_ids[] = { > PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC), > .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), > }, > + { /* IMC */ > + PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_U_IMC), > + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), > + }, > { /* end: all zeroes */ }, > }; > > @@ -502,6 +509,7 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = { > IMC_DEV(IVB_IMC, &ivb_uncore_pci_driver), /* 3rd Gen Core processor */ > IMC_DEV(IVB_E3_IMC, &ivb_uncore_pci_driver), /* Xeon E3-1200 v2/3rd Gen Core processor */ > IMC_DEV(HSW_IMC, &hsw_uncore_pci_driver), /* 4th Gen Core Processor */ > + IMC_DEV(HSW_U_IMC, &hsw_uncore_pci_driver), /* 4th Gen Core ULT Mobile Processor */ > { /* end marker */ } > }; So now it becomes rather inconsistent: - PCI_DEVICE_ID_INTEL_HSW_IMC is defined in include/linux/pci_ids.h - PCI_DEVICE_ID_INTEL_HSW_U_IMC is defined in arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c Could you please also send a patch on top of this one that moves the other, related PCI IDs as well? Thanks, Ingo -- 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/