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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 40190C433B4 for ; Tue, 13 Apr 2021 09:15:23 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 BB49460234 for ; Tue, 13 Apr 2021 09:15:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB49460234 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uTMFLTtaH8OIZifOh6bdas98+P8fqO32rntXEJEBsyA=; b=rOqpYBpgEhdfORpwz8VBJnHXW KkJB7vjWPfmmS5UBgO/4jHBNvs4gWr+5/VrvU3nJsVsrdU/82Nzk1pbefBneIVo/VInmwP7hr3b+Z OIxXxfC8ZLYTqY+be1/D3na+BCo87Rs+2MOWR49dJPWdZV7FJIDjQI+7CZSomIXrQJqn6lUvSVEPY 95ugImd6M7tSZLhZ2tDLrHrYwJJU9PotUh1WkMWFYHUIlF+mvHqiIXnKDlcZWk050HDTXjFaYxYQk 03qXSKIdvTgWe1hnD4lApPo7eVXSdBX6yiSFxmwhOedoqHM1KiybcSD5h4/Wge/e4+AG7MtSSy0Dq mW1GMEiBA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lWF7v-008fhy-Jb; Tue, 13 Apr 2021 09:14:31 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWF5w-008fVr-MS for linux-nvme@desiato.infradead.org; Tue, 13 Apr 2021 09:12:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=DVBrcXWscYJG/d7IRraPVTHS+7FvU1rncMeZihfJzJ8=; b=F73rBZOhxxnP4y47aO3cE3RPjS 0YFHGnYe7yYXpI6u4uUx0pTE/hwLxmTHG0Q0FzYvrUJmcvH0w1CfL/S+HgYitAA+Mhi/ssCGovpJ7 T8P5YIxDVDdEkDqInrP+5jhKulzYXxiWGX7RlFHh+VJOBcEPI7Ldtjcst1xBmU6FNq1nXSfUkds3P dmUNYFTtm7kdDPsqNbARg+bgB8CsUhHF19pvsgmEXiM/aLJRm8QpJ0UKZoTqiDN5l2keyuS8j9n8e bwxTWGeaqZhoTc7ke0JgLCNZwehh5we556nbXJIhA8uuDfPrgNE0u5x7xmmKwRFSwTJjxGE7KsD/b OwH9T9bA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWF5u-006rnY-1u for linux-nvme@lists.infradead.org; Tue, 13 Apr 2021 09:12:27 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 08F2460234; Tue, 13 Apr 2021 09:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618305145; bh=clvLU+yJsltDJmrNBr4SwJL3Irev7jGlHg6FUGBtODQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Qt3lWf28h8aEPtkZLSdqVQiw/oBqwRxhJWYMNvkeFtJUe+xztxcznd90XDe+/u56S O4OUWUhbc/uwUIQXaS+z8hf2g5AbWXI1taoJZMDGUFwKlXl0Zl8pieTloxVqDvowZC oB+aIz9VH2LnDujgL2RaDaJM34eLBTKt+5FRgwNc= Date: Tue, 13 Apr 2021 11:12:23 +0200 From: Greg KH To: Prike Liang Cc: linux-nvme@lists.infradead.org, kbusch@kernel.org, Chaitanya.Kulkarni@wdc.com, stable@vger.kernel.org, Shyam-sundar.S-k@amd.com, Alexander.Deucher@amd.com Subject: Re: [PATCH] nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path Message-ID: References: <1618304441-12550-1-git-send-email-Prike.Liang@amd.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1618304441-12550-1-git-send-email-Prike.Liang@amd.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210413_021226_168296_38D59758 X-CRM114-Status: GOOD ( 21.48 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Tue, Apr 13, 2021 at 05:00:41PM +0800, Prike Liang wrote: > The NVME device pluged in some AMD PCIE root port will resume timeout > from s2idle which caused by NVME power CFG lost in the SMU FW restore. > This issue can be workaround by using PCIe power set with simple > suspend/resume process path instead of APST. In the onwards ASIC will > try do the NVME shutdown save and restore in the BIOS and still need PCIe > power setting to resume from RTD3 for s2idle. > > Signed-off-by: Prike Liang > Signed-off-by: Shyam Sundar S K > Reviewed-by: Chaitanya Kulkarni > Cc: # 5.11+ > --- > drivers/nvme/host/pci.c | 5 +++++ > drivers/pci/quirks.c | 10 ++++++++++ > include/linux/pci.h | 2 ++ > include/linux/pci_ids.h | 1 + > 4 files changed, 18 insertions(+) > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index 6bad4d4..dd46d9e 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -2832,6 +2832,7 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev) > { > struct acpi_device *adev; > struct pci_dev *root; > + struct pci_dev *rdev; > acpi_handle handle; > acpi_status status; > u8 val; > @@ -2845,6 +2846,10 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev) > if (!root) > return false; > > + rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0)); > + if (rdev->dev_flags & PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND) > + return NVME_QUIRK_SIMPLE_SUSPEND; > + > adev = ACPI_COMPANION(&root->dev); > if (!adev) > return false; > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c > index 653660e3..0b175ce 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -312,6 +312,16 @@ static void quirk_nopciamd(struct pci_dev *dev) > } > DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8151_0, quirk_nopciamd); > > +static void quirk_amd_nvme_fixup(struct pci_dev *dev) > +{ > + struct pci_dev *rdev; > + > + dev->dev_flags |= PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND; > + pci_info(dev, "AMD simple suspend opt enabled\n"); > + > +} > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CZN_RP, quirk_amd_nvme_fixup); > + > /* Triton requires workarounds to be used by the drivers */ > static void quirk_triton(struct pci_dev *dev) > { > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 53f4904..a6e1b1b 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -227,6 +227,8 @@ enum pci_dev_flags { > PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10), > /* Don't use Relaxed Ordering for TLPs directed at this device */ > PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11), > + /* AMD simple suspend opt quirk */ > + PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND = (__force pci_dev_flags_t) (1 << 12), > }; > > enum pci_irq_reroute_variant { > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > index d8156a5..a82443f 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -602,6 +602,7 @@ > #define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS 0x780b > #define PCI_DEVICE_ID_AMD_HUDSON2_IDE 0x780c > #define PCI_DEVICE_ID_AMD_KERNCZ_SMBUS 0x790b > +#define PCI_DEVICE_ID_AMD_CZN_RP 0x1630 Why add this here when it is not needed in this file? Please read the top of the file... thanks, greg k-h _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme