linux/ena update ENA linux driver to version 2.2.6

**Bug Fixes** * Disable rx offset feature Signed-off-by: Sameeh Jubran <[email protected]>
amzn · Jun 30, 2020 · a2235ee · a2235ee
1 parent fe29659
commit a2235ee
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/kernel/linux/common/ena_com/ena_eth_com.c b/kernel/linux/common/ena_com/ena_eth_com.c
@@ -574,7 +574,6 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq,
 	}
 
 	cdesc = ena_com_rx_cdesc_idx_to_ptr(io_cq, cdesc_idx);
-	ena_rx_ctx->pkt_offset = cdesc->offset;
 
 	do {
 		ena_buf->len = cdesc->length;

diff --git a/kernel/linux/ena/RELEASENOTES.md b/kernel/linux/ena/RELEASENOTES.md
@@ -39,6 +39,10 @@ The driver was verified on the following distributions:
 SUSE Linux Enterprise Server 12 SP2
 SUSE Linux Enterprise Server 12 SP3
 
+## r2.2.6 release notes
+**Bug Fixes**
+* Disable rx offset feature
+
 ## r2.2.5 release notes
 **New Features**
 * Enable dynamic interrupt moderation on ARM64

diff --git a/kernel/linux/ena/ena_netdev.c b/kernel/linux/ena/ena_netdev.c
@@ -3398,7 +3398,6 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pd
 	host_info->num_cpus = num_online_cpus();
 
 	host_info->driver_supported_features =
-		ENA_ADMIN_HOST_INFO_RX_OFFSET_MASK |
 		ENA_ADMIN_HOST_INFO_INTERRUPT_MODERATION_MASK |
 		ENA_ADMIN_HOST_INFO_MAP_RX_BUF_BIDIRECTIONAL_MASK;
 

diff --git a/kernel/linux/ena/ena_netdev.h b/kernel/linux/ena/ena_netdev.h
@@ -53,7 +53,7 @@
 
 #define DRV_MODULE_GEN_MAJOR	2
 #define DRV_MODULE_GEN_MINOR	2
-#define DRV_MODULE_GEN_SUBMINOR 5
+#define DRV_MODULE_GEN_SUBMINOR 6
 
 #define DRV_MODULE_NAME		"ena"
 #ifndef DRV_MODULE_GENERATION

diff --git a/kernel/linux/rpm/Makefile b/kernel/linux/rpm/Makefile
@@ -3,7 +3,7 @@
 # Author: Cristian Gafton <[email protected]>
 
 NAME	= ena
-VERSION	= 2.2.5
+VERSION	= 2.2.6
 
 TOPDIR	:= $(shell git rev-parse --show-toplevel)
 

diff --git a/kernel/linux/rpm/README-rpm.txt b/kernel/linux/rpm/README-rpm.txt
@@ -32,7 +32,7 @@ Once the pre-requisites have been installed, you can simply issue a
 "make" in this directory to build the kmod src.rpm package:
 
 bash$ make
-cd .. && git archive --format=tar --prefix=ena-2.2.5/ -o rpm/ena-2.2.5.tar ena_linux_2.2.5
+cd .. && git archive --format=tar --prefix=ena-2.2.6/ -o rpm/ena-2.2.6.tar ena_linux_2.2.6
 rpmbuild -bs \
             --define '_topdir %(pwd)' --define '_ntopdir %(pwd)' \
             --define '_builddir  %{_ntopdir}' \
@@ -41,7 +41,7 @@ rpmbuild -bs \
             --define '_rpmdir    %{_ntopdir}' \
             --define '_srcrpmdir %{_ntopdir}' \
         ena.spec
-Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.2.5-1.el7.3.src.rpm
+Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.2.6-1.el7.3.src.rpm
 bash$ _
 
 
@@ -50,16 +50,16 @@ COMPILING AND INSTALLING
 Once the src.rpm has been created, you can build binary packages for
 the installed kernel-devel and kernel-headers environments:
 
-bash$ rpmbuild --rebuild ena-2.2.5-1.el7.3.src.rpm
+bash$ rpmbuild --rebuild ena-2.2.6-1.el7.3.src.rpm
 [....]
-Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.5-1.el7.3.x86_64.rpm
-Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.2.5-1.el7.3.x86_64.rpm
+Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.6-1.el7.3.x86_64.rpm
+Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.2.6-1.el7.3.x86_64.rpm
 [...]
 bash$ _
 
 Now you should be able to install/deploy the resulting binary rpm
 packages using your preferred rpm install too. For example, using yum:
 
 bash$ sudo yum -y localinstall
-/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.5-1.el7.3.x86_64.rpm
+/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.6-1.el7.3.x86_64.rpm
 
diff --git a/kernel/linux/rpm/ena.spec b/kernel/linux/rpm/ena.spec
@@ -1,5 +1,5 @@
 %define kmod_name		ena
-%define kmod_driver_version	2.2.5
+%define kmod_driver_version	2.2.6
 %define kmod_rpm_release	1
 %define kmod_git_hash		3ac3e0bf079b2c0468f759f2213541e214a6dd77
 %define kmod_kbuild_dir		kernel/linux/ena
@@ -22,7 +22,7 @@ Source7:	preamble
 
 Name:		%{kmod_name}
 Version:	%{kmod_driver_version}
-Release:	%{kmod_rpm_release}%{?dist}.21
+Release:	%{kmod_rpm_release}%{?dist}.22
 Summary:	%{kmod_name} kernel module
 
 Group:		System/Kernel
@@ -99,6 +99,9 @@ install -m 644 -D source/%{kmod_kbuild_dir}/RELEASENOTES.md $RPM_BUILD_ROOT/usr/
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 01 2020 Sameeh Jubran [email protected] - 2.2.6-1.22
+- Update ENA driver to version 2.2.6
+
 * Thu Mar 19 2020 Sameeh Jubran [email protected] - 2.2.5-1.21
 - Update ENA driver to version 2.2.5
-Original file line number
+Diff line change
@@ Expand Up / @@ -574,7 +574,6 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq, @@
     	}
     	cdesc = ena_com_rx_cdesc_idx_to_ptr(io_cq, cdesc_idx);
-    	ena_rx_ctx->pkt_offset = cdesc->offset;
     	do {
     		ena_buf->len = cdesc->length;
@@ Expand Down @@