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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A8C63C4CEC4 for ; Wed, 18 Sep 2019 21:42:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7433B21925 for ; Wed, 18 Sep 2019 21:42:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oZWdR+KC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7433B21925 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=rjwysocki.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1/JOX/ECrcA7Z2oN7N12fK8XgGiRmrL2R5cdgsx9uHM=; b=oZWdR+KCsz1HIz 4x3S6mQwVNuNDOuSF3ERUPwTGkrb6QnV374Jmrqjasu2n1gz5cScUea4n2QWmYLFfumMfiyyWro6i wmrkPUBPZ49WMD/WnxhTa9H2o53j3oV9cgDAuUi9Sy8Sx4X3ahmATQ93oRR5p+ZRcl4VclBXuJ/vT YTEuB1ikQnVyh9WLm0Vx+x8sA9GPclKW8iPSBiHRcd60LcccMhKpUWzKD9lkCq8oHDytlnCg/Df0K atKgnV+nSL/PJKBwzjxbp4OXt5NCpSpWFzcDEHSWGCoedrfVEOV0ScztopG7jYRJkMi2WcmBvSKDn qJW0nvGimGy3AdVqGIag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iAhit-0002PU-LK; Wed, 18 Sep 2019 21:42:51 +0000 Received: from cloudserver094114.home.pl ([79.96.170.134]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iAhiq-0002OW-Pp for linux-nvme@lists.infradead.org; Wed, 18 Sep 2019 21:42:50 +0000 Received: from 79.184.255.25.ipv4.supernova.orange.pl (79.184.255.25) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.292) id 3c431064e5c516d5; Wed, 18 Sep 2019 23:42:44 +0200 From: "Rafael J. Wysocki" To: Mario Limonciello , Keith Busch Subject: Re: [PATCH] nvme-pci: Save PCI state before putting drive into deepest state Date: Wed, 18 Sep 2019 23:42:44 +0200 Message-ID: <9775216.kg7gRTdaXr@kreacher> In-Reply-To: <4858057.cjDlXVALXj@kreacher> References: <1568245353-13787-1-git-send-email-mario.limonciello@dell.com> <4858057.cjDlXVALXj@kreacher> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190918_144249_001945_2F70FBC6 X-CRM114-Status: GOOD ( 19.41 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Crag Wang , Sagi Grimberg , Linux PM , sjg@google.com, Linux PCI , LKML , linux-nvme@lists.infradead.org, Jens Axboe , Ryan Hong , Jared Dominguez , Christoph Hellwig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org On Wednesday, September 18, 2019 11:31:19 PM CEST Rafael J. Wysocki wrote: > On Thursday, September 12, 2019 1:42:33 AM CEST Mario Limonciello wrote: > > The action of saving the PCI state will cause numerous PCI configuration > > space reads which depending upon the vendor implementation may cause > > the drive to exit the deepest NVMe state. > > > > In these cases ASPM will typically resolve the PCIe link state and APST > > may resolve the NVMe power state. However it has also been observed > > that this register access after quiesced will cause PC10 failure > > on some device combinations. > > > > To resolve this, move the PCI state saving to before SetFeatures has been > > called. This has been proven to resolve the issue across a 5000 sample > > test on previously failing disk/system combinations. > > This sounds reasonable to me, but it would be nice to CC that to linux-pm > and/or linux-pci too. > > > Signed-off-by: Mario Limonciello > > --- > > drivers/nvme/host/pci.c | 13 +++++++------ > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > > index 732d5b6..9b3fed4 100644 > > --- a/drivers/nvme/host/pci.c > > +++ b/drivers/nvme/host/pci.c > > @@ -2894,6 +2894,13 @@ static int nvme_suspend(struct device *dev) > > if (ret < 0) > > goto unfreeze; > > > > + /* > > + * A saved state prevents pci pm from generically controlling the > > + * device's power. If we're using protocol specific settings, we don't > > + * want pci interfering. > > + */ > > + pci_save_state(pdev); > > + > > ret = nvme_set_power_state(ctrl, ctrl->npss); > > if (ret < 0) > > goto unfreeze; > > @@ -2908,12 +2915,6 @@ static int nvme_suspend(struct device *dev) > > This is the case in which the PCI layer is expected to put the device into > D3, so you need > > pdev->state_saved = 0; > > at this point, because you have saved the config space already. > > > ret = 0; > > goto unfreeze; > > And here you don't need to jump to "unfreeze" any more. BTW, doing nvme_dev_disable() before nvme_unfreeze() looks odd to me. Maybe it would be better to do "unfreeze" and then "disable" in this case? > > > } > > - /* > > - * A saved state prevents pci pm from generically controlling the > > - * device's power. If we're using protocol specific settings, we don't > > - * want pci interfering. > > - */ > > - pci_save_state(pdev); > > unfreeze: > > nvme_unfreeze(ctrl); > > return ret; > > > > > > > _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 B0A67C4CECE for ; Wed, 18 Sep 2019 21:42:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8DA6D21925 for ; Wed, 18 Sep 2019 21:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387521AbfIRVmr (ORCPT ); Wed, 18 Sep 2019 17:42:47 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:52759 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388034AbfIRVmq (ORCPT ); Wed, 18 Sep 2019 17:42:46 -0400 Received: from 79.184.255.25.ipv4.supernova.orange.pl (79.184.255.25) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.292) id 3c431064e5c516d5; Wed, 18 Sep 2019 23:42:44 +0200 From: "Rafael J. Wysocki" To: Mario Limonciello , Keith Busch Cc: Jens Axboe , Christoph Hellwig , Sagi Grimberg , linux-nvme@lists.infradead.org, LKML , Ryan Hong , Crag Wang , sjg@google.com, Jared Dominguez , Linux PCI , Linux PM Subject: Re: [PATCH] nvme-pci: Save PCI state before putting drive into deepest state Date: Wed, 18 Sep 2019 23:42:44 +0200 Message-ID: <9775216.kg7gRTdaXr@kreacher> In-Reply-To: <4858057.cjDlXVALXj@kreacher> References: <1568245353-13787-1-git-send-email-mario.limonciello@dell.com> <4858057.cjDlXVALXj@kreacher> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Wednesday, September 18, 2019 11:31:19 PM CEST Rafael J. Wysocki wrote: > On Thursday, September 12, 2019 1:42:33 AM CEST Mario Limonciello wrote: > > The action of saving the PCI state will cause numerous PCI configuration > > space reads which depending upon the vendor implementation may cause > > the drive to exit the deepest NVMe state. > > > > In these cases ASPM will typically resolve the PCIe link state and APST > > may resolve the NVMe power state. However it has also been observed > > that this register access after quiesced will cause PC10 failure > > on some device combinations. > > > > To resolve this, move the PCI state saving to before SetFeatures has been > > called. This has been proven to resolve the issue across a 5000 sample > > test on previously failing disk/system combinations. > > This sounds reasonable to me, but it would be nice to CC that to linux-pm > and/or linux-pci too. > > > Signed-off-by: Mario Limonciello > > --- > > drivers/nvme/host/pci.c | 13 +++++++------ > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > > index 732d5b6..9b3fed4 100644 > > --- a/drivers/nvme/host/pci.c > > +++ b/drivers/nvme/host/pci.c > > @@ -2894,6 +2894,13 @@ static int nvme_suspend(struct device *dev) > > if (ret < 0) > > goto unfreeze; > > > > + /* > > + * A saved state prevents pci pm from generically controlling the > > + * device's power. If we're using protocol specific settings, we don't > > + * want pci interfering. > > + */ > > + pci_save_state(pdev); > > + > > ret = nvme_set_power_state(ctrl, ctrl->npss); > > if (ret < 0) > > goto unfreeze; > > @@ -2908,12 +2915,6 @@ static int nvme_suspend(struct device *dev) > > This is the case in which the PCI layer is expected to put the device into > D3, so you need > > pdev->state_saved = 0; > > at this point, because you have saved the config space already. > > > ret = 0; > > goto unfreeze; > > And here you don't need to jump to "unfreeze" any more. BTW, doing nvme_dev_disable() before nvme_unfreeze() looks odd to me. Maybe it would be better to do "unfreeze" and then "disable" in this case? > > > } > > - /* > > - * A saved state prevents pci pm from generically controlling the > > - * device's power. If we're using protocol specific settings, we don't > > - * want pci interfering. > > - */ > > - pci_save_state(pdev); > > unfreeze: > > nvme_unfreeze(ctrl); > > return ret; > > > > > > >