Compare commits
No commits in common. "5969525fcb3e32d2fe449aa1b7fed3df14cbedbf" and "0bf6693fee8e73e31a8c3818878322819aa5aa71" have entirely different histories.
5969525fcb
...
0bf6693fee
46
backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch
Normal file
46
backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From 09c9f89806878a4f4dc66c0a45130ca1a3e6f940 Mon Sep 17 00:00:00 2001
|
||||||
|
From: chengyechun <chengyechun1@huawei.com>
|
||||||
|
Date: Mon, 13 Jun 2022 20:29:03 +0800
|
||||||
|
Subject: [PATCH] backport extend coalesce setting -uAPI with CQE mode
|
||||||
|
|
||||||
|
In order to support more coalesce parameters through netlink,
|
||||||
|
add two new parameter kernel_coal and extack for .set_coalesce
|
||||||
|
and .get_coalesce, then some extra info can return to user with
|
||||||
|
the netlink API.
|
||||||
|
|
||||||
|
Signed-off-by: Yufeng Mo <moyufeng@huawei.com>
|
||||||
|
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
|
||||||
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||||
|
---
|
||||||
|
src/i40e_ethtool.c | 8 ++++++--
|
||||||
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/i40e_ethtool.c b/src/i40e_ethtool.c
|
||||||
|
index 456e59c..3ae5d2e 100644
|
||||||
|
--- a/src/i40e_ethtool.c
|
||||||
|
+++ b/src/i40e_ethtool.c
|
||||||
|
@@ -3284,7 +3284,9 @@ static int __i40e_get_coalesce(struct net_device *netdev,
|
||||||
|
* __i40e_get_coalesce for more details.
|
||||||
|
**/
|
||||||
|
static int i40e_get_coalesce(struct net_device *netdev,
|
||||||
|
- struct ethtool_coalesce *ec)
|
||||||
|
+ struct ethtool_coalesce *ec,
|
||||||
|
+ struct kernel_ethtool_coalesce *kernel_coal,
|
||||||
|
+ struct netlink_ext_ack *extack)
|
||||||
|
{
|
||||||
|
return __i40e_get_coalesce(netdev, ec, -1);
|
||||||
|
}
|
||||||
|
@@ -3507,7 +3509,9 @@ static int __i40e_set_coalesce(struct net_device *netdev,
|
||||||
|
* This will set each queue to the same coalesce settings.
|
||||||
|
**/
|
||||||
|
static int i40e_set_coalesce(struct net_device *netdev,
|
||||||
|
- struct ethtool_coalesce *ec)
|
||||||
|
+ struct ethtool_coalesce *ec,
|
||||||
|
+ struct kernel_ethtool_coalesce *kernel_coal,
|
||||||
|
+ struct netlink_ext_ack *extack)
|
||||||
|
{
|
||||||
|
return __i40e_set_coalesce(netdev, ec, -1);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
51
fix-gcc9-new-warning.patch
Normal file
51
fix-gcc9-new-warning.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
From e43f6fdd252c2b85a626e10f3eda7b27192cedcf Mon Sep 17 00:00:00 2001
|
||||||
|
From: hanzhijun <hanzhijun1@huawei.com>
|
||||||
|
Date: Fri, 5 Feb 2021 15:57:13 +0800
|
||||||
|
Subject: [PATCH] fix gcc9 new warning
|
||||||
|
|
||||||
|
---
|
||||||
|
src/i40e_txrx.c | 21 +++++++++++----------
|
||||||
|
1 file changed, 11 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/i40e_txrx.c b/src/i40e_txrx.c
|
||||||
|
index ea07464..0ca5a17 100644
|
||||||
|
--- a/src/i40e_txrx.c
|
||||||
|
+++ b/src/i40e_txrx.c
|
||||||
|
@@ -9,6 +9,17 @@
|
||||||
|
#include "i40e_trace.h"
|
||||||
|
#include "i40e_prototype.h"
|
||||||
|
|
||||||
|
+/**
|
||||||
|
+ * i40e_rx_offset - Return expected offset into page to access data
|
||||||
|
+ * @rx_ring: Ring we are requesting offset of
|
||||||
|
+ *
|
||||||
|
+ * Returns the offset value for ring into the data buffer.
|
||||||
|
+ */
|
||||||
|
+static inline unsigned int i40e_rx_offset(struct i40e_ring *rx_ring)
|
||||||
|
+{
|
||||||
|
+ return ring_uses_build_skb(rx_ring) ? I40E_SKB_PAD : 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static inline __le64 build_ctob(u32 td_cmd, u32 td_offset, unsigned int size,
|
||||||
|
u32 td_tag)
|
||||||
|
{
|
||||||
|
@@ -1776,16 +1787,6 @@ static bool i40e_alloc_mapped_skb(struct i40e_ring *rx_ring,
|
||||||
|
}
|
||||||
|
|
||||||
|
#else /* CONFIG_I40E_DISABLE_PACKET_SPLIT */
|
||||||
|
-/**
|
||||||
|
- * i40e_rx_offset - Return expected offset into page to access data
|
||||||
|
- * @rx_ring: Ring we are requesting offset of
|
||||||
|
- *
|
||||||
|
- * Returns the offset value for ring into the data buffer.
|
||||||
|
- */
|
||||||
|
-static inline unsigned int i40e_rx_offset(struct i40e_ring *rx_ring)
|
||||||
|
-{
|
||||||
|
- return ring_uses_build_skb(rx_ring) ? I40E_SKB_PAD : 0;
|
||||||
|
-}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* i40e_alloc_mapped_page - recycle or make a new page
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
BIN
i40e-2.14.13.tar.gz
Normal file
BIN
i40e-2.14.13.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
43
i40e.spec
43
i40e.spec
@ -8,12 +8,16 @@
|
|||||||
|
|
||||||
Name: i40e
|
Name: i40e
|
||||||
Summary: Intel(R) 40-10 Gigabit Ethernet Connection Network Driver
|
Summary: Intel(R) 40-10 Gigabit Ethernet Connection Network Driver
|
||||||
Version: 2.24.6
|
Version: 2.14.13
|
||||||
Release: 1
|
Release: 8
|
||||||
Vendor: Intel Corporation
|
Vendor: Intel Corporation
|
||||||
License: GPL-2.0
|
License: GPL-2.0
|
||||||
URL: http://support.intel.com
|
URL: http://support.intel.com
|
||||||
Source0: https://downloadmirror.intel.com/812528/%{name}-%{version}.tar.gz
|
Source0: https://downloadcenter.intel.com/download/24411/Intel-Network-Adapter-Driver-for-PCIe-40-Gigabit-Ethernet-Network-Connections-Under-Linux-/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch0001: fix-gcc9-new-warning.patch
|
||||||
|
|
||||||
|
Patch6000: backport-extend-coalesce-setting-uAPI-with-CQE-mode.patch
|
||||||
|
|
||||||
Requires: kernel, findutils, gawk, bash, hwdata
|
Requires: kernel, findutils, gawk, bash, hwdata
|
||||||
|
|
||||||
@ -381,38 +385,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jan 19 2024 chengyechun <chengyechun1@huawei.com> - 2.24.6-1
|
* Mon Jun 13 2022 chengyechun <chengyechun1@huawei.com> -2.14.13-8
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:update i40e version to 2.24.6 to fix kernel-6.6 based build error
|
|
||||||
|
|
||||||
* Wed Jul 26 2023 chengyechun <chengyechun1@huawei.com> - 2.22.8-3
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:Remove the obsolte u64_stats_fetch_*_irq() users
|
|
||||||
use mul_u64_u64_div_u64 and convert .adjfreq to .adjfine
|
|
||||||
|
|
||||||
* Thu Feb 2 2023 chengyechun <chengyechun1@huawei.com> - 2.22.8-2
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:remove i40e-2.14.13.tar.gz
|
|
||||||
|
|
||||||
* Thu Feb 2 2023 chengyechun <chengyechun1@huawei.com> - 2.22.8-1
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:Update i40e version to 2.22.8 to fix kernel-6.1 based build error
|
|
||||||
|
|
||||||
* Wed Jun 22 2022 chengyechun <chengyechun1@huawei.com> - 2.14.13-9
|
|
||||||
- Type:bugfix
|
|
||||||
- ID:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:extend ringparam setting/getting API with rx_buf_len
|
|
||||||
|
|
||||||
* Mon Jun 13 2022 chengyechun <chengyechun1@huawei.com> - 2.14.13-8
|
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user