mail/ctm: Fix build with -Wdeprecated-non-prototype.

misc/ctm/Makefile

 static int        ixl_assign_vsi_msix(struct ixl_pf *);
 static int        ixl_assign_vsi_legacy(struct ixl_pf *);
 static int        ixl_init_msix(struct ixl_pf *);
 static void        ixl_configure_msix(struct ixl_pf *);
 static void        ixl_configure_itr(struct ixl_pf *);
 static void        ixl_configure_legacy(struct ixl_pf *);
 static void        ixl_free_pci_resources(struct ixl_pf *);
 static void        ixl_local_timer(void *);
+static void        ixl_queues_timer(struct ixl_pf *pf);
 static int        ixl_setup_interface(device_t, struct ixl_vsi *);
 static void        ixl_link_event(struct ixl_pf *, struct i40e_arq_event_info *);
 static void        ixl_config_rss(struct ixl_vsi *);
 static void        ixl_set_queue_rx_itr(struct ixl_queue *);
 static void        ixl_set_queue_tx_itr(struct ixl_queue *);
 static int        ixl_set_advertised_speeds(struct ixl_pf *, int);
 
 static int        ixl_enable_rings(struct ixl_vsi *);

  *  and runs the watchdog check.
  *
  **********************************************************************/
 
 static void
 ixl_local_timer(void *arg)
 {
         struct ixl_pf                *pf = arg;
-        struct i40e_hw                *hw = &pf->hw;
-        struct ixl_vsi                *vsi = &pf->vsi;
-        struct ixl_queue        *que = vsi->queues;
-        device_t                dev = pf->dev;
-        int                     hung = 0;
-        u32                     mask;
+        struct ifnet                *ifp;
 
+        ifp = pf->vsi.ifp;
         mtx_assert(&pf->pf_mtx, MA_OWNED);
 
         /* Fire off the adminq task */
         taskqueue_enqueue(pf->tq, &pf->adminq);
 
         /* Update stats */
         ixl_update_stats_counters(pf);
 
+        if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
+                ixl_queues_timer(pf);
+
+        callout_reset(&pf->timer, hz, ixl_local_timer, pf);
+}
+
+static void
+ixl_queues_timer(struct ixl_pf *pf)
+{
+        struct i40e_hw                *hw = &pf->hw;
+        struct ixl_vsi                *vsi = &pf->vsi;
+        struct ixl_queue        *que = vsi->queues;
+        device_t                dev = pf->dev;
+        int                     hung = 0;
+        u32                     mask;
+
         /*
         ** Check status of the queues
         */
         mask = (I40E_PFINT_DYN_CTLN_INTENA_MASK |
                 I40E_PFINT_DYN_CTLN_SWINT_TRIG_MASK);
  
         for (int i = 0; i < vsi->num_queues; i++,que++) {
                 /* Any queues with outstanding work get a sw irq */
#ifdef IXL_DEBUG
                         device_printf(dev,"Warning queue %d "
                             "appears to be hung!\n", i);
 #endif
                         que->busy = IXL_QUEUE_HUNG;
                         ++hung;
                 }
         }
         /* Only reinit if all queues show hung */
-        if (hung == vsi->num_queues)
-                goto hung;
-
-        callout_reset(&pf->timer, hz, ixl_local_timer, pf);
-        return;
-
-hung:
+        if (hung == vsi->num_queues) {
                 device_printf(dev, "Local Timer: HANG DETECT - Resetting!!\n");
                 ixl_init_locked(pf);
         }
+}
 
 /*
 ** Note: this routine updates the OS on the link state
 **      the real check of the hardware only happens with
 **      a link interrupt.
 */
 static void
 ixl_update_link_status(struct ixl_pf *pf)
if (pf->num_vfs == 0)
                 ixl_disable_intr(vsi);
         else
                 ixl_disable_rings_intr(vsi);
         ixl_disable_rings(vsi);
 
         /* Tell the stack that the interface is no longer active */
         ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
 
-        /* Stop the local timer */
+        /* Stop the local timer if SR-IOV not in use. */
+        if (pf->num_vfs == 0)
                 callout_stop(&pf->timer);
 
         return;
 }
 
 
 /*********************************************************************
  *
  *  Setup MSIX Interrupt resources and handlers for the VSI
if (vf_num >= pf->num_vfs) {
                 device_printf(pf->dev, "Got msg from illegal VF: %d\n", vf_num);
                 return;
         }
 
         vf = &pf->vfs[vf_num];
         msg = event->msg_buf;
         msg_size = event->msg_len;
 
+        /* This must be a stray msg from a previously destroyed VF. */
+        if (!(vf->vf_flags & VF_FLAG_ENABLED))
+                return;
+
         I40E_VC_DEBUG(pf, ixl_vc_opcode_level(opcode),
             "Got msg %s(%d) from VF-%d of size %d\n",
             ixl_vc_opcode_str(opcode), opcode, vf_num, msg_size);
 
         switch (opcode) {
         case I40E_VIRTCHNL_OP_VERSION:
                 ixl_vf_version_msg(pf, vf, msg, msg_size);
                 break;
ixl_handle_vf_msg(struct ixl_pf *pf, struct i40e_arq_event_info *event)
         }
 }
 
 /* Handle any VFs that have reset themselves via a Function Level Reset(FLR). */
 static void
 ixl_handle_vflr(void *arg, int pending)
 {
         struct ixl_pf *pf;
+        struct ixl_vf *vf;
         struct i40e_hw *hw;
         uint16_t global_vf_num;
         uint32_t vflrstat_index, vflrstat_mask, vflrstat, icr0;
         int i;
 
         pf = arg;
         hw = &pf->hw;
 
         IXL_PF_LOCK(pf);
         for (i = 0; i < pf->num_vfs; i++) {
                 global_vf_num = hw->func_caps.vf_base_id + i;
 
+                vf = &pf->vfs[i];
+                if (!(vf->vf_flags & VF_FLAG_ENABLED))
+                        continue;
+
                 vflrstat_index = IXL_GLGEN_VFLRSTAT_INDEX(global_vf_num);
                 vflrstat_mask = IXL_GLGEN_VFLRSTAT_MASK(global_vf_num);
                 vflrstat = rd32(hw, I40E_GLGEN_VFLRSTAT(vflrstat_index));
                 if (vflrstat & vflrstat_mask) {
                         wr32(hw, I40E_GLGEN_VFLRSTAT(vflrstat_index),
                             vflrstat_mask);
 
-                        ixl_reinit_vf(pf, &pf->vfs[i]);
+                        ixl_reinit_vf(pf, vf);
                 }
         }
 
         icr0 = rd32(hw, I40E_PFINT_ICR0_ENA);
         icr0 |= I40E_PFINT_ICR0_ENA_VFLR_MASK;
         wr32(hw, I40E_PFINT_ICR0_ENA, icr0);
         ixl_flush(hw);
 
if (ret != I40E_SUCCESS) {
                 error = ixl_adminq_err_to_errno(hw->aq.asq_last_status);
                 device_printf(dev, "add_veb failed; code=%d error=%d", ret,
                     error);
                 goto fail;
         }
 
         ixl_configure_msix(pf);
         ixl_enable_adminq(hw);
+        ixl_flush(hw);
 
+        callout_reset(&pf->timer, hz, ixl_local_timer, pf);
+
         pf->num_vfs = num_vfs;
         IXL_PF_UNLOCK(pf);
         return (0);
 
 fail:
         free(pf->vfs, M_IXL);
         pf->vfs = NULL;
         IXL_PF_UNLOCK(pf);
if (pf->vfs[i].vsi.seid != 0)
                         i40e_aq_delete_element(hw, pf->vfs[i].vsi.seid, NULL);
         }
 
         if (pf->veb_seid != 0) {
                 i40e_aq_delete_element(hw, pf->veb_seid, NULL);
                 pf->veb_seid = 0;
         }
 
-        if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
+        if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) {
                 ixl_disable_intr(vsi);
+                ixl_flush(hw);
+
+                callout_stop(&pf->timer);
+        }
 
         vfs = pf->vfs;
         num_vfs = pf->num_vfs;
 
         pf->vfs = NULL;
         pf->num_vfs = 0;
         IXL_PF_UNLOCK(pf);
 

