From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH v1 4/4] serial: Expand the PCI serial quirks for OXPCIe200 and OXPCIe952 1 Native UART Date: Fri, 7 Mar 2014 10:55:14 -0500 Message-ID: <20140307155514.GA10959@phenom.dumpdata.com> References: <1394040334-16278-1-git-send-email-konrad.wilk@oracle.com> <1394040334-16278-5-git-send-email-konrad.wilk@oracle.com> <53185A0F02000078001216F0@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WLx7L-0003AI-5J for xen-devel@lists.xenproject.org; Fri, 07 Mar 2014 15:55:23 +0000 Content-Disposition: inline In-Reply-To: <53185A0F02000078001216F0@nat28.tlf.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org On Thu, Mar 06, 2014 at 10:20:47AM +0000, Jan Beulich wrote: > >>> On 05.03.14 at 18:25, Konrad Rzeszutek Wilk wrote: > > This covers all of the OXPCIe952 1 Native UART and > > OXPCIe200 1 Native UART chipsets. > > With this I can certainly see why you didn't give the single ID a > name in the previous patch. But let's be consistent then and have > - for now at least - only vendor IDs have (global, as Andrew > validly suggested) manifest constants. Do you want that just for the serial driver or for all? This is what I had ready: commit c3dbcc6a0c2c9415201863a9422b550270f2ee03 Author: Konrad Rzeszutek Wilk Date: Wed Mar 5 15:24:04 2014 -0500 pci: Put all PCI device vendor and models in one file. Suggested-by: Andrew Cooper Signed-off-by: Konrad Rzeszutek Wilk diff --git a/xen/arch/x86/oprofile/op_model_athlon.c b/xen/arch/x86/oprofile/op_model_athlon.c index e784018..81e0858 100644 --- a/xen/arch/x86/oprofile/op_model_athlon.c +++ b/xen/arch/x86/oprofile/op_model_athlon.c @@ -20,7 +20,8 @@ #include #include #include - +#include + #include "op_x86_model.h" #include "op_counter.h" @@ -445,8 +446,6 @@ static inline void __init init_ibs_nmi_per_cpu(void *arg) apic_write(reg, APIC_EILVT_MSG_NMI << 8); } -#define PCI_VENDOR_ID_AMD 0x1022 -#define PCI_DEVICE_ID_AMD_10H_NB_MISC 0x1203 #define IBSCTL 0x1cc static int __init init_ibs_nmi(void) { diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c index 1373acb..07668b3 100644 --- a/xen/arch/x86/x86_64/mmconf-fam10h.c +++ b/xen/arch/x86/x86_64/mmconf-fam10h.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c b/xen/arch/x86/x86_64/mmconfig-shared.c index 7589b64..75757b4 100644 --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/xen/arch/x86/x86_64/mmconfig.h b/xen/arch/x86/x86_64/mmconfig.h index 36e0448..5125997 100644 --- a/xen/arch/x86/x86_64/mmconfig.h +++ b/xen/arch/x86/x86_64/mmconfig.h @@ -17,10 +17,6 @@ * Author: Allen Kay - adapted from linux */ -#define PCI_VENDOR_ID_INTEL 0x8086 -#define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 -#define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 - /* ioport ends */ #define PCI_PROBE_BIOS 0x0001 #define PCI_PROBE_CONF1 0x0002 @@ -29,11 +25,8 @@ #define PCI_PROBE_MASK 0x000f #define PCI_PROBE_NOEARLY 0x0010 -#define PCI_VENDOR_ID_AMD 0x1022 #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 -#define PCI_VENDOR_ID_NVIDIA 0x10de - extern unsigned int pci_probe; /* diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 9f87018..48ee010 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -19,6 +19,7 @@ #ifdef HAS_PCI #include #include +#include #endif #include #include @@ -132,9 +133,6 @@ static struct ns16550_config_quirk __initdata uart_quirk[] = { } }; -#define PCI_VENDOR_ID_BROADCOM 0x14e4 -#define PCI_VENDOR_ID_OXSEMI 0x1415 static struct ns16550_config_mmio __initdata uart_config[] = { /* Broadcom TruManage device */ diff --git a/xen/include/xen/pci_devs.h b/xen/include/xen/pci_devs.h new file mode 100644 index 0000000..ad573df --- /dev/null +++ b/xen/include/xen/pci_devs.h @@ -0,0 +1,17 @@ +#ifndef XEN_PCI_DEVS_H_ +#define XEN_PCI_DEVS_H + +#define PCI_VENDOR_ID_AMD 0x1022 +#define PCI_DEVICE_ID_AMD_10H_NB_MISC 0x1203 + +#define PCI_VENDOR_ID_BROADCOM 0x14e4 + +#define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590 +#define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770 + +#define PCI_VENDOR_ID_NVIDIA 0x10de + +#define PCI_VENDOR_ID_OXSEMI 0x1415 +#endif /* XEN_PCI_DEVS_H */ > > Jan >