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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 A03F6C072B1 for ; Thu, 30 May 2019 04:42:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7078525A3B for ; Thu, 30 May 2019 04:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559191333; bh=nJrK3IwcmUuml2VnBzBzfEVYgjEkYxYSoUHjbBVQfMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lZYWwPb+u8TY3Rp1bhl3PZmkeJM2WYAh13pe167igYk2vXp2C6QWSfKhuLzARPQSt qWUGFc7zis0kPiw+2IJnQ5tW4V+HcccMby03YMFrT7l+YakXC8+FYJ+OO9TSgOnNa0 CIr4XlbafzRqz2kQryJ1urm7qNeh6R8jcoKTPqZg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728951AbfE3DMT (ORCPT ); Wed, 29 May 2019 23:12:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:54256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728945AbfE3DMT (ORCPT ); Wed, 29 May 2019 23:12:19 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5BFE0244F1; Thu, 30 May 2019 03:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559185938; bh=nJrK3IwcmUuml2VnBzBzfEVYgjEkYxYSoUHjbBVQfMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uecJWuKRS77fIVbGuyGXtBoy7ZTnNQEhXrjfRpkDGzdCvyoG5PPhzLzX/mDtG68YK csCDUi3CAaaMKBv1aR83JEi1XC+m71+obMf0Kjzh/QXUvNt80ZtFAyghpoG/cVZVCl fdSCvenqQgwb5UyTX6pI643yNu+qCyzDKMy9JfdY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai-Heng Feng , Aaron Brown , Jeff Kirsher , Sasha Levin Subject: [PATCH 5.1 342/405] igb: Exclude device from suspend direct complete optimization Date: Wed, 29 May 2019 20:05:40 -0700 Message-Id: <20190530030557.996823260@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.291644921@linuxfoundation.org> References: <20190530030540.291644921@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 5b6e13216be29ced7350d9c354a1af8fe0ad9a3e ] igb sets different WoL settings in system suspend callback and runtime suspend callback. The suspend direct complete optimization leaves igb in runtime suspended state with wrong WoL setting during system suspend. To fix this, we need to disable suspend direct complete optimization to let igb 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/igb/igb_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 3269d8e94744f..580d14b49fda1 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -3452,6 +3452,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) break; } } + + dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP); + pm_runtime_put_noidle(&pdev->dev); return 0; -- 2.20.1