Add NI PXIe-RS232, PXI-RS485 and PXIe-RS485 device IDs.
Signed-off-by: jeyentam <[email protected]>
---
include/linux/pci_ids.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 70e86148cb1e..7fad4794789f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1027,7 +1027,9 @@
#define PCI_DEVICE_ID_SUN_TOMATILLO 0xa801
#define PCI_DEVICE_ID_SUN_CASSINI 0xabba
+/* NI-Serial Device IDs */
#define PCI_VENDOR_ID_NI 0x1093
+/* NI PXI(e) RS-232 Devices */
#define PCI_DEVICE_ID_NI_PCI2322 0xd130
#define PCI_DEVICE_ID_NI_PCI2324 0xd140
#define PCI_DEVICE_ID_NI_PCI2328 0xd150
@@ -1052,6 +1054,16 @@
#define PCI_DEVICE_ID_NI_PCI8432_2322 0x70ea
#define PCI_DEVICE_ID_NI_PXI8432_2324 0x70ec
#define PCI_DEVICE_ID_NI_PCI8432_2324 0x70ee
+#define PCIE_DEVICE_ID_NI_PXIE8430_2328 0x74C2
+#define PCIE_DEVICE_ID_NI_PXIE8430_23216 0x74C1
+/* NI PXI(e) RS-485 Devices */
+#define PCI_DEVICE_ID_NI_PXI8431_4852 0x7081
+#define PCI_DEVICE_ID_NI_PXI8431_4854 0x70DE
+#define PCI_DEVICE_ID_NI_PXI8431_4858 0x70E3
+#define PCI_DEVICE_ID_NI_PXI8433_4852 0x70E9
+#define PCI_DEVICE_ID_NI_PXI8433_4854 0x70ED
+#define PCIE_DEVICE_ID_NI_PXIE8431_4858 0x74C4
+#define PCIE_DEVICE_ID_NI_PXIE8431_48516 0x74C3
#define PCI_VENDOR_ID_CMD 0x1095
#define PCI_DEVICE_ID_CMD_643 0x0643
--
2.17.1
On Wed, Jul 03, 2019 at 12:25:16AM -0700, jeyentam wrote:
> Add NI PXIe-RS232, PXI-RS485 and PXIe-RS485 device IDs.
>
> Signed-off-by: jeyentam <[email protected]>
> ---
> include/linux/pci_ids.h | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
You have read the comment at the top of this file, right? If so, why
are you adding these entries?
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 70e86148cb1e..7fad4794789f 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1027,7 +1027,9 @@
> #define PCI_DEVICE_ID_SUN_TOMATILLO 0xa801
> #define PCI_DEVICE_ID_SUN_CASSINI 0xabba
>
> +/* NI-Serial Device IDs */
> #define PCI_VENDOR_ID_NI 0x1093
That's a vendor id, not a serial device id.
thanks,
greg k-h
> On Wed, Jul 03, 2019 at 12:25:16AM -0700, jeyentam wrote:
> > Add NI PXIe-RS232, PXI-RS485 and PXIe-RS485 device IDs.
> >
> > Signed-off-by: jeyentam <[email protected]>
> > ---
> > include/linux/pci_ids.h | 12 ++++++++++++
> > 1 file changed, 12 insertions(+)
>
> You have read the comment at the top of this file, right? If so, why
> are you adding these entries?
Yes, but I think these entries should be added in because the NI-Serial PXI
(RS232) device IDs already been defined in this file originally, so now I'm
adding the newly supported NI-Serial PXI (RS485), PXIe (RS232) and PXIe
(RS485) device IDs into here as they are the same product.
>
> > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index
> > 70e86148cb1e..7fad4794789f 100644
> > --- a/include/linux/pci_ids.h
> > +++ b/include/linux/pci_ids.h
> > @@ -1027,7 +1027,9 @@
> > #define PCI_DEVICE_ID_SUN_TOMATILLO 0xa801
> > #define PCI_DEVICE_ID_SUN_CASSINI 0xabba
> >
> > +/* NI-Serial Device IDs */
> > #define PCI_VENDOR_ID_NI 0x1093
>
> That's a vendor id, not a serial device id.
Yes, will change it to vendor id.
>
> thanks,
>
> greg k-h
Thank you.
Regards,
Je Yen Tam
Staff Software Engineer
National Instruments?
o?? 604-3776397
e?? [email protected]
On Thu, Jul 04, 2019 at 06:58:39AM +0000, Je Yen Tam wrote:
> > On Wed, Jul 03, 2019 at 12:25:16AM -0700, jeyentam wrote:
> > > Add NI PXIe-RS232, PXI-RS485 and PXIe-RS485 device IDs.
> > >
> > > Signed-off-by: jeyentam <[email protected]>
> > > ---
> > > include/linux/pci_ids.h | 12 ++++++++++++
> > > 1 file changed, 12 insertions(+)
> >
> > You have read the comment at the top of this file, right? If so, why
> > are you adding these entries?
>
> Yes, but I think these entries should be added in because the NI-Serial PXI
> (RS232) device IDs already been defined in this file originally, so now I'm
> adding the newly supported NI-Serial PXI (RS485), PXIe (RS232) and PXIe
> (RS485) device IDs into here as they are the same product.
No, do not add new device ids to this file, only put them in the single
file that needs it. This file is for device ids that are shared across
multiple drivers/files.
You should not need to touch this file at all.
thanks,
greg k-h
> -----Original Message-----
> From: Greg KH <[email protected]>
> Sent: Thursday, July 4, 2019 4:16 PM
> To: Je Yen Tam <[email protected]>
> Cc: [email protected]; [email protected]
> Subject: [EXTERNAL] Re: Re: [PATCH V2 2/2] PCI: Add NI-Serial PXI/PXIe+485 device
> IDs
>
> On Thu, Jul 04, 2019 at 06:58:39AM +0000, Je Yen Tam wrote:
> > > On Wed, Jul 03, 2019 at 12:25:16AM -0700, jeyentam wrote:
> > > > Add NI PXIe-RS232, PXI-RS485 and PXIe-RS485 device IDs.
> > > >
> > > > Signed-off-by: jeyentam <[email protected]>
> > > > ---
> > > > include/linux/pci_ids.h | 12 ++++++++++++
> > > > 1 file changed, 12 insertions(+)
> > >
> > > You have read the comment at the top of this file, right? If so, why
> > > are you adding these entries?
> >
> > Yes, but I think these entries should be added in because the NI-Serial PXI
> > (RS232) device IDs already been defined in this file originally, so now I'm
> > adding the newly supported NI-Serial PXI (RS485), PXIe (RS232) and PXIe
> > (RS485) device IDs into here as they are the same product.
>
> No, do not add new device ids to this file, only put them in the single
> file that needs it. This file is for device ids that are shared across
> multiple drivers/files.
>
> You should not need to touch this file at all.
Ok, understood. Will do so.
>
> thanks,
>
> greg k-h
Thank you,
Je Yen