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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

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

dann frazier-4
From: Zhao Chen <[hidden email]>

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 <[hidden email]>
Signed-off-by: David S. Miller <[hidden email]>
(cherry picked from commit 724e47a149f504cbc9c799804bb46ea81a911909 linux-next)
Signed-off-by: dann frazier <[hidden email]>
---
 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
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Kleber Souza
On 05/30/18 15:07, dann frazier wrote:

> From: Zhao Chen <[hidden email]>
>
> 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 <[hidden email]>
> Signed-off-by: David S. Miller <[hidden email]>
> (cherry picked from commit 724e47a149f504cbc9c799804bb46ea81a911909 linux-next)
> Signed-off-by: dann frazier <[hidden email]>

Clean cherry pick, just adding new devices support.

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

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

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Stefan Bader-2
In reply to this post by dann frazier-4
On 30.05.2018 15:07, dann frazier wrote:

> From: Zhao Chen <[hidden email]>
>
> 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 <[hidden email]>
> Signed-off-by: David S. Miller <[hidden email]>
> (cherry picked from commit 724e47a149f504cbc9c799804bb46ea81a911909 linux-next)
> Signed-off-by: dann frazier <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>

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


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

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

Khalid Elmously
In reply to this post by dann frazier-4
Applied to Bionic


On 2018-05-30 16:07:31 , dann frazier wrote:

> From: Zhao Chen <[hidden email]>
>
> 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 <[hidden email]>
> Signed-off-by: David S. Miller <[hidden email]>
> (cherry picked from commit 724e47a149f504cbc9c799804bb46ea81a911909 linux-next)
> Signed-off-by: dann frazier <[hidden email]>
> ---
>  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
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Khalid 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 <[hidden email]>
> >
> > 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 <[hidden email]>
> > Signed-off-by: David S. Miller <[hidden email]>
> > (cherry picked from commit 724e47a149f504cbc9c799804bb46ea81a911909 linux-next)
> > Signed-off-by: dann frazier <[hidden email]>
> > ---
> >  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
> > [hidden email]
> > https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

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

Thadeu Lima de Souza Cascardo-3
In reply to this post by dann frazier-4
Applied to unstable master branch.

Thanks.
Cascardo.

Applied-to: unstable/master

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team