Received: by 10.223.185.116 with SMTP id b49csp4172218wrg; Mon, 26 Feb 2018 12:30:57 -0800 (PST) X-Google-Smtp-Source: AG47ELsDakFryeX0sn91JLbPE8Ogn/eKfRJJM03QBcE4eqAWWQB9wRFc9ocgdaoH9OiNiFHSl9uZ X-Received: by 10.98.59.218 with SMTP id w87mr4851627pfj.37.1519677057604; Mon, 26 Feb 2018 12:30:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677057; cv=none; d=google.com; s=arc-20160816; b=v7Gg4fMad/CY1TzTpgMybbDz+wQhIbTy3h1gxxolhS2p9LJ65n3wwzoyLPxeT/pLSI fvHuFLpFdqXn/odqMod10PNFBjZ7QcKYaNfYEg+eJpzzVFjIROezrYlftAxJCPzIqNgJ tyRuVBB/qRszTHvXoFbDbagijhidhXlgFLtebh5/z8e/buBh06m2wPYhFLcNNymfc8Mr aAbeg1h8hr0HAqJBsKDi5Jr2vDDs/RH9IWFJYiYyw0hRPmQhKj0nTKU2xFMV28sBc05X GlfGi906QdHRgyZemzu276ZVAPx3yRff2nAPO9IdkSIYA7vvgdNNqlfNupSttR6SJZOd sPZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Wyxy9fNfrL/vlJvrsy4DsqqTgSxKBm/tS86/sZxcm60=; b=jC7/Hzf5Tz7R+e5Sy4aDXiDT5RwaUKLZbt5B0n+4sFBdlqh9FWPnqgIYK4lO3UW9V/ athNRA/du290iCjmnRMpsb8NAv2kiJOJNklSjyfoWtEDOPukZ2SMopJ/GTbaQMmy8w+s 4Y2zlSVOHO5/PEbXpTQukL7/+FIiBUlDrrAvzzjR6QM7NRAgk2QuS+hV7ETt4yg/5Jbt 0UnsJTGOKRhbpDDsVxkm8kjMwb4HF0rD56oFi/CYI4u1NbL6cq6/tKL9A/5MdGCg+HLu 28ccNkFmjvgg15RqsatITVmRrAitS/YiU/bYCMN+whC1kk6KnWPsuGS+JHXtmEeglVzE 66yw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p1-v6si7131502plr.644.2018.02.26.12.30.41; Mon, 26 Feb 2018 12:30:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754060AbeBZU3M (ORCPT + 99 others); Mon, 26 Feb 2018 15:29:12 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37470 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753316AbeBZU3I (ORCPT ); Mon, 26 Feb 2018 15:29:08 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 756FEED8; Mon, 26 Feb 2018 20:29:07 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mika Westerberg , "David S. Miller" Subject: [PATCH 4.15 35/64] net: thunderbolt: Tear down connection properly on suspend Date: Mon, 26 Feb 2018 21:22:12 +0100 Message-Id: <20180226202154.959847066@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mika Westerberg commit 8e021a14d908475fea89ef85b5421865f7ad650d upstream. When suspending to mem or disk the Thunderbolt controller typically goes down as well tearing down the connection automatically. However, when suspend to idle is used this does not happen so we need to make sure the connection is properly disconnected before it can be re-established during resume. Fixes: e69b6c02b4c3 ("net: Add support for networking over Thunderbolt cable") Signed-off-by: Mika Westerberg Cc: stable@vger.kernel.org Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/thunderbolt.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/drivers/net/thunderbolt.c +++ b/drivers/net/thunderbolt.c @@ -1270,10 +1270,7 @@ static int __maybe_unused tbnet_suspend( stop_login(net); if (netif_running(net->dev)) { netif_device_detach(net->dev); - tb_ring_stop(net->rx_ring.ring); - tb_ring_stop(net->tx_ring.ring); - tbnet_free_buffers(&net->rx_ring); - tbnet_free_buffers(&net->tx_ring); + tbnet_tear_down(net, true); } return 0;