0005-nss-dp-adapt-to-netif_napi_add-changes.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. From e46c4d526d77916c00fff4fff3237b9c9d0d774d Mon Sep 17 00:00:00 2001
  2. From: Robert Marko <[email protected]>
  3. Date: Fri, 23 Jun 2023 12:04:11 +0200
  4. Subject: [PATCH 5/8] nss-dp: adapt to netif_napi_add() changes
  5. netif_napi_add() removed the weight argument and just uses the default
  6. NAPI_POLL_WEIGHT in background, so for those requiring custom weight use
  7. netif_napi_add_weight() instead.
  8. Signed-off-by: Robert Marko <[email protected]>
  9. ---
  10. hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c | 4 ++++
  11. hal/dp_ops/syn_gmac_dp/syn_dp.c | 5 +++++
  12. 2 files changed, 9 insertions(+)
  13. --- a/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
  14. +++ b/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
  15. @@ -844,8 +844,12 @@ static int edma_register_netdevice(struc
  16. * NAPI add
  17. */
  18. if (!edma_hw.napi_added) {
  19. +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0))
  20. netif_napi_add(netdev, &edma_hw.napi, edma_napi,
  21. NAPI_POLL_WEIGHT);
  22. +#else
  23. + netif_napi_add(netdev, &edma_hw.napi, edma_napi);
  24. +#endif
  25. /*
  26. * Register the interrupt handlers and enable interrupts
  27. */
  28. --- a/hal/dp_ops/syn_gmac_dp/syn_dp.c
  29. +++ b/hal/dp_ops/syn_gmac_dp/syn_dp.c
  30. @@ -189,8 +189,13 @@ static int syn_dp_if_init(struct nss_dp_
  31. }
  32. if (!dev_info->napi_added) {
  33. +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0))
  34. netif_napi_add(netdev, &rx_info->napi_rx, syn_dp_napi_poll_rx, SYN_DP_NAPI_BUDGET_RX);
  35. netif_napi_add(netdev, &tx_info->napi_tx, syn_dp_napi_poll_tx, SYN_DP_NAPI_BUDGET_TX);
  36. +#else
  37. + netif_napi_add_weight(netdev, &rx_info->napi_rx, syn_dp_napi_poll_rx, SYN_DP_NAPI_BUDGET_RX);
  38. + netif_napi_add_weight(netdev, &tx_info->napi_tx, syn_dp_napi_poll_tx, SYN_DP_NAPI_BUDGET_TX);
  39. +#endif
  40. /*
  41. * Requesting irq. Set IRQ_DISABLE_UNLAZY flag, this flag