misc/ctm/distinfo

 static int        ixl_assign_vsi_msix(struct ixl_pf *);
 static int        ixl_assign_vsi_legacy(struct ixl_pf *);
 static int        ixl_init_msix(struct ixl_pf *);
 static void        ixl_configure_msix(struct ixl_pf *);
 static void        ixl_configure_itr(struct ixl_pf *);
 static void        ixl_configure_legacy(struct ixl_pf *);
 static void        ixl_free_pci_resources(struct ixl_pf *);
 static void        ixl_local_timer(void *);
+static void        ixl_queues_timer(struct ixl_pf *pf);
 static int        ixl_setup_interface(device_t, struct ixl_vsi *);
 static void        ixl_link_event(struct ixl_pf *, struct i40e_arq_event_info *);
 static void        ixl_config_rss(struct ixl_vsi *);
 static void        ixl_set_queue_rx_itr(struct ixl_queue *);
 static void        ixl_set_queue_tx_itr(struct ixl_queue *);
 static int        ixl_set_advertised_speeds(struct ixl_pf *, int);
 
 static int        ixl_enable_rings(struct ixl_vsi *);

  *  and runs the watchdog check.
  *
  **********************************************************************/
 
 static void
 ixl_local_timer(void *arg)
 {
         struct ixl_pf                *pf = arg;
-        struct i40e_hw                *hw = &pf->hw;
-        struct ixl_vsi                *vsi = &pf->vsi;
-        struct ixl_queue        *que = vsi->queues;
-        device_t                dev = pf->dev;
-        int                     hung = 0;
-        u32                     mask;
+        struct ifnet                *ifp;
 
+        ifp = pf->vsi.ifp;
         mtx_assert(&pf->pf_mtx, MA_OWNED);
 
         /* Fire off the adminq task */
         taskqueue_enqueue(pf->tq, &pf->adminq);
 
         /* Update stats */
         ixl_update_stats_counters(pf);
 
+        if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
+                ixl_queues_timer(pf);
+
+        callout_reset(&pf->timer, hz, ixl_local_timer, pf);
+}
+
+static void
+ixl_queues_timer(struct ixl_pf *pf)
+{
+        struct i40e_hw                *hw = &pf->hw;
+        struct ixl_vsi                *vsi = &pf->vsi;
+        struct ixl_queue        *que = vsi->queues;
+        device_t                dev = pf->dev;
+        int                     hung = 0;
+        u32                     mask;
+
         /*
         ** Check status of the queues
         */
         mask = (I40E_PFINT_DYN_CTLN_INTENA_MASK |
                 I40E_PFINT_DYN_CTLN_SWINT_TRIG_MASK);
  
         for (int i = 0; i < vsi->num_queues; i++,que++) {
                 /* Any queues with outstanding work get a sw irq */
#ifdef IXL_DEBUG
                         device_printf(dev,"Warning queue %d "
                             "appears to be hung!\n", i);
 #endif
                         que->busy = IXL_QUEUE_HUNG;
                         ++hung;
                 }
         }
         /* Only reinit if all queues show hung */
-        if (hung == vsi->num_queues)
-                goto hung;
-
-        callout_reset(&pf->timer, hz, ixl_local_timer, pf);
-        return;
-
-hung:
+        if (hung == vsi->num_queues) {
                 device_printf(dev, "Local Timer: HANG DETECT - Resetting!!\n");
                 ixl_init_locked(pf);
         }
+}
 
 /*
 ** Note: this routine updates the OS on the link state
 **      the real check of the hardware only happens with
 **      a link interrupt.
 */
 static void
 ixl_update_link_status(struct ixl_pf *pf)
if (pf->num_vfs == 0)
                 ixl_disable_intr(vsi);
         else
                 ixl_disable_rings_intr(vsi);
         ixl_disable_rings(vsi);
 
         /* Tell the stack that the interface is no longer active */
         ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
 
