APPLIED[B]: [PATCH][Unstable][SRU Bionic] net-next/hinic: add pci device ids for 25ge and 100ge card

[Khaled Elmously]

Clarifying in the subject that this was applied only to Bionic


On 2018-06-07 17:56:37 , Khaled Elmously wrote:
> Applied to Bionic
> 
> 
> On 2018-05-30 16:07:31 , dann frazier wrote:
> > From: Zhao Chen <zhaochen6 at huawei.com>
> > 
> > BugLink: https://bugs.launchpad.net/bugs/1770970
> > 
> > This patch adds PCI device IDs to support 25GE and 100GE card:
> > 
> > 1. Add device id 0x0201 for HINIC 100GE dual port card.
> > 2. Add device id 0x0200 for HINIC 25GE dual port card.
> > 3. Macro of device id 0x1822 is modified for HINIC 25GE quad port card.
> > 
> > Signed-off-by: Zhao Chen <zhaochen6 at huawei.com>
> > Signed-off-by: David S. Miller <davem at davemloft.net>
> > (cherry picked from commit 724e47a149f504cbc9c799804bb46ea81a911909 linux-next)
> > Signed-off-by: dann frazier <dann.frazier at canonical.com>
> > ---
> >  drivers/net/ethernet/huawei/hinic/hinic_main.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c
> > index eb53bd93065e..5b122728dcb4 100644
> > --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
> > +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
> > @@ -51,7 +51,9 @@ static unsigned int rx_weight = 64;
> >  module_param(rx_weight, uint, 0644);
> >  MODULE_PARM_DESC(rx_weight, "Number Rx packets for NAPI budget (default=64)");
> >  
> > -#define PCI_DEVICE_ID_HI1822_PF         0x1822
> > +#define HINIC_DEV_ID_QUAD_PORT_25GE     0x1822
> > +#define HINIC_DEV_ID_DUAL_PORT_25GE     0x0200
> > +#define HINIC_DEV_ID_DUAL_PORT_100GE    0x0201
> >  
> >  #define HINIC_WQ_NAME                   "hinic_dev"
> >  
> > @@ -1097,7 +1099,9 @@ static void hinic_remove(struct pci_dev *pdev)
> >  }
> >  
> >  static const struct pci_device_id hinic_pci_table[] = {
> > -	{ PCI_VDEVICE(HUAWEI, PCI_DEVICE_ID_HI1822_PF), 0},
> > +	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_QUAD_PORT_25GE), 0},
> > +	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_DUAL_PORT_25GE), 0},
> > +	{ PCI_VDEVICE(HUAWEI, HINIC_DEV_ID_DUAL_PORT_100GE), 0},
> >  	{ 0, 0}
> >  };
> >  MODULE_DEVICE_TABLE(pci, hinic_pci_table);
> > -- 
> > 2.17.1
> > 
> > 
> > -- 
> > kernel-team mailing list
> > kernel-team at lists.ubuntu.com
> > https://lists.ubuntu.com/mailman/listinfo/kernel-team