Revert "ibmvnic: simplify reset_long_term_buff function"

[platform/kernel/linux-starfive.git] / drivers / net / ethernet / ibm / ibmvnic.c

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 5788bb9..4b4eccc 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -257,12 +257,40 @@ static void free_long_term_buff(struct ibmvnic_adapter *adapter,
        dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr);
 }
 
-static int reset_long_term_buff(struct ibmvnic_long_term_buff *ltb)
+static int reset_long_term_buff(struct ibmvnic_adapter *adapter,
+                               struct ibmvnic_long_term_buff *ltb)
 {
-       if (!ltb->buff)
-               return -EINVAL;
+       struct device *dev = &adapter->vdev->dev;
+       int rc;
 
        memset(ltb->buff, 0, ltb->size);
+
+       mutex_lock(&adapter->fw_lock);
+       adapter->fw_done_rc = 0;
+
+       reinit_completion(&adapter->fw_done);
+       rc = send_request_map(adapter, ltb->addr, ltb->size, ltb->map_id);
+       if (rc) {
+               mutex_unlock(&adapter->fw_lock);
+               return rc;
+       }
+
+       rc = ibmvnic_wait_for_completion(adapter, &adapter->fw_done, 10000);
+       if (rc) {
+               dev_info(dev,
+                        "Reset failed, long term map request timed out or aborted\n");
+               mutex_unlock(&adapter->fw_lock);
+               return rc;
+       }
+
+       if (adapter->fw_done_rc) {
+               dev_info(dev,
+                        "Reset failed, attempting to free and reallocate buffer\n");
+               free_long_term_buff(adapter, ltb);
+               mutex_unlock(&adapter->fw_lock);
+               return alloc_long_term_buff(adapter, ltb, ltb->size);
+       }
+       mutex_unlock(&adapter->fw_lock);
        return 0;
 }
 
@@ -484,7 +512,8 @@ static int reset_rx_pools(struct ibmvnic_adapter *adapter)
                                                  rx_pool->size *
                                                  rx_pool->buff_size);
                } else {
-                       rc = reset_long_term_buff(&rx_pool->long_term_buff);
+                       rc = reset_long_term_buff(adapter,
+                                                 &rx_pool->long_term_buff);
                }
 
                if (rc)
@@ -607,11 +636,12 @@ static int init_rx_pools(struct net_device *netdev)
        return 0;
 }
 
-static int reset_one_tx_pool(struct ibmvnic_tx_pool *tx_pool)
+static int reset_one_tx_pool(struct ibmvnic_adapter *adapter,
+                            struct ibmvnic_tx_pool *tx_pool)
 {
        int rc, i;
 
-       rc = reset_long_term_buff(&tx_pool->long_term_buff);
+       rc = reset_long_term_buff(adapter, &tx_pool->long_term_buff);
        if (rc)
                return rc;
 
@@ -638,10 +668,10 @@ static int reset_tx_pools(struct ibmvnic_adapter *adapter)
 
        tx_scrqs = adapter->num_active_tx_pools;
        for (i = 0; i < tx_scrqs; i++) {
-               rc = reset_one_tx_pool(&adapter->tso_pool[i]);
+               rc = reset_one_tx_pool(adapter, &adapter->tso_pool[i]);
                if (rc)
                        return rc;
-               rc = reset_one_tx_pool(&adapter->tx_pool[i]);
+               rc = reset_one_tx_pool(adapter, &adapter->tx_pool[i]);
                if (rc)
                        return rc;
        }