From 7d3a7b9ea59ddb223aec59b45fa1713c633aaed4 Mon Sep 17 00:00:00 2001

From: Lijun Pan <ljp@linux.ibm.com>

Date: Fri, 12 Feb 2021 20:49:00 -0600

Subject: [PATCH] ibmvnic: skip send_request_unmap for timeout reset

References: bsc#1184114 ltc#192237 bsc#1182485 ltc#191591

Patch-mainline: v5.12-rc1

Git-commit: 7d3a7b9ea59ddb223aec59b45fa1713c633aaed4

Timeout reset will trigger the VIOS to unmap it automatically,

similarly as FAILVOER and MOBILITY events. If we unmap it

in the linux side, we will see errors like

"30000003: Error 4 in REQUEST_UNMAP_RSP".

So, don't call send_request_unmap for timeout reset.

Fixes: ed651a10875f ("ibmvnic: Updated reset handling")

Signed-off-by: Lijun Pan <ljp@linux.ibm.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 drivers/net/ethernet/ibm/ibmvnic.c | 7 ++++++-

 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c

index f6402a20ba32..cd201f89ce6c 100644

--- a/drivers/net/ethernet/ibm/ibmvnic.c

+++ b/drivers/net/ethernet/ibm/ibmvnic.c

@@ -247,8 +247,13 @@ static void free_long_term_buff(struct ibmvnic_adapter *adapter,

 	if (!ltb->buff)

 		return;

+	/* VIOS automatically unmaps the long term buffer at remote

+	 * end for the following resets:

+	 * FAILOVER, MOBILITY, TIMEOUT.

+	 */

 	if (adapter->reset_reason != VNIC_RESET_FAILOVER &&

-	    adapter->reset_reason != VNIC_RESET_MOBILITY)

+	    adapter->reset_reason != VNIC_RESET_MOBILITY &&

+	    adapter->reset_reason != VNIC_RESET_TIMEOUT)

 		send_request_unmap(adapter, ltb->map_id);

 	dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr);

 }

-- 

2.26.2