-        /* Stop the local timer */
+        /* Stop the local timer if SR-IOV not in use. */
+        if (pf->num_vfs == 0)
                 callout_stop(&pf->timer);
 
         return;
 }
 
 
 /*********************************************************************
  *
  *  Setup MSIX Interrupt resources and handlers for the VSI
if (vf_num >= pf->num_vfs) {
                 device_printf(pf->dev, "Got msg from illegal VF: %d\n", vf_num);
                 return;
         }
 
         vf = &pf->vfs[vf_num];
         msg = event->msg_buf;
         msg_size = event->msg_len;
 
+        /* This must be a stray msg from a previously destroyed VF. */
+        if (!(vf->vf_flags & VF_FLAG_ENABLED))
+                return;
+
         I40E_VC_DEBUG(pf, ixl_vc_opcode_level(opcode),
             "Got msg %s(%d) from VF-%d of size %d\n",
             ixl_vc_opcode_str(opcode), opcode, vf_num, msg_size);
 
         switch (opcode) {
         case I40E_VIRTCHNL_OP_VERSION:
                 ixl_vf_version_msg(pf, vf, msg, msg_size);
                 break;
ixl_handle_vf_msg(struct ixl_pf *pf, struct i40e_arq_event_info *event)
         }
 }
 
 /* Handle any VFs that have reset themselves via a Function Level Reset(FLR). */
 static void
 ixl_handle_vflr(void *arg, int pending)
 {
         struct ixl_pf *pf;
+        struct ixl_vf *vf;
         struct i40e_hw *hw;
         uint16_t global_vf_num;
         uint32_t vflrstat_index, vflrstat_mask, vflrstat, icr0;
         int i;
 
         pf = arg;
         hw = &pf->hw;
 
         IXL_PF_LOCK(pf);
         for (i = 0; i < pf->num_vfs; i++) {
                 global_vf_num = hw->func_caps.vf_base_id + i;
 
+                vf = &pf->vfs[i];
+                if (!(vf->vf_flags & VF_FLAG_ENABLED))
+                        continue;
+
                 vflrstat_index = IXL_GLGEN_VFLRSTAT_INDEX(global_vf_num);
                 vflrstat_mask = IXL_GLGEN_VFLRSTAT_MASK(global_vf_num);
                 vflrstat = rd32(hw, I40E_GLGEN_VFLRSTAT(vflrstat_index));
                 if (vflrstat & vflrstat_mask) {
                         wr32(hw, I40E_GLGEN_VFLRSTAT(vflrstat_index),
                             vflrstat_mask);
 
-                        ixl_reinit_vf(pf, &pf->vfs[i]);
+                        ixl_reinit_vf(pf, vf);
                 }
         }
 
         icr0 = rd32(hw, I40E_PFINT_ICR0_ENA);
         icr0 |= I40E_PFINT_ICR0_ENA_VFLR_MASK;
         wr32(hw, I40E_PFINT_ICR0_ENA, icr0);
         ixl_flush(hw);
 
if (ret != I40E_SUCCESS) {
                 error = ixl_adminq_err_to_errno(hw->aq.asq_last_status);
                 device_printf(dev, "add_veb failed; code=%d error=%d", ret,
                     error);
                 goto fail;
         }
 
         ixl_configure_msix(pf);
         ixl_enable_adminq(hw);
+        ixl_flush(hw);
 
+        callout_reset(&pf->timer, hz, ixl_local_timer, pf);
+
         pf->num_vfs = num_vfs;
         IXL_PF_UNLOCK(pf);
         return (0);
 
 fail:
         free(pf->vfs, M_IXL);
         pf->vfs = NULL;
         IXL_PF_UNLOCK(pf);
if (pf->vfs[i].vsi.seid != 0)
                         i40e_aq_delete_element(hw, pf->vfs[i].vsi.seid, NULL);
         }
 
         if (pf->veb_seid != 0) {
                 i40e_aq_delete_element(hw, pf->veb_seid, NULL);
                 pf->veb_seid = 0;
         }
 
-        if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
+        if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) {
                 ixl_disable_intr(vsi);
+                ixl_flush(hw);
+
+                callout_stop(&pf->timer);
+        }
 
         vfs = pf->vfs;
         num_vfs = pf->num_vfs;
 
         pf->vfs = NULL;
         pf->num_vfs = 0;
         IXL_PF_UNLOCK(pf);