[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAErSpo6gLGy9tGZXPsCTfzPBNSdM8nYjNzAETSHXWJ9ZuYN9FQ@mail.gmail.com>
Date: Tue, 21 Apr 2015 14:21:07 -0500
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: Sonny Rao <sonnyrao@...omium.org>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Stephane Eranian <eranian@...gle.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Paul Mackerras <paulus@...ba.org>,
Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Thomas Gleixner <tglx@...utronix.de>,
"H. Peter Anvin" <hpa@...or.com>,
"x86@...nel.org" <x86@...nel.org>,
"linux-pci@...r.kernel.org" <linux-pci@...r.kernel.org>
Subject: Re: [PATCH] perf/x86/intel/uncore: Move PCI IDs for IMC to uncore driver
On Tue, Apr 21, 2015 at 2:09 PM, Sonny Rao <sonnyrao@...omium.org> wrote:
> This keeps all the related PCI IDs together in the driver where they
> are used.
>
> Signed-off-by: Sonny Rao <sonnyrao@...omium.org>
Acked-by: Bjorn Helgaas <bhelgaas@...gle.com>
> ---
> 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.
> +#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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists