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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 64387C433ED for ; Tue, 13 Apr 2021 06:33:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38739610FC for ; Tue, 13 Apr 2021 06:33:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240161AbhDMGdr (ORCPT ); Tue, 13 Apr 2021 02:33:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:48768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237056AbhDMGdr (ORCPT ); Tue, 13 Apr 2021 02:33:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0FBFE613A9; Tue, 13 Apr 2021 06:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618295607; bh=peZ6qk2CtcVgPbv3xyfuUnIExHsbXX5k0Ifqjim7vR8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=OHTv8l5P5e99qs9HCe2s3s6TyIN0aT2NDOPO202QeJsLgg4eHIbzKNWgSGBDhm1Kb XtQZlOLTKfjsz0MbQ9/NxuNrQvDz9l15BeUr77W1jwf5LNfn41EeUCEVAGUpn7katL wblOW0VAefosQkhV4NXZC9R/QwXGRFkazfoOMk4o= Date: Tue, 13 Apr 2021 08:33:23 +0200 From: Greg KH To: Prike Liang Cc: stable@vger.kernel.org, Alexander.Deucher@amd.com, Shyam Sundar S K Subject: Re: [PATCH] nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path Message-ID: References: <1618294221-11528-1-git-send-email-Prike.Liang@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1618294221-11528-1-git-send-email-Prike.Liang@amd.com> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Tue, Apr 13, 2021 at 02:10:21PM +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 | 11 +++++++++++ > include/linux/pci.h | 2 ++ > include/linux/pci_ids.h | 2 ++ > 4 files changed, 20 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..b7e19bb 100644 > --- a/drivers/pci/quirks.c > +++ b/drivers/pci/quirks.c > @@ -312,6 +312,17 @@ 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); > +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_RN_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..7f6340c 100644 > --- a/include/linux/pci_ids.h > +++ b/include/linux/pci_ids.h > @@ -602,6 +602,8 @@ > #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 > +#define PCI_DEVICE_ID_AMD_RN_RP PCI_DEVICE_ID_AMD_CZN_RP If the pci ids are identical, why do you need different entries for it? Haven't you above just listed the same thing twice in the quirk entry? thanks, greg k-h