[PATCH 0/2][Bionic] HiSilicon network subsystem 3 support

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 0/2][Bionic] HiSilicon network subsystem 3 support

dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1761610

We have the drivers already, but they don't autoload and aren't available in
the server installer. The former is fixed by a clean upstream cherry-pick,
the latter by adding these drivers to the nic-modules udeb.

Yunsheng Lin (1):
  net: hns3: export pci table of hclge and hclgevf to userspace

dann frazier (1):
  UBUNTU: d-i: Add hns3 drivers to nic-modules

 debian.master/d-i/modules/nic-modules                     | 2 ++
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c   | 2 ++
 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 ++
 3 files changed, 6 insertions(+)

--
2.17.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2][Bionic] net: hns3: export pci table of hclge and hclgevf to userspace

dann frazier-4
From: Yunsheng Lin <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1761610

There is no module that is dependent on hclge or hclgevf's symbol,
but hns_enet need them to provide ops for it to run. When there is
a need to auto load the hns3 driver, the auto load will fail because
hclge or hclgevf is not loaded.

Hns_enet has already exported the pci table, so this patch exports
the pci table for hclge and hclgevf module too.

Signed-off-by: Yunsheng Lin <[hidden email]>
Signed-off-by: Peng Li <[hidden email]>
Signed-off-by: David S. Miller <[hidden email]>
(cherry picked from commit 2f550a467895b8715e17ae9bd6da048e8fce8c92)
Signed-off-by: dann frazier <[hidden email]>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c   | 2 ++
 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 32bc6f68e297..c00d6683e0c4 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -55,6 +55,8 @@ static const struct pci_device_id ae_algo_pci_tbl[] = {
  {0, }
 };
 
+MODULE_DEVICE_TABLE(pci, ae_algo_pci_tbl);
+
 static const char hns3_nic_test_strs[][ETH_GSTRING_LEN] = {
  "Mac    Loopback test",
  "Serdes Loopback test",
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 0d89965f7928..cc95fc15fb0b 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -18,6 +18,8 @@ static const struct pci_device_id ae_algovf_pci_tbl[] = {
  {0, }
 };
 
+MODULE_DEVICE_TABLE(pci, ae_algovf_pci_tbl);
+
 static inline struct hclgevf_dev *hclgevf_ae_get_hdev(
  struct hnae3_handle *handle)
 {
--
2.17.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2][Bionic] UBUNTU: d-i: Add hns3 drivers to nic-modules

dann frazier-4
In reply to this post by dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1761610

Signed-off-by: dann frazier <[hidden email]>
---
 debian.master/d-i/modules/nic-modules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian.master/d-i/modules/nic-modules b/debian.master/d-i/modules/nic-modules
index e753313ae351..acfa2ec90263 100644
--- a/debian.master/d-i/modules/nic-modules
+++ b/debian.master/d-i/modules/nic-modules
@@ -85,11 +85,13 @@ ibmvnic ?
 igb ?
 ps3_gelic ?
 hamachi ?
+hclge ?
 hermes ?
 hfi1 ?
 hns_dsaf ?
 hns_enet_drv ?
 hns_mdio ?
+hns3 ?
 hp ?
 hp100 ?
 hp-plus ?
--
2.17.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED: [PATCH 0/2][Bionic] HiSilicon network subsystem 3 support

Seth Forshee
In reply to this post by dann frazier-4
On Thu, Apr 05, 2018 at 03:00:38PM -0700, dann frazier wrote:
> BugLink: https://bugs.launchpad.net/bugs/1761610
>
> We have the drivers already, but they don't autoload and aren't available in
> the server installer. The former is fixed by a clean upstream cherry-pick,
> the latter by adding these drivers to the nic-modules udeb.

Applied to bionic/master-next, thanks!

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team