Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp5645204img; Wed, 27 Mar 2019 12:20:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqzSzPcdNTmshnSGQfq0ns/r7U4PqF3bdmaRNlAZyox3VAGhdiDAqJK8cb4w/e0DuyInM+pj X-Received: by 2002:a17:902:b181:: with SMTP id s1mr38388415plr.321.1553714425579; Wed, 27 Mar 2019 12:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553714425; cv=none; d=google.com; s=arc-20160816; b=FhnQJ4cABciXqkaib5VR+rAngR7iAGkngQGOZ+yf0gKzqRLaZqjs5IF13dRjXURURS /zhf9/COuvivxNaAirdFYHe3HJ01F3e6bb6nr+JzGSDdRZgDEQ3kKJRFfg5AfHCrFhE3 YFhldtRtBt9r0oIgefpSeX+QdsYZKcy13v2L4aatHnxUrf0cKHF9BOUPhkb002CXZcRj PczTc3JP7TWD0UZTyMOO7JZKU91JlXJ8y+rtG+rDaeOMQDfG72zYkrZVM3DlmMFqFTi8 hlvt4D/8uvjmJRsZqjqPkHdILVEiTiqaXpq6444YFWLavVHYzRuiGiguQZTUB/c7tVo+ 9O8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5vSH/xkSiKoA6UmgzMLHaVKZf7TIr2Yu7o6aMiCgqcw=; b=D0xxn5IcndyjyberYiMQ9+e9J4Mb5FZRJ7A5PemyKqrhY5vkb6yJGbTh2b2H8lHWP7 cCpWfnvugfyxLxt+qytBMxhU64Gq3gg52lkWlcSdfWaYpeV2QX0BIDi8BNRx3hfbPpvi PiI33Zb7t/UQFSqNG9ANobXzH2hUeALvGvUm9dzcGy9Kb//Oa3fr1oDMq9bleCzA81U1 ovKHlU17bS9OFNvpb91X4gq3hjwXdTwHuhUFwMxJKTV0TPG3tG7byj/fPv3MUkA4Larf PdIKQ4eROhm7fdJWxE/LtXgpflBaHMs73fEWpp5NgNNxRxiv9EdqQ2WiblLFn+2SfWn/ 5UCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0CuMPKLm; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x4si18455105pgp.370.2019.03.27.12.20.10; Wed, 27 Mar 2019 12:20:25 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=0CuMPKLm; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388437AbfC0TTh (ORCPT + 99 others); Wed, 27 Mar 2019 15:19:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:49552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387685AbfC0SHl (ORCPT ); Wed, 27 Mar 2019 14:07:41 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CEEE12177E; Wed, 27 Mar 2019 18:07:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710060; bh=areckDL7+7qfUjsx0coqFEdyZWyf+52Qeoj0AAYKDEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0CuMPKLm8SncRsNWxg822f6LTpIXRnigffJW1aJ4zZCtvM+o4lRnlDGKISH2ivQ0X w7Fa1X2lyCXTAbTXzSuYlBL6MoNxk9yXIWCC8JR3whV57sxY7FwU3+nIMjOrCaqi+C eqWtM8I05eEV8JdWHo8fJNdhg7vAF5v5hx6QyDfU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kai-Heng Feng , Jeff Kirsher , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 178/262] e1000e: Exclude device from suspend direct complete optimization Date: Wed, 27 Mar 2019 14:00:33 -0400 Message-Id: <20190327180158.10245-178-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327180158.10245-1-sashal@kernel.org> References: <20190327180158.10245-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai-Heng Feng [ Upstream commit 59f58708c5047289589cbf6ee95146b76cf57d1e ] e1000e sets different WoL settings in system suspend callback and runtime suspend callback. The suspend direct complete optimization leaves e1000e in runtime suspended state with wrong WoL setting during system suspend. To fix this, we need to disable suspend direct complete optimization to let e1000e always use suspend callback to set correct WoL during system suspend. Signed-off-by: Kai-Heng Feng Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index ca48a75be4f2..7acc61e4f645 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7348,6 +7348,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) e1000_print_device_info(adapter); + dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP); + if (pci_dev_run_wake(pdev)) pm_runtime_put_noidle(&pdev->dev); -- 2.19.1