Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c7624d8 authored by Xi Wang's avatar Xi Wang Committed by David S. Miller
Browse files

net: hns3: Fix for hns3 module is loaded multiple times problem 



If the hns3 driver has been built into kernel and then loaded with
the same driver which built as KLM, it may trigger an error like
below:

[   20.009555] hns3: Hisilicon Ethernet Network Driver for Hip08 Family - version
[   20.016789] hns3: Copyright (c) 2017 Huawei Corporation.
[   20.022100] Error: Driver 'hns3' is already registered, aborting...
[   23.517397] Unable to handle kernel NULL pointer dereference at virtual address 00000000
...
[   23.691583] Process insmod (pid: 1982, stack limit = 0x00000000cd5f21cb)
[   23.698270] Call trace:
[   23.700705]  __list_del_entry_valid+0x2c/0xd8
[   23.705049]  hnae3_unregister_client+0x68/0xa8
[   23.709487]  hns3_init_module+0x98/0x1000 [hns3]
[   23.714093]  do_one_initcall+0x5c/0x170
[   23.717918]  do_init_module+0x64/0x1f4
[   23.721654]  load_module+0x1d14/0x24b0
[   23.725390]  SyS_init_module+0x158/0x208
[   23.729300]  el0_svc_naked+0x30/0x34

This patch fixes it by adding module version info.

Fixes: 38caee9d ("net: hns3: Add support of the HNAE3 framework")
Signed-off-by: default avatarXi Wang <wangxi11@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13562d1f

drivers/net/ethernet/hisilicon/hns3/hnae3.c

+1 −0
Original line number Diff line number Diff line
@@ -285,3 +285,4 @@ EXPORT_SYMBOL(hnae3_unregister_ae_dev); 
MODULE_AUTHOR("Huawei Tech. Co., Ltd.");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("HNAE3(Hisilicon Network Acceleration Engine) Framework");

MODULE_VERSION(HNAE3_MOD_VERSION);

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
#include <linux/pci.h>

#include <linux/types.h>



#define HNAE3_MOD_VERSION "1.0"



/* Device IDs */

#define HNAE3_DEV_ID_GE				0xA220

#define HNAE3_DEV_ID_25GE			0xA221

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+1 −0
Original line number Diff line number Diff line
@@ -3538,3 +3538,4 @@ MODULE_DESCRIPTION("HNS3: Hisilicon Ethernet Driver"); 
MODULE_AUTHOR("Huawei Tech. Co., Ltd.");

MODULE_LICENSE("GPL");

MODULE_ALIAS("pci:hns-nic");

MODULE_VERSION(HNS3_MOD_VERSION);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


#include "hnae3.h"



#define HNS3_MOD_VERSION "1.0"



extern const char hns3_driver_version[];



enum hns3_nic_state {

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "hclge_cmd.h"

#include "hnae3.h"



#define HCLGE_MOD_VERSION "v1.0"

#define HCLGE_MOD_VERSION "1.0"

#define HCLGE_DRIVER_NAME "hclge"



#define HCLGE_INVALID_VPORT 0xffff