[dpdk-stable] patch 'net/ionic: do minor logging fixups' has been queued to stable release 20.11.1
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Fri Feb 5 12:15:15 CET 2021
Hi,
FYI, your patch has been queued to stable release 20.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/07/21. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/ece2b693aeebc8a54d5cd6e4b94776ecbf686c70
Thanks.
Luca Boccassi
---
>From ece2b693aeebc8a54d5cd6e4b94776ecbf686c70 Mon Sep 17 00:00:00 2001
From: Andrew Boyer <aboyer at pensando.io>
Date: Wed, 9 Dec 2020 18:57:37 -0800
Subject: [PATCH] net/ionic: do minor logging fixups
[ upstream commit 4ae96cb88fa06e37766c1bb0d91d1538f8ae34d3 ]
Expose ionic_opcode_to_str() so it can be used for dev cmds, too.
Store the device name in struct adapter.
Switch to memcpy() to work around gcc false positives.
Signed-off-by: Andrew Boyer <aboyer at pensando.io>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
drivers/net/ionic/ionic.h | 1 +
drivers/net/ionic/ionic_dev.c | 5 ++++
drivers/net/ionic/ionic_dev.h | 2 ++
drivers/net/ionic/ionic_ethdev.c | 4 ++--
drivers/net/ionic/ionic_lif.c | 26 +++++++++++++-------
drivers/net/ionic/ionic_main.c | 31 +++++++++++++-----------
drivers/net/ionic/ionic_rxtx.c | 41 ++++++++++++++------------------
7 files changed, 62 insertions(+), 48 deletions(-)
diff --git a/drivers/net/ionic/ionic.h b/drivers/net/ionic/ionic.h
index 1538df3092..a6d84036e8 100644
--- a/drivers/net/ionic/ionic.h
+++ b/drivers/net/ionic/ionic.h
@@ -48,6 +48,7 @@ struct ionic_hw {
struct ionic_adapter {
struct ionic_hw hw;
struct ionic_dev idev;
+ const char *name;
struct ionic_dev_bar bars[IONIC_BARS_MAX];
struct ionic_identity ident;
struct ionic_lif *lifs[IONIC_LIFS_MAX];
diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c
index 5c2820b7a1..632ca10cf2 100644
--- a/drivers/net/ionic/ionic_dev.c
+++ b/drivers/net/ionic/ionic_dev.c
@@ -103,6 +103,9 @@ ionic_dev_cmd_go(struct ionic_dev *idev, union ionic_dev_cmd *cmd)
uint32_t cmd_size = sizeof(cmd->words) /
sizeof(cmd->words[0]);
+ IONIC_PRINT(DEBUG, "Sending %s (%d) via dev_cmd",
+ ionic_opcode_to_str(cmd->cmd.opcode), cmd->cmd.opcode);
+
for (i = 0; i < cmd_size; i++)
iowrite32(cmd->words[i], &idev->dev_cmd->cmd.words[i]);
@@ -350,6 +353,8 @@ ionic_dev_cmd_adminq_init(struct ionic_dev *idev,
.q_init.cq_ring_base = cq->base_pa,
};
+ IONIC_PRINT(DEBUG, "adminq.q_init.ver %u", cmd.q_init.ver);
+
ionic_dev_cmd_go(idev, &cmd);
}
diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h
index 532255a603..6bac96072d 100644
--- a/drivers/net/ionic/ionic_dev.h
+++ b/drivers/net/ionic/ionic_dev.h
@@ -208,6 +208,8 @@ struct ionic_qcq;
void ionic_intr_init(struct ionic_dev *idev, struct ionic_intr_info *intr,
unsigned long index);
+const char *ionic_opcode_to_str(enum ionic_cmd_opcode opcode);
+
int ionic_dev_setup(struct ionic_adapter *adapter);
void ionic_dev_cmd_go(struct ionic_dev *idev, union ionic_dev_cmd *cmd);
diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c
index 600333e20f..68a6e630c8 100644
--- a/drivers/net/ionic/ionic_ethdev.c
+++ b/drivers/net/ionic/ionic_ethdev.c
@@ -571,7 +571,7 @@ ionic_dev_rss_reta_update(struct rte_eth_dev *eth_dev,
if (reta_size != ident->lif.eth.rss_ind_tbl_sz) {
IONIC_PRINT(ERR, "The size of hash lookup table configured "
- "(%d) doesn't match the number hardware can supported "
+ "(%d) does not match the number hardware can support "
"(%d)",
reta_size, ident->lif.eth.rss_ind_tbl_sz);
return -EINVAL;
@@ -605,7 +605,7 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev,
if (reta_size != ident->lif.eth.rss_ind_tbl_sz) {
IONIC_PRINT(ERR, "The size of hash lookup table configured "
- "(%d) doesn't match the number hardware can supported "
+ "(%d) does not match the number hardware can support "
"(%d)",
reta_size, ident->lif.eth.rss_ind_tbl_sz);
return -EINVAL;
diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index 60a5f3d537..5894f3505a 100644
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -551,7 +551,7 @@ ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
/*
* Note: interrupt handler is called for index = 0 only
* (we use interrupts for the notifyq only anyway,
- * which hash index = 0)
+ * which has index = 0)
*/
for (index = 0; index < adapter->nintrs; index++)
@@ -684,8 +684,8 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type,
ionic_q_sg_map(&new->q, sg_base, sg_base_pa);
}
- IONIC_PRINT(DEBUG, "Q-Base-PA = %ju CQ-Base-PA = %ju "
- "SG-base-PA = %ju",
+ IONIC_PRINT(DEBUG, "Q-Base-PA = %#jx CQ-Base-PA = %#jx "
+ "SG-base-PA = %#jx",
q_base_pa, cq_base_pa, sg_base_pa);
ionic_q_map(&new->q, q_base, q_base_pa);
@@ -824,7 +824,13 @@ ionic_lif_alloc(struct ionic_lif *lif)
int dbpage_num;
int err;
- snprintf(lif->name, sizeof(lif->name), "lif%u", lif->index);
+ /*
+ * lif->name was zeroed on allocation.
+ * Copy (sizeof() - 1) bytes to ensure that it is NULL terminated.
+ */
+ memcpy(lif->name, lif->eth_dev->data->name, sizeof(lif->name) - 1);
+
+ IONIC_PRINT(DEBUG, "LIF: %s", lif->name);
IONIC_PRINT(DEBUG, "Allocating Lif Info");
@@ -867,8 +873,6 @@ ionic_lif_alloc(struct ionic_lif *lif)
IONIC_PRINT(DEBUG, "Allocating Admin Queue");
- IONIC_PRINT(DEBUG, "Allocating Admin Queue");
-
err = ionic_admin_qcq_alloc(lif);
if (err) {
IONIC_PRINT(ERR, "Cannot allocate admin queue");
@@ -1224,6 +1228,7 @@ ionic_lif_notifyq_init(struct ionic_lif *lif)
ctx.cmd.q_init.ring_base);
IONIC_PRINT(DEBUG, "notifyq_init.ring_size %d",
ctx.cmd.q_init.ring_size);
+ IONIC_PRINT(DEBUG, "notifyq_init.ver %u", ctx.cmd.q_init.ver);
err = ionic_adminq_post_wait(lif, &ctx);
if (err)
@@ -1335,6 +1340,7 @@ ionic_lif_txq_init(struct ionic_qcq *qcq)
ctx.cmd.q_init.ring_base);
IONIC_PRINT(DEBUG, "txq_init.ring_size %d",
ctx.cmd.q_init.ring_size);
+ IONIC_PRINT(DEBUG, "txq_init.ver %u", ctx.cmd.q_init.ver);
err = ionic_adminq_post_wait(qcq->lif, &ctx);
if (err)
@@ -1383,6 +1389,7 @@ ionic_lif_rxq_init(struct ionic_qcq *qcq)
ctx.cmd.q_init.ring_base);
IONIC_PRINT(DEBUG, "rxq_init.ring_size %d",
ctx.cmd.q_init.ring_size);
+ IONIC_PRINT(DEBUG, "rxq_init.ver %u", ctx.cmd.q_init.ver);
err = ionic_adminq_post_wait(qcq->lif, &ctx);
if (err)
@@ -1453,8 +1460,8 @@ ionic_lif_set_name(struct ionic_lif *lif)
},
};
- snprintf(ctx.cmd.lif_setattr.name, sizeof(ctx.cmd.lif_setattr.name),
- "%d", lif->port_id);
+ memcpy(ctx.cmd.lif_setattr.name, lif->name,
+ sizeof(ctx.cmd.lif_setattr.name) - 1);
ionic_adminq_post_wait(lif, &ctx);
}
@@ -1685,7 +1692,8 @@ ionic_lifs_size(struct ionic_adapter *adapter)
nintrs = nlifs * 1 /* notifyq */;
if (nintrs > dev_nintrs) {
- IONIC_PRINT(ERR, "At most %d intr queues supported, minimum required is %u",
+ IONIC_PRINT(ERR,
+ "At most %d intr supported, minimum req'd is %u",
dev_nintrs, nintrs);
return -ENOSPC;
}
diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c
index 2ade213d2d..b963898db0 100644
--- a/drivers/net/ionic/ionic_main.c
+++ b/drivers/net/ionic/ionic_main.c
@@ -61,7 +61,7 @@ ionic_error_to_str(enum ionic_status_code code)
}
}
-static const char *
+const char *
ionic_opcode_to_str(enum ionic_cmd_opcode opcode)
{
switch (opcode) {
@@ -107,6 +107,8 @@ ionic_opcode_to_str(enum ionic_cmd_opcode opcode)
return "IONIC_CMD_Q_INIT";
case IONIC_CMD_Q_CONTROL:
return "IONIC_CMD_Q_CONTROL";
+ case IONIC_CMD_Q_IDENTIFY:
+ return "IONIC_CMD_Q_IDENTIFY";
case IONIC_CMD_RDMA_RESET_LIF:
return "IONIC_CMD_RDMA_RESET_LIF";
case IONIC_CMD_RDMA_CREATE_EQ:
@@ -126,8 +128,9 @@ ionic_adminq_check_err(struct ionic_admin_ctx *ctx, bool timeout)
const char *name;
const char *status;
+ name = ionic_opcode_to_str(ctx->cmd.cmd.opcode);
+
if (ctx->comp.comp.status || timeout) {
- name = ionic_opcode_to_str(ctx->cmd.cmd.opcode);
status = ionic_error_to_str(ctx->comp.comp.status);
IONIC_PRINT(ERR, "%s (%d) failed: %s (%d)",
name,
@@ -137,6 +140,8 @@ ionic_adminq_check_err(struct ionic_admin_ctx *ctx, bool timeout)
return -EIO;
}
+ IONIC_PRINT(DEBUG, "%s (%d) succeeded", name, ctx->cmd.cmd.opcode);
+
return 0;
}
@@ -174,14 +179,13 @@ ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)
bool done;
int err;
- IONIC_PRINT(DEBUG, "Sending %s to the admin queue",
- ionic_opcode_to_str(ctx->cmd.cmd.opcode));
+ IONIC_PRINT(DEBUG, "Sending %s (%d) via the admin queue",
+ ionic_opcode_to_str(ctx->cmd.cmd.opcode), ctx->cmd.cmd.opcode);
err = ionic_adminq_post(lif, ctx);
if (err) {
- IONIC_PRINT(ERR, "Failure posting to the admin queue %d (%d)",
+ IONIC_PRINT(ERR, "Failure posting %d to the admin queue (%d)",
ctx->cmd.cmd.opcode, err);
-
return err;
}
@@ -339,12 +343,12 @@ ionic_port_identify(struct ionic_adapter *adapter)
ioread32(&idev->dev_cmd->data[i]);
}
- IONIC_PRINT(INFO, "speed %d ", ident->port.config.speed);
- IONIC_PRINT(INFO, "mtu %d ", ident->port.config.mtu);
- IONIC_PRINT(INFO, "state %d ", ident->port.config.state);
- IONIC_PRINT(INFO, "an_enable %d ", ident->port.config.an_enable);
- IONIC_PRINT(INFO, "fec_type %d ", ident->port.config.fec_type);
- IONIC_PRINT(INFO, "pause_type %d ", ident->port.config.pause_type);
+ IONIC_PRINT(INFO, "speed %d", ident->port.config.speed);
+ IONIC_PRINT(INFO, "mtu %d", ident->port.config.mtu);
+ IONIC_PRINT(INFO, "state %d", ident->port.config.state);
+ IONIC_PRINT(INFO, "an_enable %d", ident->port.config.an_enable);
+ IONIC_PRINT(INFO, "fec_type %d", ident->port.config.fec_type);
+ IONIC_PRINT(INFO, "pause_type %d", ident->port.config.pause_type);
IONIC_PRINT(INFO, "loopback_mode %d",
ident->port.config.loopback_mode);
@@ -385,8 +389,7 @@ ionic_port_init(struct ionic_adapter *adapter)
idev->port_info_sz = RTE_ALIGN(sizeof(*idev->port_info), PAGE_SIZE);
snprintf(z_name, sizeof(z_name), "%s_port_%s_info",
- IONIC_DRV_NAME,
- adapter->pci_dev->device.name);
+ IONIC_DRV_NAME, adapter->name);
idev->port_info_z = ionic_memzone_reserve(z_name, idev->port_info_sz,
SOCKET_ID_ANY);
diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c
index 2592f5cab6..26893795a1 100644
--- a/drivers/net/ionic/ionic_rxtx.c
+++ b/drivers/net/ionic/ionic_rxtx.c
@@ -133,7 +133,7 @@ ionic_dev_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)
{
struct ionic_qcq *txq;
- IONIC_PRINT_CALL();
+ IONIC_PRINT(DEBUG, "Stopping TX queue %u", tx_queue_id);
txq = eth_dev->data->tx_queues[tx_queue_id];
@@ -156,7 +156,7 @@ ionic_dev_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)
int __rte_cold
ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id,
- uint16_t nb_desc, uint32_t socket_id __rte_unused,
+ uint16_t nb_desc, uint32_t socket_id,
const struct rte_eth_txconf *tx_conf)
{
struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
@@ -164,11 +164,6 @@ ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id,
uint64_t offloads;
int err;
- IONIC_PRINT_CALL();
-
- IONIC_PRINT(DEBUG, "Configuring TX queue %u with %u buffers",
- tx_queue_id, nb_desc);
-
if (tx_queue_id >= lif->ntxqcqs) {
IONIC_PRINT(DEBUG, "Queue index %u not available "
"(max %u queues)",
@@ -177,6 +172,9 @@ ionic_dev_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id,
}
offloads = tx_conf->offloads | eth_dev->data->dev_conf.txmode.offloads;
+ IONIC_PRINT(DEBUG,
+ "Configuring skt %u TX queue %u with %u buffers, offloads %jx",
+ socket_id, tx_queue_id, nb_desc, offloads);
/* Validate number of receive descriptors */
if (!rte_is_power_of_2(nb_desc) || nb_desc < IONIC_MIN_RING_DESC)
@@ -214,10 +212,11 @@ ionic_dev_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)
struct ionic_qcq *txq;
int err;
- IONIC_PRINT_CALL();
-
txq = eth_dev->data->tx_queues[tx_queue_id];
+ IONIC_PRINT(DEBUG, "Starting TX queue %u, %u descs",
+ tx_queue_id, txq->q.num_descs);
+
err = ionic_lif_txq_init(txq);
if (err)
return err;
@@ -641,7 +640,7 @@ int __rte_cold
ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint16_t rx_queue_id,
uint16_t nb_desc,
- uint32_t socket_id __rte_unused,
+ uint32_t socket_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -650,11 +649,6 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
uint64_t offloads;
int err;
- IONIC_PRINT_CALL();
-
- IONIC_PRINT(DEBUG, "Configuring RX queue %u with %u buffers",
- rx_queue_id, nb_desc);
-
if (rx_queue_id >= lif->nrxqcqs) {
IONIC_PRINT(ERR,
"Queue index %u not available (max %u queues)",
@@ -663,13 +657,16 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
}
offloads = rx_conf->offloads | eth_dev->data->dev_conf.rxmode.offloads;
+ IONIC_PRINT(DEBUG,
+ "Configuring skt %u RX queue %u with %u buffers, offloads %jx",
+ socket_id, rx_queue_id, nb_desc, offloads);
/* Validate number of receive descriptors */
if (!rte_is_power_of_2(nb_desc) ||
nb_desc < IONIC_MIN_RING_DESC ||
nb_desc > IONIC_MAX_RING_DESC) {
IONIC_PRINT(ERR,
- "Bad number of descriptors (%u) for queue %u (min: %u)",
+ "Bad descriptor count (%u) for queue %u (min: %u)",
nb_desc, rx_queue_id, IONIC_MIN_RING_DESC);
return -EINVAL; /* or use IONIC_DEFAULT_RING_DESC */
}
@@ -686,7 +683,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
err = ionic_rx_qcq_alloc(lif, rx_queue_id, nb_desc, &rxq);
if (err) {
- IONIC_PRINT(ERR, "Queue allocation failure");
+ IONIC_PRINT(ERR, "Queue %d allocation failure", rx_queue_id);
return -EINVAL;
}
@@ -957,13 +954,11 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id)
struct ionic_qcq *rxq;
int err;
- IONIC_PRINT_CALL();
-
- IONIC_PRINT(DEBUG, "Allocating RX queue buffers (size: %u)",
- frame_size);
-
rxq = eth_dev->data->rx_queues[rx_queue_id];
+ IONIC_PRINT(DEBUG, "Starting RX queue %u, %u descs (size: %u)",
+ rx_queue_id, rxq->q.num_descs, frame_size);
+
err = ionic_lif_rxq_init(rxq);
if (err)
return err;
@@ -1043,7 +1038,7 @@ ionic_dev_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id)
{
struct ionic_qcq *rxq;
- IONIC_PRINT_CALL();
+ IONIC_PRINT(DEBUG, "Stopping RX queue %u", rx_queue_id);
rxq = eth_dev->data->rx_queues[rx_queue_id];
--
2.29.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-02-05 11:18:30.601283655 +0000
+++ 0029-net-ionic-do-minor-logging-fixups.patch 2021-02-05 11:18:28.642687989 +0000
@@ -1 +1 @@
-From 4ae96cb88fa06e37766c1bb0d91d1538f8ae34d3 Mon Sep 17 00:00:00 2001
+From ece2b693aeebc8a54d5cd6e4b94776ecbf686c70 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4ae96cb88fa06e37766c1bb0d91d1538f8ae34d3 ]
+
@@ -18,2 +20,2 @@
- drivers/net/ionic/ionic_lif.c | 28 ++++++++++++++--------
- drivers/net/ionic/ionic_main.c | 32 ++++++++++++++-----------
+ drivers/net/ionic/ionic_lif.c | 26 +++++++++++++-------
+ drivers/net/ionic/ionic_main.c | 31 +++++++++++++-----------
@@ -21 +23 @@
- 7 files changed, 64 insertions(+), 49 deletions(-)
+ 7 files changed, 62 insertions(+), 48 deletions(-)
@@ -24 +26 @@
-index a931103264..7ad0ab69ef 100644
+index 1538df3092..a6d84036e8 100644
@@ -36 +38 @@
-index fc68f5c741..f329665216 100644
+index 5c2820b7a1..632ca10cf2 100644
@@ -39 +41 @@
-@@ -102,6 +102,9 @@ ionic_dev_cmd_go(struct ionic_dev *idev, union ionic_dev_cmd *cmd)
+@@ -103,6 +103,9 @@ ionic_dev_cmd_go(struct ionic_dev *idev, union ionic_dev_cmd *cmd)
@@ -49 +51 @@
-@@ -348,6 +351,8 @@ ionic_dev_cmd_adminq_init(struct ionic_dev *idev,
+@@ -350,6 +353,8 @@ ionic_dev_cmd_adminq_init(struct ionic_dev *idev,
@@ -59 +61 @@
-index 7150f7f2c9..026c4a9f35 100644
+index 532255a603..6bac96072d 100644
@@ -62 +64 @@
-@@ -205,6 +205,8 @@ struct ionic_qcq;
+@@ -208,6 +208,8 @@ struct ionic_qcq;
@@ -72 +74 @@
-index ce6ca9671a..5a360ac089 100644
+index 600333e20f..68a6e630c8 100644
@@ -94 +96 @@
-index 722a895655..28ae9dc8a9 100644
+index 60a5f3d537..5894f3505a 100644
@@ -97,10 +99 @@
-@@ -84,7 +84,7 @@ ionic_lif_reset(struct ionic_lif *lif)
- ionic_dev_cmd_lif_reset(idev, lif->index);
- err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
- if (err)
-- IONIC_PRINT(WARNING, "Failed to reset lif");
-+ IONIC_PRINT(WARNING, "Failed to reset %s", lif->name);
- }
-
- static void
-@@ -554,7 +554,7 @@ ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
+@@ -551,7 +551,7 @@ ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
@@ -115 +108 @@
-@@ -687,8 +687,8 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type,
+@@ -684,8 +684,8 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type,
@@ -126 +119 @@
-@@ -827,7 +827,13 @@ ionic_lif_alloc(struct ionic_lif *lif)
+@@ -824,7 +824,13 @@ ionic_lif_alloc(struct ionic_lif *lif)
@@ -141 +134 @@
-@@ -868,8 +874,6 @@ ionic_lif_alloc(struct ionic_lif *lif)
+@@ -867,8 +873,6 @@ ionic_lif_alloc(struct ionic_lif *lif)
@@ -150 +143 @@
-@@ -1223,6 +1227,7 @@ ionic_lif_notifyq_init(struct ionic_lif *lif)
+@@ -1224,6 +1228,7 @@ ionic_lif_notifyq_init(struct ionic_lif *lif)
@@ -158 +151 @@
-@@ -1332,6 +1337,7 @@ ionic_lif_txq_init(struct ionic_qcq *qcq)
+@@ -1335,6 +1340,7 @@ ionic_lif_txq_init(struct ionic_qcq *qcq)
@@ -166 +159 @@
-@@ -1378,6 +1384,7 @@ ionic_lif_rxq_init(struct ionic_qcq *qcq)
+@@ -1383,6 +1389,7 @@ ionic_lif_rxq_init(struct ionic_qcq *qcq)
@@ -174 +167 @@
-@@ -1448,8 +1455,8 @@ ionic_lif_set_name(struct ionic_lif *lif)
+@@ -1453,8 +1460,8 @@ ionic_lif_set_name(struct ionic_lif *lif)
@@ -185 +178 @@
-@@ -1680,7 +1687,8 @@ ionic_lifs_size(struct ionic_adapter *adapter)
+@@ -1685,7 +1692,8 @@ ionic_lifs_size(struct ionic_adapter *adapter)
@@ -196 +189 @@
-index 92cf0f3984..ce5d113118 100644
+index 2ade213d2d..b963898db0 100644
@@ -255,9 +248 @@
-@@ -244,6 +248,7 @@ ionic_dev_cmd_wait_check(struct ionic_dev *idev, unsigned long max_wait)
- if (!err)
- err = ionic_dev_cmd_check_error(idev);
-
-+ IONIC_PRINT(DEBUG, "dev_cmd returned %d", err);
- return err;
- }
-
-@@ -335,12 +340,12 @@ ionic_port_identify(struct ionic_adapter *adapter)
+@@ -339,12 +343,12 @@ ionic_port_identify(struct ionic_adapter *adapter)
@@ -282 +267 @@
-@@ -381,8 +386,7 @@ ionic_port_init(struct ionic_adapter *adapter)
+@@ -385,8 +389,7 @@ ionic_port_init(struct ionic_adapter *adapter)
@@ -293 +278 @@
-index b953aff49d..b689c83815 100644
+index 2592f5cab6..26893795a1 100644
@@ -336 +321 @@
-@@ -215,10 +213,11 @@ ionic_dev_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)
+@@ -214,10 +212,11 @@ ionic_dev_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)
@@ -350 +335 @@
-@@ -642,7 +641,7 @@ int __rte_cold
+@@ -641,7 +640,7 @@ int __rte_cold
@@ -359 +344 @@
-@@ -651,11 +650,6 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
+@@ -650,11 +649,6 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
@@ -371 +356 @@
-@@ -664,13 +658,16 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
+@@ -663,13 +657,16 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
@@ -389 +374 @@
-@@ -687,7 +684,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
+@@ -686,7 +683,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
@@ -398 +383 @@
-@@ -959,13 +956,11 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id)
+@@ -957,13 +954,11 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id)
@@ -415 +400 @@
-@@ -1045,7 +1040,7 @@ ionic_dev_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id)
+@@ -1043,7 +1038,7 @@ ionic_dev_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id)
More information about the stable
mailing list