From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6515C43381 for ; Wed, 27 Mar 2019 18:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD8302147C for ; Wed, 27 Mar 2019 18:14:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710465; bh=P4uTfG6HMoavQH/Dct0y6DYx9FB3rk3curZDCmgWwWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QTtAOD5IWa414Sq7LF9a+X+AuKyBOc+fIGf0IABStYGgcHmn24iHQspF/53ji+g/Z wdj8dnIbCG+WkMwUskJcU+HxilLu3uXPjUADgAKzxlwS6ifAWL0++bNA0qj+farEsE rffPkTDQlFcfTchk/jBRRfChcOgAeat8y+ROAQ7g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389622AbfC0SOY (ORCPT ); Wed, 27 Mar 2019 14:14:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:57290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389079AbfC0SOT (ORCPT ); Wed, 27 Mar 2019 14:14:19 -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 A3F5A2147C; Wed, 27 Mar 2019 18:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710458; bh=P4uTfG6HMoavQH/Dct0y6DYx9FB3rk3curZDCmgWwWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bg7bwkBe6C4528e1eT62uH/64OsrlFx8DabZ7Tso5QCValgFEdyc3gN9PYXOvkcow XhS+iHqgzCC2K8upZTxd1QVJ9dAgxNCNZx/KUUf3FBnj4Eyhm9qa+qvO5eZF5nf7Ts 7B+gKKCArQAfVEHgBXoODWskwbHKir28kSvxEtCI= 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 4.19 128/192] e1000e: Exclude device from suspend direct complete optimization Date: Wed, 27 Mar 2019 14:09:20 -0400 Message-Id: <20190327181025.13507-128-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327181025.13507-1-sashal@kernel.org> References: <20190327181025.13507-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 23edc1364487..8b11682ebba2 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7327,6 +7327,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