| Message ID | 1473655766-31628-2-git-send-email-aditr@vmware.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Sun, Sep 11, 2016 at 09:49:11PM -0700, Adit Ranadive wrote: > The VMXNet3 PCI Id will be shared with our paravirtual RDMA driver. > Moved it to the shared location in pci_ids.h. > > Suggested-by: Leon Romanovsky <leon@kernel.org> > Signed-off-by: Adit Ranadive <aditr@vmware.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > --- > drivers/net/vmxnet3/vmxnet3_int.h | 3 +-- > include/linux/pci_ids.h | 1 + > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h > index 74fc030..2bd6bf8 100644 > --- a/drivers/net/vmxnet3/vmxnet3_int.h > +++ b/drivers/net/vmxnet3/vmxnet3_int.h > @@ -119,9 +119,8 @@ enum { > }; > > /* > - * PCI vendor and device IDs. > + * Maximum devices supported. > */ > -#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 > #define MAX_ETHERNET_CARDS 10 > #define MAX_PCI_PASSTHRU_DEVICE 6 > > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index c58752f..98bb455 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -2251,6 +2251,7 @@ > #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 > > #define PCI_VENDOR_ID_VMWARE 0x15ad > +#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07b0 > > #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 > #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Please update vmxnet3_drv.c accordingly. Yuval On Sun, Sep 11, 2016 at 09:49:11PM -0700, Adit Ranadive wrote: > The VMXNet3 PCI Id will be shared with our paravirtual RDMA driver. > Moved it to the shared location in pci_ids.h. > > Suggested-by: Leon Romanovsky <leon@kernel.org> > Signed-off-by: Adit Ranadive <aditr@vmware.com> > --- > --- > drivers/net/vmxnet3/vmxnet3_int.h | 3 +-- > include/linux/pci_ids.h | 1 + > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h > index 74fc030..2bd6bf8 100644 > --- a/drivers/net/vmxnet3/vmxnet3_int.h > +++ b/drivers/net/vmxnet3/vmxnet3_int.h > @@ -119,9 +119,8 @@ enum { > }; > > /* > - * PCI vendor and device IDs. > + * Maximum devices supported. > */ > -#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 > #define MAX_ETHERNET_CARDS 10 > #define MAX_PCI_PASSTHRU_DEVICE 6 > > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index c58752f..98bb455 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -2251,6 +2251,7 @@ > #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 > > #define PCI_VENDOR_ID_VMWARE 0x15ad > +#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07b0 > > #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 > #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 14, 2016 at 04:09:12 -0700, Yuval Shaia wrote:
> Please update vmxnet3_drv.c accordingly.
Any reason why? I don't think we need to. Vmxnet3 should just pick up the moved
PCI device id from pci_ids.h file.
- Adit
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 14, 2016 at 04:00:25PM +0000, Adit Ranadive wrote: > On Wed, Sep 14, 2016 at 04:09:12 -0700, Yuval Shaia wrote: > > Please update vmxnet3_drv.c accordingly. > > Any reason why? I don't think we need to. Vmxnet3 should just pick up the moved > PCI device id from pci_ids.h file. So now you need to include it from vmxnet3_drv.c. Same with pvrdma_main.c > > - Adit > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 14, 2016 at 09:25:18 -0700, Yuval Shaia wrote: > On Wed, Sep 14, 2016 at 04:00:25PM +0000, Adit Ranadive wrote: > > On Wed, Sep 14, 2016 at 04:09:12 -0700, Yuval Shaia wrote: > > > Please update vmxnet3_drv.c accordingly. > > > > Any reason why? I don't think we need to. Vmxnet3 should just pick up > > the moved PCI device id from pci_ids.h file. > > So now you need to include it from vmxnet3_drv.c. > Same with pvrdma_main.c If you're asking me to include pci_ids.h in our drivers we already do that by including pci.h in both the drivers. pci.h already includes pci_ids.h - https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/linux/pci.h#n35 If that's going to change maybe someone from the PCI group can comment on. Thanks, Adit -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Besides that no more comments. Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com> On Wed, Sep 14, 2016 at 07:36:34PM +0000, Adit Ranadive wrote: > On Wed, Sep 14, 2016 at 09:25:18 -0700, Yuval Shaia wrote: > > On Wed, Sep 14, 2016 at 04:00:25PM +0000, Adit Ranadive wrote: > > > On Wed, Sep 14, 2016 at 04:09:12 -0700, Yuval Shaia wrote: > > > > Please update vmxnet3_drv.c accordingly. > > > > > > Any reason why? I don't think we need to. Vmxnet3 should just pick up > > > the moved PCI device id from pci_ids.h file. > > > > So now you need to include it from vmxnet3_drv.c. > > Same with pvrdma_main.c > > If you're asking me to include pci_ids.h in our drivers we already do that > by including pci.h in both the drivers. > pci.h already includes pci_ids.h - > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/linux/pci.h#n35 > > If that's going to change maybe someone from the PCI group can comment on. > > Thanks, > Adit > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 14, 2016 at 07:36:34PM +0000, Adit Ranadive wrote: > On Wed, Sep 14, 2016 at 09:25:18 -0700, Yuval Shaia wrote: > > On Wed, Sep 14, 2016 at 04:00:25PM +0000, Adit Ranadive wrote: > > > On Wed, Sep 14, 2016 at 04:09:12 -0700, Yuval Shaia wrote: > > > > Please update vmxnet3_drv.c accordingly. > > > > > > Any reason why? I don't think we need to. Vmxnet3 should just pick up > > > the moved PCI device id from pci_ids.h file. > > > > So now you need to include it from vmxnet3_drv.c. > > Same with pvrdma_main.c > > If you're asking me to include pci_ids.h in our drivers we already do that > by including pci.h in both the drivers. > pci.h already includes pci_ids.h - > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/linux/pci.h#n35 > > If that's going to change maybe someone from the PCI group can comment on. I don't contemplate a change there. It's fine to get pci_ids.h via pci.h. Almost all drivers do that today. If we do change it someday, we can change this driver along with all the rest. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 74fc030..2bd6bf8 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h @@ -119,9 +119,8 @@ enum { }; /* - * PCI vendor and device IDs. + * Maximum devices supported. */ -#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 #define MAX_ETHERNET_CARDS 10 #define MAX_PCI_PASSTHRU_DEVICE 6 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c58752f..98bb455 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2251,6 +2251,7 @@ #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 #define PCI_VENDOR_ID_VMWARE 0x15ad +#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07b0 #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0
The VMXNet3 PCI Id will be shared with our paravirtual RDMA driver. Moved it to the shared location in pci_ids.h. Suggested-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Adit Ranadive <aditr@vmware.com> --- --- drivers/net/vmxnet3/vmxnet3_int.h | 3 +-- include/linux/pci_ids.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-)