2015-04-21 19:10:07

by Sonny Rao

Subject: [PATCH] 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: Sonny Rao <[email protected]>
---
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 */
+#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

2015-04-21 19:21:32

by Bjorn Helgaas

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 <[email protected]> wrote:
> This keeps all the related PCI IDs together in the driver where they
> are used.
>
> Signed-off-by: Sonny Rao <[email protected]>

Acked-by: Bjorn Helgaas <[email protected]>

> ---
> 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
>

2015-04-21 19:31:32

by Sonny Rao

Subject: Re: [PATCH] perf/x86/intel/uncore: Move PCI IDs for IMC to uncore driver

On Tue, Apr 21, 2015 at 12:21 PM, Bjorn Helgaas <[email protected]> wrote:
> On Tue, Apr 21, 2015 at 2:09 PM, Sonny Rao <[email protected]> wrote:
>> This keeps all the related PCI IDs together in the driver where they
>> are used.
>>
>> Signed-off-by: Sonny Rao <[email protected]>
>
> Acked-by: Bjorn Helgaas <[email protected]>
>
>> ---
>> 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
>>