From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
To: netdev@vger.kernel.org, tlfalcon@linux.vnet.ibm.com,
jallen@linux.vnet.ibm.com
Subject: [PATCH net-next 07/11] ibmvnic: Deactivate RX pool buffer replenishment on H_CLOSED
Date: Fri, 26 May 2017 10:30:48 -0400 [thread overview]
Message-ID: <20170526143048.63648.46534.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com> (raw)
In-Reply-To: <20170526142523.63648.62938.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com>
From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
If H_CLOSED is returned, halt RX buffer replenishment activity
until firmware sends a notification that the driver can reset.
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 1c3f1ed..47421e4 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -200,6 +200,15 @@ static void free_long_term_buff(struct ibmvnic_adapter *adapter,
dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr);
}
+static void deactivate_rx_pools(struct ibmvnic_adapter *adapter)
+{
+ int i;
+
+ for (i = 0; i < be32_to_cpu(adapter->login_rsp_buf->num_rxadd_subcrqs);
+ i++)
+ adapter->rx_pool[i].active = 0;
+}
+
static void replenish_rx_pool(struct ibmvnic_adapter *adapter,
struct ibmvnic_rx_pool *pool)
{
@@ -217,6 +226,9 @@ static void replenish_rx_pool(struct ibmvnic_adapter *adapter,
int index;
int i;
+ if (!pool->active)
+ return;
+
handle_array = (u64 *)((u8 *)(adapter->login_rsp_buf) +
be32_to_cpu(adapter->login_rsp_buf->
off_rxadd_subcrqs));
@@ -287,6 +299,15 @@ static void replenish_rx_pool(struct ibmvnic_adapter *adapter,
dev_kfree_skb_any(skb);
adapter->replenish_add_buff_failure++;
atomic_add(buffers_added, &pool->available);
+
+ if (lpar_rc == H_CLOSED) {
+ /* Disable buffer pool replenishment and report carrier off if
+ * queue is closed. Firmware guarantees that a signal will
+ * be sent to the driver, triggering a reset.
+ */
+ deactivate_rx_pools(adapter);
+ netif_carrier_off(adapter->netdev);
+ }
}
static void replenish_pools(struct ibmvnic_adapter *adapter)
next prev parent reply other threads:[~2017-05-26 14:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-26 14:30 [PATCH net-next 00/11] ibmvnic: Driver updates Nathan Fontenot
2017-05-26 14:30 ` [PATCH net-next 01/11] ibmvnic: Track state of adapter napis Nathan Fontenot
2017-05-26 14:30 ` [PATCH net-next 02/11] ibmvnic: Handle failover after failed init crq Nathan Fontenot
2017-05-26 14:30 ` [PATCH net-next 03/11] ibmvnic: Send gratuitous arp on reset Nathan Fontenot
2017-05-26 14:30 ` [PATCH net-next 04/11] ibmvnic: Fix cleanup of SKB's on driver close Nathan Fontenot
2017-05-26 14:30 ` [PATCH net-next 05/11] ibmvnic: Non-fatal error handling Nathan Fontenot
2017-05-26 14:30 ` [PATCH net-next 06/11] ibmvnic: Halt TX and report carrier off on H_CLOSED return code Nathan Fontenot
2017-05-26 14:30 ` Nathan Fontenot [this message]
2017-05-26 14:30 ` [PATCH net-next 08/11] ibmvnic: Check adapter state during ibmvnic_poll Nathan Fontenot
2017-05-26 14:31 ` [PATCH net-next 09/11] ibmvnic: Reset the CRQ queue during driver reset Nathan Fontenot
2017-05-26 14:31 ` [PATCH net-next 10/11] ibmvnic: Reset tx/rx pools on " Nathan Fontenot
2017-05-26 14:31 ` [PATCH net-next 11/11] ibmvnic: Reset sub-crqs during " Nathan Fontenot
2017-05-26 19:33 ` [PATCH net-next 00/11] ibmvnic: Driver updates David Miller
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=20170526143048.63648.46534.stgit@ltcalpine2-lp14.aus.stglabs.ibm.com \
--to=nfont@linux.vnet.ibm.com \
--cc=jallen@linux.vnet.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=tlfalcon@linux.vnet.ibm.com \
/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).