netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shannon Nelson <snelson@pensando.io>
To: snelson@pensando.io, netdev@vger.kernel.org, davem@davemloft.net
Subject: [PATCH v5 net-next 07/18] ionic: Add adminq action
Date: Mon, 26 Aug 2019 14:33:28 -0700	[thread overview]
Message-ID: <20190826213339.56909-8-snelson@pensando.io> (raw)
In-Reply-To: <20190826213339.56909-1-snelson@pensando.io>

Add AdminQ specific message requests and completion handling.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
---
 drivers/net/ethernet/pensando/ionic/ionic.h   |   7 ++
 .../net/ethernet/pensando/ionic/ionic_main.c  | 111 ++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
index 3e39bd76f3c8..5a705233449a 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic.h
@@ -46,9 +46,16 @@ struct ionic {
 	DECLARE_BITMAP(intrs, IONIC_INTR_CTRL_REGS_MAX);
 };
 
+struct ionic_admin_ctx {
+	struct completion work;
+	union ionic_adminq_cmd cmd;
+	union ionic_adminq_comp comp;
+};
+
 int ionic_napi(struct napi_struct *napi, int budget, ionic_cq_cb cb,
 	       ionic_cq_done_cb done_cb, void *done_arg);
 
+int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx);
 int ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_wait);
 int ionic_set_dma_mask(struct ionic *ionic);
 int ionic_setup(struct ionic *ionic);
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
index a9d2bac7e02d..a1583c1b22a9 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
@@ -169,6 +169,117 @@ static const char *ionic_opcode_to_str(enum ionic_cmd_opcode opcode)
 	}
 }
 
