!48 Update i40e version to 2.22.8 to fix kernel-6.1 based build error
From: @chengyechun Reviewed-by: @seuzw Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot
Gitee
commit
32fc8c80a5
@ -1,46 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
author Hao Chen <chenhao288@hisilicon.com> 2021-11-18 20:12:43 +0800
|
||||
committer David S. Miller <davem@davemloft.net> 2021-11-22 12:31:49 +0000
|
||||
commit 7462494408cd3de8b0bc1e79670bf213288501d0 (patch)
|
||||
tree 61a9e0eb7e7f2e53c2afca17e284dcef3f85d572
|
||||
parent 0b70c256eba8448b072d25c95ee65e59da8970de (diff)
|
||||
download linux-7462494408cd.tar.gz
|
||||
ethtool: extend ringparam setting/getting API with rx_buf_len
|
||||
|
||||
Add two new parameters kernel_ringparam and extack for
|
||||
.get_ringparam and .set_ringparam to extend more ring params
|
||||
through netlink.
|
||||
|
||||
Signed-off-by: Hao Chen <chenhao288@hisilicon.com>
|
||||
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
---
|
||||
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 3ae5d2e..66902cf 100644
|
||||
--- a/src/i40e_ethtool.c
|
||||
+++ b/src/i40e_ethtool.c
|
||||
@@ -2227,7 +2227,9 @@ static void i40e_get_drvinfo(struct net_device *netdev,
|
||||
}
|
||||
|
||||
static void i40e_get_ringparam(struct net_device *netdev,
|
||||
- struct ethtool_ringparam *ring)
|
||||
+ struct ethtool_ringparam *ring,
|
||||
+ struct kernel_ethtool_ringparam *kernel_ring,
|
||||
+ struct netlink_ext_ack *extack)
|
||||
{
|
||||
struct i40e_netdev_priv *np = netdev_priv(netdev);
|
||||
struct i40e_pf *pf = np->vsi->back;
|
||||
@@ -2255,7 +2257,9 @@ static bool i40e_active_tx_ring_index(struct i40e_vsi *vsi, u16 index)
|
||||
}
|
||||
|
||||
static int i40e_set_ringparam(struct net_device *netdev,
|
||||
- struct ethtool_ringparam *ring)
|
||||
+ struct ethtool_ringparam *ring,
|
||||
+ struct kernel_ethtool_ringparam *kernel_ring,
|
||||
+ struct netlink_ext_ack *extack)
|
||||
{
|
||||
struct i40e_ring *tx_rings = NULL, *rx_rings = NULL;
|
||||
struct i40e_netdev_priv *np = netdev_priv(netdev);
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
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.22.8.tar.gz
Normal file
BIN
i40e-2.22.8.tar.gz
Normal file
Binary file not shown.
17
i40e.spec
17
i40e.spec
@ -8,17 +8,12 @@
|
||||
|
||||
Name: i40e
|
||||
Summary: Intel(R) 40-10 Gigabit Ethernet Connection Network Driver
|
||||
Version: 2.14.13
|
||||
Release: 9
|
||||
Version: 2.22.8
|
||||
Release: 1
|
||||
Vendor: Intel Corporation
|
||||
License: GPL-2.0
|
||||
URL: http://support.intel.com
|
||||
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
|
||||
Patch6001: backport-extend-ringparam-setting-getting-API-with-rx_buf_len.patch
|
||||
Source0: https://downloadmirror.intel.com/763931/%{name}-%{version}.tar.gz
|
||||
|
||||
Requires: kernel, findutils, gawk, bash, hwdata
|
||||
|
||||
@ -386,6 +381,12 @@ else
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user