diff mbox series

[crypto-next] crypto: caam/qi2 - switch to netif_napi_add_tx_weight()

Message ID 20220705225857.923711-1-kuba@kernel.org (mailing list archive)
State Accepted
Delegated to: Herbert Xu
Headers show
Series [crypto-next] crypto: caam/qi2 - switch to netif_napi_add_tx_weight() | expand

Commit Message

Jakub Kicinski July 5, 2022, 10:58 p.m. UTC
caam has its own special NAPI weights. It's also a crypto device
so presumably it can't be used for packet Rx. Switch to the (new)
correct API.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: horia.geanta@nxp.com
CC: pankaj.gupta@nxp.com
CC: gaurav.jain@nxp.com
CC: herbert@gondor.apana.org.au
CC: linux-crypto@vger.kernel.org
---
 drivers/crypto/caam/caamalg_qi2.c | 5 +++--
 drivers/crypto/caam/qi.c          | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

Gaurav Jain July 8, 2022, 9:45 a.m. UTC | #1
Hi Meenakshi, Vabhav

Please help to review the below patch..

Regards
Gaurav Jain

> -----Original Message-----
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Wednesday, July 6, 2022 4:29 AM
> To: herbert@gondor.apana.org.au
> Cc: Jakub Kicinski <kuba@kernel.org>; Horia Geanta <horia.geanta@nxp.com>;
> Pankaj Gupta <pankaj.gupta@nxp.com>; Gaurav Jain <gaurav.jain@nxp.com>;
> linux-crypto@vger.kernel.org
> Subject: [EXT] [PATCH crypto-next] crypto: caam/qi2 - switch to
> netif_napi_add_tx_weight()
> 
> Caution: EXT Email
> 
> caam has its own special NAPI weights. It's also a crypto device so presumably it
> can't be used for packet Rx. Switch to the (new) correct API.
> 
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: horia.geanta@nxp.com
> CC: pankaj.gupta@nxp.com
> CC: gaurav.jain@nxp.com
> CC: herbert@gondor.apana.org.au
> CC: linux-crypto@vger.kernel.org
> ---
>  drivers/crypto/caam/caamalg_qi2.c | 5 +++--
>  drivers/crypto/caam/qi.c          | 4 ++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/crypto/caam/caamalg_qi2.c
> b/drivers/crypto/caam/caamalg_qi2.c
> index 6753f0e6e55d..56bbfdfb0d9f 100644
> --- a/drivers/crypto/caam/caamalg_qi2.c
> +++ b/drivers/crypto/caam/caamalg_qi2.c
> @@ -5083,8 +5083,9 @@ static int __cold dpaa2_dpseci_setup(struct
> fsl_mc_device *ls_dev)
> 
>                 ppriv->net_dev.dev = *dev;
>                 INIT_LIST_HEAD(&ppriv->net_dev.napi_list);
> -               netif_napi_add(&ppriv->net_dev, &ppriv->napi, dpaa2_dpseci_poll,
> -                              DPAA2_CAAM_NAPI_WEIGHT);
> +               netif_napi_add_tx_weight(&ppriv->net_dev, &ppriv->napi,
> +                                        dpaa2_dpseci_poll,
> +                                        DPAA2_CAAM_NAPI_WEIGHT);
>         }
> 
>         return 0;
> diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c index
> 8163f5df8ebf..1c9450b29583 100644
> --- a/drivers/crypto/caam/qi.c
> +++ b/drivers/crypto/caam/qi.c
> @@ -749,8 +749,8 @@ int caam_qi_init(struct platform_device *caam_pdev)
>                 net_dev->dev = *qidev;
>                 INIT_LIST_HEAD(&net_dev->napi_list);
> 
> -               netif_napi_add(net_dev, irqtask, caam_qi_poll,
> -                              CAAM_NAPI_WEIGHT);
> +               netif_napi_add_tx_weight(net_dev, irqtask, caam_qi_poll,
> +                                        CAAM_NAPI_WEIGHT);
> 
>                 napi_enable(irqtask);
>         }
> --
> 2.36.1
Herbert Xu July 15, 2022, 8:47 a.m. UTC | #2
On Tue, Jul 05, 2022 at 03:58:57PM -0700, Jakub Kicinski wrote:
> caam has its own special NAPI weights. It's also a crypto device
> so presumably it can't be used for packet Rx. Switch to the (new)
> correct API.
> 
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: horia.geanta@nxp.com
> CC: pankaj.gupta@nxp.com
> CC: gaurav.jain@nxp.com
> CC: herbert@gondor.apana.org.au
> CC: linux-crypto@vger.kernel.org
> ---
>  drivers/crypto/caam/caamalg_qi2.c | 5 +++--
>  drivers/crypto/caam/qi.c          | 4 ++--
>  2 files changed, 5 insertions(+), 4 deletions(-)

Patch applied.  Thanks.
diff mbox series

Patch

diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index 6753f0e6e55d..56bbfdfb0d9f 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -5083,8 +5083,9 @@  static int __cold dpaa2_dpseci_setup(struct fsl_mc_device *ls_dev)
 
 		ppriv->net_dev.dev = *dev;
 		INIT_LIST_HEAD(&ppriv->net_dev.napi_list);
-		netif_napi_add(&ppriv->net_dev, &ppriv->napi, dpaa2_dpseci_poll,
-			       DPAA2_CAAM_NAPI_WEIGHT);
+		netif_napi_add_tx_weight(&ppriv->net_dev, &ppriv->napi,
+					 dpaa2_dpseci_poll,
+					 DPAA2_CAAM_NAPI_WEIGHT);
 	}
 
 	return 0;
diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
index 8163f5df8ebf..1c9450b29583 100644
--- a/drivers/crypto/caam/qi.c
+++ b/drivers/crypto/caam/qi.c
@@ -749,8 +749,8 @@  int caam_qi_init(struct platform_device *caam_pdev)
 		net_dev->dev = *qidev;
 		INIT_LIST_HEAD(&net_dev->napi_list);
 
-		netif_napi_add(net_dev, irqtask, caam_qi_poll,
-			       CAAM_NAPI_WEIGHT);
+		netif_napi_add_tx_weight(net_dev, irqtask, caam_qi_poll,
+					 CAAM_NAPI_WEIGHT);
 
 		napi_enable(irqtask);
 	}