From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3150701-1523473721-2-10037001663346824511 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523473720; b=Jcd6h5WFeXHdgjl1PymN+hqfHMlTtqe6igFRWRiF+JsDTd/E88 MmIJbgS4WpYD2ts5M4xRWM6IqgtVtLIssEHc+zYUVGzUmMjd49rgegIYLUbaWqqH BEKa/yH5xf3eUoUGbfGr5+QLNL7i6LIt0GYnd2elNyJMRsIND6HzDBmxVNxVgm4b m1hFzRuxUjl/0a8y887lgxsAtI1c4m1C94hMtKJ/iG5MBi4FYnf/QFrMjUBjM/ul xzdHTAfHi+ppM8NVVph9Yp84Z1rIx3punaa61ojyKdi2M/lYFiPZL15d7KMMtPuO Wst8CarY5qvBNCyJ6Z+a5p8rTx8ureFfDhcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523473720; bh=3aM8twIgr4fidqClYCBYS1X4p+AEGA AAEB2GRhXf66s=; b=dyjUIvql0s0NqoSHByie566NgFOUMEmAsRq8ZaUmwcwlR1 xinVA0Zc1NEk76xjJpEwR99CrRpDkQGxbySraCophurFdB1evfvnH/oaYFDgJvSW ce8XExXgBFJu5xkSAFQiui8oaK26EFVq6yHpMmEhtOWC9GXdXi3kHjU4jgalv3MK z3WIfTE2YA46EwigQBvPQ6wVuWhwrlPDDJg9ogSuOwCTnp60fPpmc/HfJrqP32Ih x1OA0sNtU8Ml2zlbJdch0BLUL0eLtI9jpiW6BlAPmCUx28O0Hw+156Pi12Wu4WUe e2w6vOwyMdNNdMQz7avPrSM3vL7w4fXYTsKcV2dA== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfOTgC3mlEvOtI010INUoJ9yJVFDE2Kr+GqPNXBy0w48RAa4y5k1yQePqTRp4IT/h1/vliB4i5xi/56WJYYvErCgC74PlvpwA5sX3xogOyx82ooNDlrZV JoEDDki8Bz+g5bCmDqIgACygfAuegy7P/wlMJa7S3PXf9yBa10PpvZU9FmtutWC8q6ogNeG5Ycbdrd2Cg/p3dczpuyLXd1inbRequVke8pzXJFGHvCebqFCf X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=DfNHnWVPAAAA:8 a=danhDmx_AAAA:8 a=VwQbUJbxAAAA:8 a=J1Y8HTJGAAAA:8 a=ag1SF4gXAAAA:8 a=gJjcm8xDonOmdvZi31gA:9 a=QEXdDO2ut3YA:10 a=rjTVMONInIDnV1a_A2c_:22 a=P4VdviVPEcjfz_PVVggX:22 a=AjGcO6oz07-iQ99wixmX:22 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935335AbeDKTHA (ORCPT ); Wed, 11 Apr 2018 15:07:00 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40950 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935324AbeDKTGz (ORCPT ); Wed, 11 Apr 2018 15:06:55 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , "David S. Miller" Subject: [PATCH 4.9 287/310] sky2: Increase D3 delay to sky2 stops working after suspend Date: Wed, 11 Apr 2018 20:37:06 +0200 Message-Id: <20180411183634.950141073@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kai-Heng Feng [ Upstream commit afb133637071be6deeb8b3d0e55593ffbf63c527 ] The sky2 ethernet stops working after system resume from suspend: [ 582.852065] sky2 0000:04:00.0: Refused to change power state, currently in D3 The current 150ms delay is not enough, change it to 200ms can solve the issue. BugLink: https://bugs.launchpad.net/bugs/1758507 Cc: Stable Signed-off-by: Kai-Heng Feng Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/sky2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -5079,7 +5079,7 @@ static int sky2_probe(struct pci_dev *pd INIT_WORK(&hw->restart_work, sky2_restart); pci_set_drvdata(pdev, hw); - pdev->d3_delay = 150; + pdev->d3_delay = 200; return 0;