+static void ionic_adminq_flush(struct ionic_lif *lif)
+{
+	struct ionic_queue *adminq = &lif->adminqcq->q;
+
+	spin_lock(&lif->adminq_lock);
+
+	while (adminq->tail != adminq->head) {
+		memset(adminq->tail->desc, 0, sizeof(union ionic_adminq_cmd));
+		adminq->tail->cb = NULL;
+		adminq->tail->cb_arg = NULL;
+		adminq->tail = adminq->tail->next;
+	}
+	spin_unlock(&lif->adminq_lock);
+}
+
+static int ionic_adminq_check_err(struct ionic_lif *lif,
+				  struct ionic_admin_ctx *ctx,
+				  bool timeout)
+{
+	struct net_device *netdev = lif->netdev;
+	const char *opcode_str;
+	const char *status_str;
+	int err = 0;
+
+	if (ctx->comp.comp.status || timeout) {
+		opcode_str = ionic_opcode_to_str(ctx->cmd.cmd.opcode);
+		status_str = ionic_error_to_str(ctx->comp.comp.status);
+		err = timeout ? -ETIMEDOUT :
+				ionic_error_to_errno(ctx->comp.comp.status);
+
+		netdev_err(netdev, "%s (%d) failed: %s (%d)\n",
+			   opcode_str, ctx->cmd.cmd.opcode,
+			   timeout ? "TIMEOUT" : status_str, err);
+
+		if (timeout)
+			ionic_adminq_flush(lif);
+	}
+
+	return err;
+}
+
+static void ionic_adminq_cb(struct ionic_queue *q,
+			    struct ionic_desc_info *desc_info,
+			    struct ionic_cq_info *cq_info, void *cb_arg)
+{
+	struct ionic_admin_ctx *ctx = cb_arg;
+	struct ionic_admin_comp *comp;
+	struct device *dev;
+
+	if (!ctx)
+		return;
+
+	comp = cq_info->cq_desc;
+	dev = &q->lif->netdev->dev;
+
+	memcpy(&ctx->comp, comp, sizeof(*comp));
+
+	dev_dbg(dev, "comp admin queue command:\n");
+	dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1,
+			 &ctx->comp, sizeof(ctx->comp), true);
+
+	complete_all(&ctx->work);
+}
+
+static int ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)
+{
+	struct ionic_queue *adminq = &lif->adminqcq->q;
+	int err = 0;
+
+	WARN_ON(in_interrupt());
+
+	spin_lock(&lif->adminq_lock);
+	if (!ionic_q_has_space(adminq, 1)) {
+		err = -ENOSPC;
+		goto err_out;
+	}
+
+	memcpy(adminq->head->desc, &ctx->cmd, sizeof(ctx->cmd));
+
+	dev_dbg(&lif->netdev->dev, "post admin queue command:\n");
+	dynamic_hex_dump("cmd ", DUMP_PREFIX_OFFSET, 16, 1,
+			 &ctx->cmd, sizeof(ctx->cmd), true);
+
+	ionic_q_post(adminq, true, ionic_adminq_cb, ctx);
+
+err_out:
+	spin_unlock(&lif->adminq_lock);
+
+	return err;
+}
+
+int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)
+{
+	struct net_device *netdev = lif->netdev;
+	unsigned long remaining;
+	const char *name;
+	int err;
+
+	err = ionic_adminq_post(lif, ctx);
+	if (err) {
+		name = ionic_opcode_to_str(ctx->cmd.cmd.opcode);
+		netdev_err(netdev, "Posting of %s (%d) failed: %d\n",
+			   name, ctx->cmd.cmd.opcode, err);
+		return err;
+	}
+
+	remaining = wait_for_completion_timeout(&ctx->work,
+						HZ * (ulong)devcmd_timeout);
+	return ionic_adminq_check_err(lif, ctx, (remaining == 0));
+}
+
 int ionic_napi(struct napi_struct *napi, int budget, ionic_cq_cb cb,
 	       ionic_cq_done_cb done_cb, void *done_arg)
 {
-- 
2.17.1


  parent reply	other threads:[~2019-08-26 21:34 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-26 21:33 [PATCH v5 net-next 00/18] ionic: Add ionic driver Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 01/18] ionic: Add basic framework for IONIC Network device driver Shannon Nelson
2019-08-27  4:06   ` Jakub Kicinski
2019-08-27 18:55     ` Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 02/18] ionic: Add hardware init and device commands Shannon Nelson
2019-08-27  2:26   ` Andrew Lunn
2019-08-27  4:28     ` Jakub Kicinski
2019-08-27 17:39     ` Shannon Nelson
2019-08-27 19:50       ` Andrew Lunn
2019-08-27 23:17         ` Shannon Nelson
2019-08-27  4:24   ` Jakub Kicinski
2019-08-27 21:22     ` Shannon Nelson
2019-08-28  3:16       ` Jakub Kicinski
2019-08-28  3:26         ` Shannon Nelson
2019-08-28  3:34           ` Jakub Kicinski
2019-08-26 21:33 ` [PATCH v5 net-next 03/18] ionic: Add port management commands Shannon Nelson
2019-08-27  4:36   ` Jakub Kicinski
2019-08-27 21:44     ` Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 04/18] ionic: Add basic lif support Shannon Nelson
2019-08-27  4:42   ` Jakub Kicinski
2019-08-27 23:29     ` Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 05/18] ionic: Add interrupts and doorbells Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 06/18] ionic: Add basic adminq support Shannon Nelson
2019-08-26 21:33 ` Shannon Nelson [this message]
2019-08-26 21:33 ` [PATCH v5 net-next 08/18] ionic: Add notifyq support Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 09/18] ionic: Add the basic NDO callbacks for netdev support Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 10/18] ionic: Add management of rx filters Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 11/18] ionic: Add Rx filter and rx_mode ndo support Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 12/18] ionic: Add async link status check and basic stats Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 13/18] ionic: Add initial ethtool support Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 14/18] ionic: Add Tx and Rx handling Shannon Nelson
2019-08-27  2:32   ` Yunsheng Lin
2019-08-27 18:52     ` Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 15/18] ionic: Add netdev-event handling Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 16/18] ionic: Add driver stats Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 17/18] ionic: Add RSS support Shannon Nelson
2019-08-26 21:33 ` [PATCH v5 net-next 18/18] ionic: Add coalesce and other features Shannon Nelson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190826213339.56909-8-snelson@pensando.io \
    --to=snelson@pensando.io \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).