Skip to content

Commit fe29659

Browse files
Sameeh Jubransaargross-amazon
authored andcommitted
linux/ena update ENA linux driver to version 2.2.5
**New Features** * Enable dynamic interrupt moderation on ARM64 Signed-off-by: Shay Agroskin <[email protected]> Signed-off-by: Sameeh Jubran <[email protected]>
1 parent b2a3940 commit fe29659

File tree

6 files changed

+24
-10
lines changed

6 files changed

+24
-10
lines changed

kernel/linux/ena/RELEASENOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ The driver was verified on the following distributions:
3939
SUSE Linux Enterprise Server 12 SP2
4040
SUSE Linux Enterprise Server 12 SP3
4141

42+
## r2.2.5 release notes
43+
**New Features**
44+
* Enable dynamic interrupt moderation on ARM64
4245

4346
## r2.2.4 release notes
4447
**Bug Fixes**

kernel/linux/ena/ena_netdev.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2770,6 +2770,14 @@ static int ena_up(struct ena_adapter *adapter)
27702770
*/
27712771
ena_init_napi_in_range(adapter, 0, io_queue_count);
27722772

2773+
#ifdef CONFIG_ARM64
2774+
/* enable DIM by default on ARM machines, also needs to happen
2775+
* before enabling IRQs since DIM is ran from napi routine
2776+
*/
2777+
if (ena_com_interrupt_moderation_supported(adapter->ena_dev))
2778+
ena_com_enable_adaptive_moderation(adapter->ena_dev);
2779+
#endif
2780+
27732781
rc = ena_request_io_irq(adapter);
27742782
if (rc)
27752783
goto err_req_irq;

kernel/linux/ena/ena_netdev.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
#define DRV_MODULE_GEN_MAJOR 2
5555
#define DRV_MODULE_GEN_MINOR 2
56-
#define DRV_MODULE_GEN_SUBMINOR 4
56+
#define DRV_MODULE_GEN_SUBMINOR 5
5757

5858
#define DRV_MODULE_NAME "ena"
5959
#ifndef DRV_MODULE_GENERATION

kernel/linux/rpm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Author: Cristian Gafton <[email protected]>
44

55
NAME = ena
6-
VERSION = 2.2.4
6+
VERSION = 2.2.5
77

88
TOPDIR := $(shell git rev-parse --show-toplevel)
99

kernel/linux/rpm/README-rpm.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Once the pre-requisites have been installed, you can simply issue a
3232
"make" in this directory to build the kmod src.rpm package:
3333

3434
bash$ make
35-
cd .. && git archive --format=tar --prefix=ena-2.2.4/ -o rpm/ena-2.2.4.tar ena_linux_2.2.4
35+
cd .. && git archive --format=tar --prefix=ena-2.2.5/ -o rpm/ena-2.2.5.tar ena_linux_2.2.5
3636
rpmbuild -bs \
3737
--define '_topdir %(pwd)' --define '_ntopdir %(pwd)' \
3838
--define '_builddir %{_ntopdir}' \
@@ -41,7 +41,7 @@ rpmbuild -bs \
4141
--define '_rpmdir %{_ntopdir}' \
4242
--define '_srcrpmdir %{_ntopdir}' \
4343
ena.spec
44-
Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.2.4-1.el7.3.src.rpm
44+
Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.2.5-1.el7.3.src.rpm
4545
bash$ _
4646

4747

@@ -50,16 +50,16 @@ COMPILING AND INSTALLING
5050
Once the src.rpm has been created, you can build binary packages for
5151
the installed kernel-devel and kernel-headers environments:
5252

53-
bash$ rpmbuild --rebuild ena-2.2.4-1.el7.3.src.rpm
53+
bash$ rpmbuild --rebuild ena-2.2.5-1.el7.3.src.rpm
5454
[....]
55-
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.4-1.el7.3.x86_64.rpm
56-
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.2.4-1.el7.3.x86_64.rpm
55+
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.5-1.el7.3.x86_64.rpm
56+
Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.2.5-1.el7.3.x86_64.rpm
5757
[...]
5858
bash$ _
5959

6060
Now you should be able to install/deploy the resulting binary rpm
6161
packages using your preferred rpm install too. For example, using yum:
6262

6363
bash$ sudo yum -y localinstall
64-
/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.4-1.el7.3.x86_64.rpm
64+
/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.2.5-1.el7.3.x86_64.rpm
6565

kernel/linux/rpm/ena.spec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%define kmod_name ena
2-
%define kmod_driver_version 2.2.4
2+
%define kmod_driver_version 2.2.5
33
%define kmod_rpm_release 1
44
%define kmod_git_hash 3ac3e0bf079b2c0468f759f2213541e214a6dd77
55
%define kmod_kbuild_dir kernel/linux/ena
@@ -22,7 +22,7 @@ Source7: preamble
2222

2323
Name: %{kmod_name}
2424
Version: %{kmod_driver_version}
25-
Release: %{kmod_rpm_release}%{?dist}.20
25+
Release: %{kmod_rpm_release}%{?dist}.21
2626
Summary: %{kmod_name} kernel module
2727

2828
Group: System/Kernel
@@ -99,6 +99,9 @@ install -m 644 -D source/%{kmod_kbuild_dir}/RELEASENOTES.md $RPM_BUILD_ROOT/usr/
9999
rm -rf $RPM_BUILD_ROOT
100100

101101
%changelog
102+
* Thu Mar 19 2020 Sameeh Jubran [email protected] - 2.2.5-1.21
103+
- Update ENA driver to version 2.2.5
104+
102105
* Thu Mar 19 2020 Sameeh Jubran [email protected] - 2.2.4-1.20
103106
- Update ENA driver to version 2.2.4
104107

0 commit comments

Comments
 (0)