Commit c3743039 authored by Martin Habets's avatar Martin Habets Committed by Jakub Kicinski

sfc/siena: Reinstate SRIOV init/fini function calls

They were removed in the first series since they were not used for EF10.
Put that code back for Siena, with the prototypes in siena_sriov.h
since that file is a more applicable place for it.
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ef9b5770
...@@ -32,6 +32,9 @@ ...@@ -32,6 +32,9 @@
#include "io.h" #include "io.h"
#include "selftest.h" #include "selftest.h"
#include "sriov.h" #include "sriov.h"
#ifdef CONFIG_SFC_SIENA_SRIOV
#include "siena_sriov.h"
#endif
#include "mcdi_port_common.h" #include "mcdi_port_common.h"
#include "mcdi_pcol.h" #include "mcdi_pcol.h"
...@@ -1271,6 +1274,12 @@ static int __init efx_init_module(void) ...@@ -1271,6 +1274,12 @@ static int __init efx_init_module(void)
if (rc) if (rc)
goto err_notifier; goto err_notifier;
#ifdef CONFIG_SFC_SIENA_SRIOV
rc = efx_init_sriov();
if (rc)
goto err_sriov;
#endif
rc = efx_siena_create_reset_workqueue(); rc = efx_siena_create_reset_workqueue();
if (rc) if (rc)
goto err_reset; goto err_reset;
...@@ -1284,6 +1293,10 @@ static int __init efx_init_module(void) ...@@ -1284,6 +1293,10 @@ static int __init efx_init_module(void)
err_pci: err_pci:
efx_siena_destroy_reset_workqueue(); efx_siena_destroy_reset_workqueue();
err_reset: err_reset:
#ifdef CONFIG_SFC_SIENA_SRIOV
efx_fini_sriov();
err_sriov:
#endif
unregister_netdevice_notifier(&efx_netdev_notifier); unregister_netdevice_notifier(&efx_netdev_notifier);
err_notifier: err_notifier:
return rc; return rc;
...@@ -1295,6 +1308,9 @@ static void __exit efx_exit_module(void) ...@@ -1295,6 +1308,9 @@ static void __exit efx_exit_module(void)
pci_unregister_driver(&efx_pci_driver); pci_unregister_driver(&efx_pci_driver);
efx_siena_destroy_reset_workqueue(); efx_siena_destroy_reset_workqueue();
#ifdef CONFIG_SFC_SIENA_SRIOV
efx_fini_sriov();
#endif
unregister_netdevice_notifier(&efx_netdev_notifier); unregister_netdevice_notifier(&efx_netdev_notifier);
} }
......
...@@ -60,6 +60,9 @@ static inline bool efx_siena_sriov_enabled(struct efx_nic *efx) ...@@ -60,6 +60,9 @@ static inline bool efx_siena_sriov_enabled(struct efx_nic *efx)
{ {
return efx->vf_init_count != 0; return efx->vf_init_count != 0;
} }
int efx_init_sriov(void);
void efx_fini_sriov(void);
#else /* !CONFIG_SFC_SIENA_SRIOV */ #else /* !CONFIG_SFC_SIENA_SRIOV */
static inline bool efx_siena_sriov_enabled(struct efx_nic *efx) static inline bool efx_siena_sriov_enabled(struct efx_nic *efx)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment