Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / Atom feed
From: "Kiyanovski, Arthur" <akiyano@amazon.com>
To: Leon Romanovsky <leon@kernel.org>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>
Cc: Thor Thayer <thor.thayer@linux.intel.com>,
	Heiko Stuebner <heiko@sntech.de>,
	Igor Russkikh <irusskikh@marvell.com>,
	Andreas Larsson <andreas@gaisler.com>,
	Chris Snook <chris.snook@gmail.com>,
	David Dillow <dave@thedillows.org>,
	Jes Sorensen <jes@trained-monkey.org>,
	Iyappan Subramanian <iyappan@os.amperecomputing.com>,
	Quan Nguyen <quan@os.amperecomputing.com>,
	"linux-acenic@sunsite.dk" <linux-acenic@sunsite.dk>,
	Andy Gospodarek <andy@greyhouse.net>,
	"linux-rockchip@lists.infradead.org"
	<linux-rockchip@lists.infradead.org>,
	Chen-Yu Tsai <wens@csie.org>,
	Lino Sanfilippo <LinoSanfilippo@gmx.de>,
	Veaceslav Falico <vfalico@gmail.com>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	Jay Cliburn <jcliburn@gmail.com>,
	Jay Vosburgh <j.vosburgh@gmail.com>,
	Keyur Chudgar <keyur@os.amperecomputing.com>,
	Maxime Ripard <mripard@kernel.org>,
	Leon Romanovsky <leonro@mellanox.com>,
	Don Fry <pcnet32@frontier.com>,
	"nios2-dev@lists.rocketboards.org"
	<nios2-dev@lists.rocketboards.org>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Ion Badulescu <ionut@badula.org>,
	"Belgazal, Netanel" <netanel@amazon.com>,
	Mark Einon <mark.einon@gmail.com>
