From 20ebf84e4e403fbbaf156544c3b154436f504ae6 Mon Sep 17 00:00:00 2001 From: David Arinzon Date: Wed, 22 May 2024 10:40:09 +0000 Subject: [PATCH] linux/ena: Update driver version to 2.12.1 Also updated release notes and RPM files. Signed-off-by: David Arinzon --- kernel/linux/ena/RELEASENOTES.md | 4 ++++ kernel/linux/ena/ena_netdev.h | 2 +- kernel/linux/rpm/Makefile | 2 +- kernel/linux/rpm/README-rpm.txt | 12 ++++++------ kernel/linux/rpm/ena.spec | 7 +++++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/kernel/linux/ena/RELEASENOTES.md b/kernel/linux/ena/RELEASENOTES.md index 9f460d5..6caeea6 100644 --- a/kernel/linux/ena/RELEASENOTES.md +++ b/kernel/linux/ena/RELEASENOTES.md @@ -31,6 +31,10 @@ The driver was verified on the following distributions: * SUSE Linux Enterprise Server 12 SP2 or newer * SUSE Linux Enterprise Server 15 or newer +## r2.12.1 release notes +**Bug fixes** +* Resolve a `-Wmissing-prototypes` compilation warning + ## r2.12.0 release notes **New Features** * Add support for device reset request over AENQ diff --git a/kernel/linux/ena/ena_netdev.h b/kernel/linux/ena/ena_netdev.h index 269ced8..8c1337d 100644 --- a/kernel/linux/ena/ena_netdev.h +++ b/kernel/linux/ena/ena_netdev.h @@ -32,7 +32,7 @@ #define DRV_MODULE_GEN_MAJOR 2 #define DRV_MODULE_GEN_MINOR 12 -#define DRV_MODULE_GEN_SUBMINOR 0 +#define DRV_MODULE_GEN_SUBMINOR 1 #define DRV_MODULE_NAME "ena" #ifndef DRV_MODULE_GENERATION diff --git a/kernel/linux/rpm/Makefile b/kernel/linux/rpm/Makefile index 7716d8a..d3fd6e3 100644 --- a/kernel/linux/rpm/Makefile +++ b/kernel/linux/rpm/Makefile @@ -3,7 +3,7 @@ # Author: Cristian Gafton NAME = ena -VERSION = 2.12.0 +VERSION = 2.12.1 TOPDIR := $(shell git rev-parse --show-toplevel) diff --git a/kernel/linux/rpm/README-rpm.txt b/kernel/linux/rpm/README-rpm.txt index 1f098bc..7d5df0a 100644 --- a/kernel/linux/rpm/README-rpm.txt +++ b/kernel/linux/rpm/README-rpm.txt @@ -37,7 +37,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.12.0/ -o rpm/ena-2.12.0.tar ena_linux_2.12.0 +cd .. && git archive --format=tar --prefix=ena-2.12.1/ -o rpm/ena-2.12.1.tar ena_linux_2.12.1 rpmbuild -bs \ --define '_topdir %(pwd)' --define '_ntopdir %(pwd)' \ --define '_builddir %{_ntopdir}' \ @@ -46,7 +46,7 @@ rpmbuild -bs \ --define '_rpmdir %{_ntopdir}' \ --define '_srcrpmdir %{_ntopdir}' \ ena.spec -Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.12.0-1.el7.3.src.rpm +Wrote: /home/ec2-user/amzn-drivers/rpm/ena-2.12.1-1.el7.3.src.rpm bash$ _ @@ -55,10 +55,10 @@ 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.12.0-1.el7.3.src.rpm +bash$ rpmbuild --rebuild ena-2.12.1-1.el7.3.src.rpm [....] -Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.12.0-1.el7.3.x86_64.rpm -Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.12.0-1.el7.3.x86_64.rpm +Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.12.1-1.el7.3.x86_64.rpm +Wrote: /home/ec2-user/rpmbuild/RPMS/x86_64/ena-debuginfo-2.12.1-1.el7.3.x86_64.rpm [...] bash$ _ @@ -66,5 +66,5 @@ 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.12.0-1.el7.3.x86_64.rpm +/home/ec2-user/rpmbuild/RPMS/x86_64/kmod-ena-2.12.1-1.el7.3.x86_64.rpm diff --git a/kernel/linux/rpm/ena.spec b/kernel/linux/rpm/ena.spec index 2081b7b..485c5d5 100644 --- 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.12.0 +%define kmod_driver_version 2.12.1 %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}.54 +Release: %{kmod_rpm_release}%{?dist}.55 Summary: %{kmod_name} kernel module Group: System/Kernel @@ -103,6 +103,9 @@ install -m 644 -D source/%{kmod_kbuild_dir}/RELEASENOTES.md $RPM_BUILD_ROOT/usr/ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 22 2024 David Arinzon darinzon@amazon.com - 2.12.1-1.55 +- Update ENA driver to version 2.12.1 + * Thu Feb 08 2024 Evgeny Ostrovsky evostrov@amazon.com - 2.12.0-1.54 - Update ENA driver to version 2.12.0