ice: move udp_tunnel_nic and misc IRQ setup into ice_init_pf()

Move udp_tunnel_nic setup and ice_req_irq_msix_misc() call into
ice_init_pf(), remove some redundancy in the former while moving.

Move ice_free_irq_msix_misc() call into ice_deinit_pf(), to mimic
the above in terms of needed cleanup. Guard it via emptiness check,
to keep the allowance of half-initialized pf being cleaned up.

Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 09dee43e48aab4f0468d61386bdcbcfb7c029d34..1691dda1067edcfd17973d9d709dba8d6c503f41 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3978,6 +3978,9 @@ static void ice_deinit_pf(struct ice_pf *pf)
        if (pf->ptp.clock)
                ptp_clock_unregister(pf->ptp.clock);
 
+       if (!xa_empty(&pf->irq_tracker.entries))
+               ice_free_irq_msix_misc(pf);
+
        xa_destroy(&pf->dyn_ports);
        xa_destroy(&pf->sf_nums);
 }
@@ -4045,6 +4048,11 @@ void ice_start_service_task(struct ice_pf *pf)
  */
 static int ice_init_pf(struct ice_pf *pf)
 {
+       struct udp_tunnel_nic_info *udp_tunnel_nic = &pf->hw.udp_tunnel_nic;
+       struct device *dev = ice_pf_to_dev(pf);
+       struct ice_hw *hw = &pf->hw;
+       int err = -ENOMEM;
+
        mutex_init(&pf->sw_mutex);
        mutex_init(&pf->tc_mutex);
        mutex_init(&pf->adev_mutex);
@@ -4075,11 +4083,30 @@ static int ice_init_pf(struct ice_pf *pf)
        if (!pf->avail_txqs || !pf->avail_rxqs || !pf->txtime_txqs)
                goto undo_init;
 
+       udp_tunnel_nic->set_port = ice_udp_tunnel_set_port;
+       udp_tunnel_nic->unset_port = ice_udp_tunnel_unset_port;
+       udp_tunnel_nic->shared = &hw->udp_tunnel_shared;
+       udp_tunnel_nic->tables[0].n_entries = hw->tnl.valid_count[TNL_VXLAN];
+       udp_tunnel_nic->tables[0].tunnel_types = UDP_TUNNEL_TYPE_VXLAN;
+       udp_tunnel_nic->tables[1].n_entries = hw->tnl.valid_count[TNL_GENEVE];
+       udp_tunnel_nic->tables[1].tunnel_types = UDP_TUNNEL_TYPE_GENEVE;
+
+       /* In case of MSIX we are going to setup the misc vector right here
+        * to handle admin queue events etc. In case of legacy and MSI
+        * the misc functionality and queue processing is combined in
+        * the same vector and that gets setup at open.
+        */
+       err = ice_req_irq_msix_misc(pf);
+       if (err) {
+               dev_err(dev, "setup of misc vector failed: %d\n", err);
+               goto undo_init;
+       }
+
        return 0;
 undo_init:
        /* deinit handles half-initialized pf just fine */
        ice_deinit_pf(pf);
-       return -ENOMEM;
+       return err;
 }
 
 /**
@@ -4751,36 +4778,8 @@ int ice_init_dev(struct ice_pf *pf)
                goto unroll_irq_scheme_init;
        }
 
-       pf->hw.udp_tunnel_nic.set_port = ice_udp_tunnel_set_port;
-       pf->hw.udp_tunnel_nic.unset_port = ice_udp_tunnel_unset_port;
-       pf->hw.udp_tunnel_nic.shared = &pf->hw.udp_tunnel_shared;
-       if (pf->hw.tnl.valid_count[TNL_VXLAN]) {
-               pf->hw.udp_tunnel_nic.tables[0].n_entries =
-                       pf->hw.tnl.valid_count[TNL_VXLAN];
-               pf->hw.udp_tunnel_nic.tables[0].tunnel_types =
-                       UDP_TUNNEL_TYPE_VXLAN;
-       }
-       if (pf->hw.tnl.valid_count[TNL_GENEVE]) {
-               pf->hw.udp_tunnel_nic.tables[1].n_entries =
-                       pf->hw.tnl.valid_count[TNL_GENEVE];
-               pf->hw.udp_tunnel_nic.tables[1].tunnel_types =
-                       UDP_TUNNEL_TYPE_GENEVE;
-       }
-       /* In case of MSIX we are going to setup the misc vector right here
-        * to handle admin queue events etc. In case of legacy and MSI
-        * the misc functionality and queue processing is combined in
-        * the same vector and that gets setup at open.
-        */
-       err = ice_req_irq_msix_misc(pf);
-       if (err) {
-               dev_err(dev, "setup of misc vector failed: %d\n", err);
-               goto unroll_pf_init;
-       }
-
        return 0;
 
-unroll_pf_init:
-       ice_deinit_pf(pf);
 unroll_irq_scheme_init:
        ice_service_task_stop(pf);
        ice_clear_interrupt_scheme(pf);
@@ -4789,7 +4788,6 @@ unroll_irq_scheme_init:
 
 void ice_deinit_dev(struct ice_pf *pf)
 {
-       ice_free_irq_msix_misc(pf);
        ice_deinit_pf(pf);
        ice_deinit_hw(&pf->hw);
        ice_service_task_stop(pf);