From patchwork Mon Mar 15 19:02:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 12140503 X-Patchwork-Delegate: kuba@kernel.org 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 1A1E4C433E0 for ; Mon, 15 Mar 2021 19:02:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E58D764E27 for ; Mon, 15 Mar 2021 19:02:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232516AbhCOTBq (ORCPT ); Mon, 15 Mar 2021 15:01:46 -0400 Received: from mga06.intel.com ([134.134.136.31]:1822 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231511AbhCOTBl (ORCPT ); Mon, 15 Mar 2021 15:01:41 -0400 IronPort-SDR: qZOP3CiaIzlOuFrNIkuW2hjCenVb3ATnA1qJ5jSlss1f1FMHvumujWufvU+sPasZL1KL05ogTu bpZinAdcXkTA== X-IronPort-AV: E=McAfee;i="6000,8403,9924"; a="250506214" X-IronPort-AV: E=Sophos;i="5.81,251,1610438400"; d="scan'208";a="250506214" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2021 12:01:17 -0700 IronPort-SDR: DpcgNkONi2HY9JMT5ajFRV8araaFoywd246HaWQNasaOB3LMbr2x+9mK6+HvS/3CFSW/B0JVRF oQuPj1W5p8kw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,251,1610438400"; d="scan'208";a="405264530" Received: from anguy11-desk2.jf.intel.com ([10.166.244.147]) by fmsmga008.fm.intel.com with ESMTP; 15 Mar 2021 12:01:16 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org Cc: Chen Yu , netdev@vger.kernel.org, sassmann@redhat.com, anthony.l.nguyen@intel.com, kai.heng.feng@canonical.com, rjw@rjwysocki.net, len.brown@intel.com, todd.e.brandt@intel.com, sasha.neftin@intel.com, vitaly.lifshits@intel.com, Dvora Fuxbrumer Subject: [PATCH net-next 2/2] e1000e: Remove the runtime suspend restriction on CNP+ Date: Mon, 15 Mar 2021 12:02:31 -0700 Message-Id: <20210315190231.3302869-3-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210315190231.3302869-1-anthony.l.nguyen@intel.com> References: <20210315190231.3302869-1-anthony.l.nguyen@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Chen Yu Although there is platform issue of runtime suspend support on CNP, it would be more flexible to let the user decide whether to disable runtime or not because: 1. This can be done in userspace via echo on > /sys/devices/pci0000\:00/0000\:00\:1f.d/power/control 2. More and more NICs would support runtime suspend, disabling the runtime suspend on them by default would impact the validation. Only disable runtime suspend on CNP in case of any user space regression. Signed-off-by: Chen Yu Tested-by: Dvora Fuxbrumer Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 8cd1b3e9e514..39ca02b7fdc5 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -7635,7 +7635,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_SMART_PREPARE); - if (pci_dev_run_wake(pdev) && hw->mac.type < e1000_pch_cnp) + if (pci_dev_run_wake(pdev) && hw->mac.type != e1000_pch_cnp) pm_runtime_put_noidle(&pdev->dev); return 0;