ionic: move adminq-notifyq handling to main file

Move the AdminQ and NotifyQ queue handling to ionic_main.c with
the rest of the adminq code.

Suggested-by: Neel Patel <npatel2@amd.com>
Reviewed-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
index 9ffef2e0688530449dbacb420a544db55393d4d4..946c8ae1548f6c91b4aedadb19165d520a31381f 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic.h
@@ -76,6 +76,8 @@ int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx);
 int ionic_adminq_post_wait_nomsg(struct ionic_lif *lif, struct ionic_admin_ctx *ctx);
 void ionic_adminq_netdev_err_print(struct ionic_lif *lif, u8 opcode,
                                   u8 status, int err);
+bool ionic_notifyq_service(struct ionic_cq *cq, struct ionic_cq_info *cq_info);
+bool ionic_adminq_service(struct ionic_cq *cq, struct ionic_cq_info *cq_info);
 
 int ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_wait);
 int ionic_dev_cmd_wait_nomsg(struct ionic *ionic, unsigned long max_wait);

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index eb9ba683d635cb1fd2ae96232694dee65744160e..a9835ede446e456c87381913463fc73f202dd9c4 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -1168,71 +1168,6 @@ int ionic_lif_set_hwstamp_rxfilt(struct ionic_lif *lif, u64 pkt_class)
        return ionic_lif_add_hwstamp_rxfilt(lif, pkt_class);
 }
 
-static bool ionic_notifyq_service(struct ionic_cq *cq,
-                                 struct ionic_cq_info *cq_info)
-{
-       union ionic_notifyq_comp *comp = cq_info->cq_desc;
-       struct ionic_deferred_work *work;
-       struct net_device *netdev;
-       struct ionic_queue *q;
-       struct ionic_lif *lif;
-       u64 eid;
-
-       q = cq->bound_q;
-       lif = q->info[0].cb_arg;
-       netdev = lif->netdev;
-       eid = le64_to_cpu(comp->event.eid);
-
-       /* Have we run out of new completions to process? */
-       if ((s64)(eid - lif->last_eid) <= 0)
-               return false;
-
-       lif->last_eid = eid;
-
-       dev_dbg(lif->ionic->dev, "notifyq event:\n");
-       dynamic_hex_dump("event ", DUMP_PREFIX_OFFSET, 16, 1,
-                        comp, sizeof(*comp), true);
-
-       switch (le16_to_cpu(comp->event.ecode)) {
-       case IONIC_EVENT_LINK_CHANGE:
-               ionic_link_status_check_request(lif, CAN_NOT_SLEEP);
-               break;
-       case IONIC_EVENT_RESET:
-               if (lif->ionic->idev.fw_status_ready &&
-                   !test_bit(IONIC_LIF_F_FW_RESET, lif->state) &&
-                   !test_and_set_bit(IONIC_LIF_F_FW_STOPPING, lif->state)) {
-                       work = kzalloc(sizeof(*work), GFP_ATOMIC);
-                       if (!work) {
-                               netdev_err(lif->netdev, "Reset event dropped\n");
-                               clear_bit(IONIC_LIF_F_FW_STOPPING, lif->state);
-                       } else {
-                               work->type = IONIC_DW_TYPE_LIF_RESET;
-                               ionic_lif_deferred_enqueue(&lif->deferred, work);
-                       }
-               }
-               break;
-       default:
-               netdev_warn(netdev, "Notifyq event ecode=%d eid=%lld\n",
-                           comp->event.ecode, eid);
-               break;
-       }
-
-       return true;
-}
-
-static bool ionic_adminq_service(struct ionic_cq *cq,
-                                struct ionic_cq_info *cq_info)
-{
-       struct ionic_admin_comp *comp = cq_info->cq_desc;
-
-       if (!color_match(comp->color, cq->done_color))
-               return false;
-
-       ionic_q_service(cq->bound_q, cq_info, le16_to_cpu(comp->comp_index));
-
-       return true;
-}
-
 static int ionic_adminq_napi(struct napi_struct *napi, int budget)
 {
        struct ionic_intr_info *intr = napi_to_cq(napi)->bound_intr;

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
index 750a1ffaf855a52e0cfa80037e1cf7ef4f5a7783..46f2aa34330d1d45f1e83f7b1e14726c930824f2 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
@@ -269,6 +269,71 @@ static void ionic_adminq_cb(struct ionic_queue *q,
        complete_all(&ctx->work);
 }
 
+bool ionic_notifyq_service(struct ionic_cq *cq,
+                          struct ionic_cq_info *cq_info)
+{
+       union ionic_notifyq_comp *comp = cq_info->cq_desc;
+       struct ionic_deferred_work *work;
+       struct net_device *netdev;
+       struct ionic_queue *q;
+       struct ionic_lif *lif;
+       u64 eid;
+
+       q = cq->bound_q;
+       lif = q->info[0].cb_arg;
+       netdev = lif->netdev;
+       eid = le64_to_cpu(comp->event.eid);
+
+       /* Have we run out of new completions to process? */
+       if ((s64)(eid - lif->last_eid) <= 0)
+               return false;
+
+       lif->last_eid = eid;
+
+       dev_dbg(lif->ionic->dev, "notifyq event:\n");
+       dynamic_hex_dump("event ", DUMP_PREFIX_OFFSET, 16, 1,
+                        comp, sizeof(*comp), true);
+
+       switch (le16_to_cpu(comp->event.ecode)) {
+       case IONIC_EVENT_LINK_CHANGE:
+               ionic_link_status_check_request(lif, CAN_NOT_SLEEP);
+               break;
+       case IONIC_EVENT_RESET:
+               if (lif->ionic->idev.fw_status_ready &&
+                   !test_bit(IONIC_LIF_F_FW_RESET, lif->state) &&
+                   !test_and_set_bit(IONIC_LIF_F_FW_STOPPING, lif->state)) {
+                       work = kzalloc(sizeof(*work), GFP_ATOMIC);
+                       if (!work) {
+                               netdev_err(lif->netdev, "Reset event dropped\n");
+                               clear_bit(IONIC_LIF_F_FW_STOPPING, lif->state);
+                       } else {
+                               work->type = IONIC_DW_TYPE_LIF_RESET;
+                               ionic_lif_deferred_enqueue(&lif->deferred, work);
+                       }
+               }
+               break;
+       default:
+               netdev_warn(netdev, "Notifyq event ecode=%d eid=%lld\n",
+                           comp->event.ecode, eid);
+               break;
+       }
+
+       return true;
+}
+
+bool ionic_adminq_service(struct ionic_cq *cq,
+                         struct ionic_cq_info *cq_info)
+{
+       struct ionic_admin_comp *comp = cq_info->cq_desc;
+
+       if (!color_match(comp->color, cq->done_color))
+               return false;
+
+       ionic_q_service(cq->bound_q, cq_info, le16_to_cpu(comp->comp_index));
+
+       return true;
+}
+
 bool ionic_adminq_poke_doorbell(struct ionic_queue *q)
 {
        struct ionic_lif *lif = q->lif;