starlingx/integ
Code Issues Proposed changes

Update kernel drivers to compile with newer kernel

Browse Source 
Kernel update to CentOS 7.5 versions are to be paired with updated
out-of-tree kernel modules, mostly for compilation purposes.

Depends-On:  https://review.openstack.org/580689

Change-Id: I8ef3f9edccfb6afa8bf68606ede7d1ef70c825d3
Signed-off-by: Jason McKenna <jason.mckenna@windriver.com>
Story: 2002761
Task: 22841
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
jmckenna 2018-07-06 08:38:34 -04:00 committed by Scott Little
parent 6732eb233e
commit b759f327a1
5 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/kernel-modules/intel-i40e/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
COPY_LIST=" \ COPY_LIST=" \
$PKG_BASE/files/* \ $PKG_BASE/files/* \
$STX_BASE/downloads/i40e-2.4.3.tar.gz" $STX_BASE/downloads/i40e-2.4.10.tar.gz"
TIS_PATCH_VER=6 TIS_PATCH_VER=1

2
kernel/kernel-modules/intel-i40e/centos/i40e-kmod.spec
View File

@ -8,7 +8,7 @@
%define kmod_name i40e %define kmod_name i40e
Name: %{kmod_name}-kmod%{?bt_ext} Name: %{kmod_name}-kmod%{?bt_ext}
Version: 2.4.3 Version: 2.4.10
Release: 0%{?_tis_dist}.%{tis_patch_ver} Release: 0%{?_tis_dist}.%{tis_patch_ver}
Group: System Environment/Kernel Group: System Environment/Kernel
License: GPLv2 License: GPLv2

11
kernel/kernel-modules/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch
View File

@ -1,7 +1,8 @@
From 71b273f39c927e5e4b4ea196f17106c147cd0804 Mon Sep 17 00:00:00 2001 From 412fdc8c0d51500e42e76e788ece3ca7dd260ced Mon Sep 17 00:00:00 2001
Message-Id: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
From: Vadim Suraev <vsuraev@northforgeinc.com> From: Vadim Suraev <vsuraev@northforgeinc.com>
Date: Mon, 8 Feb 2016 15:57:30 -0500 Date: Mon, 8 Feb 2016 15:57:30 -0500
Subject: [PATCH 1/2] i40e: Enable getting link status from VF Subject: [PATCH 1/3] i40e: Enable getting link status from VF
Add handling of custom OP code sent from the PMD VF to get link status via the Add handling of custom OP code sent from the PMD VF to get link status via the
virtual channel interface. virtual channel interface.
@ -15,7 +16,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
2 files changed, 79 insertions(+) 2 files changed, 79 insertions(+)
diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
index aba23f2..7081123 100644 index 020bacb..126ec19 100644
--- a/src/i40e_virtchnl_pf.c --- a/src/i40e_virtchnl_pf.c
+++ b/src/i40e_virtchnl_pf.c +++ b/src/i40e_virtchnl_pf.c
@@ -1857,6 +1857,81 @@ error_param: @@ -1857,6 +1857,81 @@ error_param:
@ -100,7 +101,7 @@ index aba23f2..7081123 100644
/** /**
* i40e_vc_config_queues_msg * i40e_vc_config_queues_msg
* @vf: pointer to the VF info * @vf: pointer to the VF info
@@ -2839,6 +2914,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode, @@ -2901,6 +2976,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode,
case VIRTCHNL_OP_REQUEST_QUEUES: case VIRTCHNL_OP_REQUEST_QUEUES:
ret = i40e_vc_request_queues_msg(vf, msg, msglen); ret = i40e_vc_request_queues_msg(vf, msg, msglen);
break; break;
@ -111,7 +112,7 @@ index aba23f2..7081123 100644
case VIRTCHNL_OP_UNKNOWN: case VIRTCHNL_OP_UNKNOWN:
default: default:
diff --git a/src/virtchnl.h b/src/virtchnl.h diff --git a/src/virtchnl.h b/src/virtchnl.h
index c550261..950d24e 100644 index afde603..b9b38c0 100644
--- a/src/virtchnl.h --- a/src/virtchnl.h
+++ b/src/virtchnl.h +++ b/src/virtchnl.h
@@ -133,6 +133,7 @@ enum virtchnl_ops { @@ -133,6 +133,7 @@ enum virtchnl_ops {

26
kernel/kernel-modules/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch
View File

@ -1,10 +1,10 @@
From bbe1571bb970759e8e2049512a52461da4c095b2 Mon Sep 17 00:00:00 2001 From d60e87567eb5418fbb848bf30f72d3d8bec3bad6 Mon Sep 17 00:00:00 2001
Message-Id: <bbe1571bb970759e8e2049512a52461da4c095b2.1522076866.git.Jim.Somerville@windriver.com> Message-Id: <d60e87567eb5418fbb848bf30f72d3d8bec3bad6.1528830095.git.Jim.Somerville@windriver.com>
In-Reply-To: <bc463ee30c5bc2ccc2d9541b20279e933d5fc462.1522076866.git.Jim.Somerville@windriver.com> In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
References: <bc463ee30c5bc2ccc2d9541b20279e933d5fc462.1522076866.git.Jim.Somerville@windriver.com> References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com> From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 26 Mar 2018 11:03:47 -0400 Date: Mon, 26 Mar 2018 11:03:47 -0400
Subject: [PATCH 2/2] i40e add more debug info for VFs still in reset Subject: [PATCH 2/3] i40e add more debug info for VFs still in reset
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
--- ---
@ -12,12 +12,12 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 10 insertions(+), 10 deletions(-) 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
index 7081123..83f6f88 100644 index 126ec19..da29fc3 100644
--- a/src/i40e_virtchnl_pf.c --- a/src/i40e_virtchnl_pf.c
+++ b/src/i40e_virtchnl_pf.c +++ b/src/i40e_virtchnl_pf.c
@@ -3004,8 +3004,8 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) @@ -3077,8 +3077,8 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
vf = &(pf->vf[vf_id]); msleep(20);
vsi = pf->vsi[vf->lan_vsi_idx]; }
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", - dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",
- vf_id); - vf_id);
@ -26,7 +26,7 @@ index 7081123..83f6f88 100644
ret = -EAGAIN; ret = -EAGAIN;
goto error_param; goto error_param;
} }
@@ -3145,8 +3145,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, @@ -3218,8 +3218,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
vf = &(pf->vf[vf_id]); vf = &(pf->vf[vf_id]);
vsi = pf->vsi[vf->lan_vsi_idx]; vsi = pf->vsi[vf->lan_vsi_idx];
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
@ -37,7 +37,7 @@ index 7081123..83f6f88 100644
ret = -EAGAIN; ret = -EAGAIN;
goto error_pvid; goto error_pvid;
} }
@@ -3277,8 +3277,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int max_tx_rate) @@ -3350,8 +3350,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int max_tx_rate)
vf = &(pf->vf[vf_id]); vf = &(pf->vf[vf_id]);
vsi = pf->vsi[vf->lan_vsi_idx]; vsi = pf->vsi[vf->lan_vsi_idx];
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
@ -48,7 +48,7 @@ index 7081123..83f6f88 100644
ret = -EAGAIN; ret = -EAGAIN;
goto error; goto error;
} }
@@ -3370,8 +3370,8 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, @@ -3443,8 +3443,8 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
/* first vsi is always the LAN vsi */ /* first vsi is always the LAN vsi */
vsi = pf->vsi[vf->lan_vsi_idx]; vsi = pf->vsi[vf->lan_vsi_idx];
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
@ -59,7 +59,7 @@ index 7081123..83f6f88 100644
ret = -EAGAIN; ret = -EAGAIN;
goto error_param; goto error_param;
} }
@@ -3503,8 +3503,8 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable) @@ -3576,8 +3576,8 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable)
vf = &(pf->vf[vf_id]); vf = &(pf->vf[vf_id]);
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {

14
kernel/kernel-modules/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch
View File

@ -1,8 +1,10 @@
From 3147c6198571464749af94f0fbf6986a932ed8c7 Mon Sep 17 00:00:00 2001 From 25b521f58b33bf070c0b31d077333c13c3ad25e8 Mon Sep 17 00:00:00 2001
Message-Id: <3147c6198571464749af94f0fbf6986a932ed8c7.1522697994.git.Jim.Somerville@windriver.com> Message-Id: <25b521f58b33bf070c0b31d077333c13c3ad25e8.1528830095.git.Jim.Somerville@windriver.com>
In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com> From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 2 Apr 2018 15:35:12 -0400 Date: Mon, 2 Apr 2018 15:35:12 -0400
Subject: [PATCH 1/1] ndo_get_vf_config poll for out of vf reset Subject: [PATCH 3/3] ndo_get_vf_config poll for out of vf reset
Same solution as 028daf80117376b22909becd9720daaefdfceff4 from the Same solution as 028daf80117376b22909becd9720daaefdfceff4 from the
net-next tree as supplied by Intel, but we apply it to net-next tree as supplied by Intel, but we apply it to
@ -14,10 +16,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 11 insertions(+) 1 file changed, 11 insertions(+)
diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
index 83f6f88..6f749b6 100644 index da29fc3..d5935d6 100644
--- a/src/i40e_virtchnl_pf.c --- a/src/i40e_virtchnl_pf.c
+++ b/src/i40e_virtchnl_pf.c +++ b/src/i40e_virtchnl_pf.c
@@ -3358,6 +3358,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, @@ -3431,6 +3431,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
struct i40e_pf *pf = vsi->back; struct i40e_pf *pf = vsi->back;
struct i40e_vf *vf; struct i40e_vf *vf;
int ret = 0; int ret = 0;
@ -25,7 +27,7 @@ index 83f6f88..6f749b6 100644
/* validate the request */ /* validate the request */
if (vf_id >= pf->num_alloc_vfs) { if (vf_id >= pf->num_alloc_vfs) {
@@ -3369,6 +3370,16 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, @@ -3442,6 +3443,16 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
vf = &(pf->vf[vf_id]); vf = &(pf->vf[vf_id]);
/* first vsi is always the LAN vsi */ /* first vsi is always the LAN vsi */
vsi = pf->vsi[vf->lan_vsi_idx]; vsi = pf->vsi[vf->lan_vsi_idx];