Subject: RE: [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is aligned to the linux kernel
Date: Mon, 24 Feb 2020 09:03:14 +0000
Message-ID: <79ed2b392b4e413faef03f4bb2f8d562@EX13D22EUA004.ant.amazon.com> (raw)
In-Reply-To: <20200224085311.460338-13-leon@kernel.org>



> -----Original Message-----
> From: Leon Romanovsky <leon@kernel.org>
> Sent: Monday, February 24, 2020 10:53 AM
> To: David S. Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>
> Cc: Leon Romanovsky <leonro@mellanox.com>; Tom Lendacky
> <thomas.lendacky@amd.com>; Keyur Chudgar
> <keyur@os.amperecomputing.com>; Don Fry <pcnet32@frontier.com>;
> Veaceslav Falico <vfalico@gmail.com>; Jay Vosburgh <j.vosburgh@gmail.com>;
> linux-acenic@sunsite.dk; Maxime Ripard <mripard@kernel.org>; Heiko Stuebner
> <heiko@sntech.de>; Mark Einon <mark.einon@gmail.com>; Chris Snook
> <chris.snook@gmail.com>; linux-rockchip@lists.infradead.org; Iyappan
> Subramanian <iyappan@os.amperecomputing.com>; Igor Russkikh
> <irusskikh@marvell.com>; David Dillow <dave@thedillows.org>; Belgazal,
> Netanel <netanel@amazon.com>; Quan Nguyen
> <quan@os.amperecomputing.com>; Jay Cliburn <jcliburn@gmail.com>; Lino
> Sanfilippo <LinoSanfilippo@gmx.de>; linux-arm-kernel@lists.infradead.org;
> Andreas Larsson <andreas@gaisler.com>; Andy Gospodarek
> <andy@greyhouse.net>; netdev@vger.kernel.org; Thor Thayer
> <thor.thayer@linux.intel.com>; linux-kernel@vger.kernel.org; Ion Badulescu
> <ionut@badula.org>; Kiyanovski, Arthur <akiyano@amazon.com>; Jes Sorensen
> <jes@trained-monkey.org>; nios2-dev@lists.rocketboards.org; Chen-Yu Tsai
> <wens@csie.org>
> Subject: [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is
> aligned to the linux kernel
> 
> From: Leon Romanovsky <leonro@mellanox.com>
> 
> Upstream drivers are managed inside global repository and released all
> together, this ensure that driver version is the same as linux kernel, so update
> amazon drivers to properly reflect it.
> 
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> ---
>  drivers/net/ethernet/amazon/ena/ena_ethtool.c |  1 -
> drivers/net/ethernet/amazon/ena/ena_netdev.c  | 17 ++---------------
> drivers/net/ethernet/amazon/ena/ena_netdev.h  | 11 -----------
>  3 files changed, 2 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> index ced1d577b62a..19262f37db84 100644
> --- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> +++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> @@ -404,7 +404,6 @@ static void ena_get_drvinfo(struct net_device *dev,
>  	struct ena_adapter *adapter = netdev_priv(dev);
> 
>  	strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
> -	strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
>  	strlcpy(info->bus_info, pci_name(adapter->pdev),
>  		sizeof(info->bus_info));
>  }
> diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> index 0b2fd96b93d7..4faf81c456d8 100644
> --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
> +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
> @@ -49,12 +49,9 @@
>  #include <linux/bpf_trace.h>
>  #include "ena_pci_id_tbl.h"
> 
> -static char version[] = DEVICE_NAME " v" DRV_MODULE_VERSION "\n";
> -
>  MODULE_AUTHOR("Amazon.com, Inc. or its affiliates");
> MODULE_DESCRIPTION(DEVICE_NAME);  MODULE_LICENSE("GPL"); -
> MODULE_VERSION(DRV_MODULE_VERSION);
> 
>  /* Time in jiffies before concluding the transmitter is hung. */  #define
> TX_TIMEOUT  (5 * HZ) @@ -3093,11 +3090,7 @@ static void
> ena_config_host_info(struct ena_com_dev *ena_dev,
>  	host_info->os_dist = 0;
>  	strncpy(host_info->os_dist_str, utsname()->release,
>  		sizeof(host_info->os_dist_str) - 1);
> -	host_info->driver_version =
> -		(DRV_MODULE_VER_MAJOR) |
> -		(DRV_MODULE_VER_MINOR <<
> ENA_ADMIN_HOST_INFO_MINOR_SHIFT) |
> -		(DRV_MODULE_VER_SUBMINOR <<
> ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT) |
> -		("K"[0] << ENA_ADMIN_HOST_INFO_MODULE_TYPE_SHIFT);
> +	host_info->driver_version = LINUX_VERSION_CODE;
>  	host_info->num_cpus = num_online_cpus();
> 
>  	host_info->driver_supported_features = @@ -3476,9 +3469,7 @@
> static int ena_restore_device(struct ena_adapter *adapter)
>  		netif_carrier_on(adapter->netdev);
> 
>  	mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));
> -	dev_err(&pdev->dev,
> -		"Device reset completed successfully, Driver info: %s\n",
> -		version);
> +	dev_err(&pdev->dev, "Device reset completed successfully\n");
> 
>  	return rc;
>  err_disable_msix:
> @@ -4116,8 +4107,6 @@ static int ena_probe(struct pci_dev *pdev, const
> struct pci_device_id *ent)
> 
>  	dev_dbg(&pdev->dev, "%s\n", __func__);
> 
> -	dev_info_once(&pdev->dev, "%s", version);
> -
>  	rc = pci_enable_device_mem(pdev);
>  	if (rc) {
>  		dev_err(&pdev->dev, "pci_enable_device_mem() failed!\n");
> @@ -4429,8 +4418,6 @@ static struct pci_driver ena_pci_driver = {
> 
>  static int __init ena_init(void)
>  {
> -	pr_info("%s", version);
> -
>  	ena_wq = create_singlethread_workqueue(DRV_MODULE_NAME);
>  	if (!ena_wq) {
>  		pr_err("Failed to create workqueue\n"); diff --git
> a/drivers/net/ethernet/amazon/ena/ena_netdev.h
> b/drivers/net/ethernet/amazon/ena/ena_netdev.h
> index 8795e0b1dc3c..74c7f10b60dd 100644
> --- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
> +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
> @@ -45,18 +45,7 @@
>  #include "ena_com.h"
>  #include "ena_eth_com.h"
> 
> -#define DRV_MODULE_VER_MAJOR	2
> -#define DRV_MODULE_VER_MINOR	1
> -#define DRV_MODULE_VER_SUBMINOR 0
> -
>  #define DRV_MODULE_NAME		"ena"
> -#ifndef DRV_MODULE_VERSION
> -#define DRV_MODULE_VERSION \
> -	__stringify(DRV_MODULE_VER_MAJOR) "."	\
> -	__stringify(DRV_MODULE_VER_MINOR) "."	\
> -	__stringify(DRV_MODULE_VER_SUBMINOR) "K"
> -#endif
> -
>  #define DEVICE_NAME	"Elastic Network Adapter (ENA)"
> 
>  /* 1 for AENQ + ADMIN */
> --
> 2.24.1

Hi Leon, David,

This patch is not good for the ENA driver as it breaks the interface with the FW of the ENA device in ena_config_host_info(), host_info is later reported to the FW.
Please do not merge it yet.
We are now working on altering your patch so that it won't break this interface and will send it to you in the next few hours.

Thanks,
Arthur


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply index

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-24  8:52 [PATCH net-next v1 00/18] Clean driver, module and FW versions Leon Romanovsky
2020-02-24  8:52 ` [PATCH net-next v1 01/18] net/bond: Delete driver and module versions Leon Romanovsky
2020-02-24  8:52 ` [PATCH net-next v1 02/18] net/dummy: Ditch " Leon Romanovsky
2020-02-24  8:52 ` [PATCH net-next v1 03/18] net/3com: Delete driver and module versions from 3com drivers Leon Romanovsky
2020-04-11 15:56   ` [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition Borislav Petkov
2020-04-11 16:11     ` Leon Romanovsky
2020-04-11 17:35       ` Borislav Petkov
2020-04-11 18:10         ` Leon Romanovsky
2020-04-11 18:41           ` Borislav Petkov
2020-04-13  4:03     ` David Miller
2020-04-13  4:55       ` Leon Romanovsky
2020-04-13  5:07         ` David Miller
2020-04-13  5:26           ` Leon Romanovsky
2020-04-13  5:36             ` David Miller
2020-04-13  8:04               ` Borislav Petkov
2020-04-13  8:40                 ` Leon Romanovsky
2020-04-14 12:23                   ` Leon Romanovsky
2020-02-24  8:52 ` [PATCH net-next v1 04/18] net/adaptec: Clean driver versions Leon Romanovsky
2020-02-24  8:52 ` [PATCH net-next v1 05/18] net/aeroflex: Clean ethtool_info struct assignments Leon Romanovsky
2020-02-24  8:52 ` [PATCH net-next v1 06/18] net/aeroflex: Don't assign FW if it is not available Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 07/18] net/agere: Delete unneeded driver version Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 08/18] net/alacritech: Delete " Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 09/18] net/allwinner: Remove " Leon Romanovsky
2020-02-24  9:43   ` Maxime Ripard
2020-02-24  8:53 ` [PATCH net-next v1 10/18] net/alteon: Properly report FW version Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 11/18] net/althera: Delete hardcoded driver version Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 12/18] net/amazon: Ensure that driver version is aligned to the linux kernel Leon Romanovsky
2020-02-24  9:03   ` Kiyanovski, Arthur [this message]
2020-02-24  9:41     ` Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 13/18] net/amd: Remove useless driver version Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 14/18] net/apm: " Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 15/18] net/apm: Properly mark absence of FW Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 16/18] net/aquantia: Delete module version Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 17/18] net/arc: Delete driver version Leon Romanovsky
2020-02-24  8:53 ` [PATCH net-next v1 18/18] net/atheros: Clean atheros code from " Leon Romanovsky
2020-02-24 18:15   ` Chris Snook
2020-02-24 19:49 ` [PATCH net-next v1 00/18] Clean driver, module and FW versions David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=79ed2b392b4e413faef03f4bb2f8d562@EX13D22EUA004.ant.amazon.com \
    --to=akiyano@amazon.com \
    --cc=LinoSanfilippo@gmx.de \
    --cc=andreas@gaisler.com \
    --cc=andy@greyhouse.net \
    --cc=chris.snook@gmail.com \
    --cc=dave@thedillows.org \
    --cc=davem@davemloft.net \
    --cc=heiko@sntech.de \
    --cc=ionut@badula.org \
    --cc=irusskikh@marvell.com \
    --cc=iyappan@os.amperecomputing.com \
    --cc=j.vosburgh@gmail.com \
    --cc=jcliburn@gmail.com \
    --cc=jes@trained-monkey.org \
    --cc=keyur@os.amperecomputing.com \
    --cc=kuba@kernel.org \
    --cc=leon@kernel.org \
    --cc=leonro@mellanox.com \
    --cc=linux-acenic@sunsite.dk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.einon@gmail.com \
    --cc=mripard@kernel.org \
    --cc=netanel@amazon.com \
    --cc=netdev@vger.kernel.org \
    --cc=nios2-dev@lists.rocketboards.org \
    --cc=pcnet32@frontier.com \
    --cc=quan@os.amperecomputing.com \
    --cc=thomas.lendacky@amd.com \
    --cc=thor.thayer@linux.intel.com \
    --cc=vfalico@gmail.com \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-ARM-Kernel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git
	git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \
		linux-arm-kernel@lists.infradead.org
	public-inbox-index linux-arm-kernel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git