From patchwork Thu Apr 15 03:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prike Liang X-Patchwork-Id: 423401 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 109D1C433ED for ; Thu, 15 Apr 2021 03:53:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA9856101B for ; Thu, 15 Apr 2021 03:53:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229820AbhDODx3 (ORCPT ); Wed, 14 Apr 2021 23:53:29 -0400 Received: from mail-mw2nam08on2050.outbound.protection.outlook.com ([40.107.101.50]:5358 "EHLO NAM04-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229481AbhDODx2 (ORCPT ); Wed, 14 Apr 2021 23:53:28 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PltAuT/k5+9lBI6qE4ebJHvFNIS9xiu5ie7/aIUypS/8v9MBrr35kOdBWjlrH96oq0x3iITzsSVoVTIpOLZE4Br4XVNXs2v6ApgNYrzjJZEx2eieegDnI93yV8xbBrnWc+nOkdRHEhczevGtXtBB5r7faRqT0H+rZal+0qYRFC2peLTxhGlNM9iv10UKFVdFSIRdgHEl1t7OAW4rkOqZ3WENJsBCL5K4NTgL+pBcJzN+VmghzVdpYkakjw0ooz6htIiFpdciNj6fNibke2XoUpgx3MCPDpUH/G31uXDdTX+1qGucb7pZDTLZdVSYfLGeOQdhwd6llkDYM3UA8JpXGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4s1pRAytZ4H4ND4at+80EUM+H3QMa/WP26gzpGTXYVE=; b=RQYXNnmjj8HxW1yj6cGybdamsVxpVva2txfWEV67LUNMp1pGw7vYh3egffc+wbF5epc23bH0W8VM6quDSLUGGkV9zVwn1+5+OGCdQvBj/hhicxLU2G6Cu9hapJgC6i8DKQj9cYBNs6lJiiJt9mTJyOiCjHoL3ZdCjPzyCZCs5I0Q+lNW0lowI4+ANZoWDUQ65rK82oE0iMym3aCN6Y0xgiH2ayWlGSEQSks+NR5scb0MnRLrfyOqXmCWsz2iLgy+askPT63qxGFAaVn1MuXHYslujOmDaMPI/2K0WZgGRUooDHnSUvMgYzwX772+u8vY9VQA6bv0bgsKWO9cPQ9JZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4s1pRAytZ4H4ND4at+80EUM+H3QMa/WP26gzpGTXYVE=; b=Ypdh2UedvDsfgiv/1Ijr5lWYyLvqzIDIAgFVDCpinj0XAGSCgh4L4FoOb3dt41xXGx0ZZJwrnL1yJAoMQmPj1N/X4y2qeve/BAFuafiqkwYNAXGIFZKjd6o5Shgfd1Oy+fExdbFXUkSU+biZZ/Eg5CcnPkvDpTFkFqKP9aGSnR4= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=amd.com; Received: from BYAPR12MB3238.namprd12.prod.outlook.com (2603:10b6:a03:13b::20) by BYAPR12MB2726.namprd12.prod.outlook.com (2603:10b6:a03:66::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 03:53:01 +0000 Received: from BYAPR12MB3238.namprd12.prod.outlook.com ([fe80::5870:fcd6:b13a:c49c]) by BYAPR12MB3238.namprd12.prod.outlook.com ([fe80::5870:fcd6:b13a:c49c%5]) with mapi id 15.20.4020.023; Thu, 15 Apr 2021 03:53:00 +0000 From: Prike Liang To: linux-nvme@lists.infradead.org, Chaitanya.Kulkarni@wdc.com, gregkh@linuxfoundation.org, hch@infradead.org Cc: stable@vger.kernel.org, Alexander.Deucher@amd.com, Prike Liang , Shyam Sundar S K , Chaitanya Kulkarni Subject: [PATCH v4 1/2] PCI: add AMD PCIe quirk for nvme shutdown opt Date: Thu, 15 Apr 2021 11:52:04 +0800 Message-Id: <1618458725-17164-1-git-send-email-Prike.Liang@amd.com> X-Mailer: git-send-email 2.7.4 X-Originating-IP: [180.167.199.189] X-ClientProxiedBy: HK0PR01CA0070.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::34) To BYAPR12MB3238.namprd12.prod.outlook.com (2603:10b6:a03:13b::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prike.amd.com (180.167.199.189) by HK0PR01CA0070.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 03:52:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9480b971-1324-4254-6977-08d8ffc1f6a0 X-MS-TrafficTypeDiagnostic: BYAPR12MB2726: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1775; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: agTFSk7zdXanVpLRisZhyNhnUHGY86pN0QITSPFNH84sbNiOgOBBIOPKgTy0H1n+qbsATeksxEZtCC90sFy05AvHKv2SK2UTwxS21aFLgnPCenaaj+BaAuo7PwYsNNIjR2m4VIgjsAjUTnhYSolWQHdEgwdfS8G4Z6RB190a3erhyT2PzcZDjgkQeUS/4kzqgW2tn+7rQ+60BIsewRUxK/fgQHEv8ljS4JxSIauJ6kiX0cgiBvHE94TSkJ3lhldXYpKAyt/+FdGGkvvtulAX//sCSnlRZlNYBdRypvZelQsjg/0n7r58jNHfoAAkG9zpk5X8V3kZJ2e4L0QVLV/75u7t5D1LAXpHx223t9nhrR3BUw/JNa8EchRqajh86s3FmL7LKbeNR9k8FvUhJ40CkCCUSfACglo9JXViL278HVEFwTkAlPZFCOxAF6CRozEs6FkzFHVyFr4G5/8s8xMoJkGT/cRVgark8ov2ZmfzGuWy/b8ano+HLcmsJuXIbHoLAZuzvWbzZIrwPv4teBfdlUoTqK7Qimq4N6l3kuBe25ElR+87++Kic+dCtpC01VceYBiFkzYiFVptpl5XtW2Jc5dMqMlCgDwaNdwrdQV8Z1BtW0ydkyM915Iji5IcTZBIxhynNYOsjQO41jZxsbfRWw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR12MB3238.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(366004)(5660300002)(6486002)(316002)(478600001)(4326008)(8936002)(86362001)(16526019)(956004)(66946007)(83380400001)(2616005)(66556008)(66476007)(38350700002)(186003)(38100700002)(36756003)(6666004)(54906003)(52116002)(8676002)(26005)(2906002)(7696005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: iaoQ9um2QRzkQt+Gm7HdcjOkMJEJJZ7a2HM8lOYYb82UllYnmQfF6atd9rBghCQwExVAEE3f/Pl2d9ewKB2229ppGq84amxcVpANj42TrAJsMPL4pnv6qqlcjFR+n1I7hyG3w8UEzlMnM90sNLHMayUfudXk2uRgpQY3Mth2d6VcoKf0f2q6eFhfeJBXLV2ddnWohQhV+UE9Qglbdc7mLi1MFwwA2Y84Eub5RStE8nGEVi6lUA9h9v8e9mMBuWv3fw1NPE2P69MkSidV5nUKb53usq5JDB7PjSgD1jLfpnRk9z+PgefhAnj+W4I8LcFQdIuJihNRQtGx7EIMlloGqVpirTJ4UvG7RVcV3CXoBZSrFuLnDJ4vNLVgp4YuS4aCvomv8wl6oiw+Mr7mxmp41uTpRkMRg1P6oD1HUKqQIEt2G+7yfzAMYbwDaaoBhi7lwOdLrTWuOjA1zGeupG8XUTDxKu5p9WNbtvhMZBhfKSxnDMcF7eusphfr2wBmigT12CqUZ/wyU/I2/mFyIJ75MqeUL+LskqGvwjjdPLaeieT9C8xEMn0vvDhXOLLZuhQCBZ6XOYAL43Rbjzdw/ThJipEuW2dEt7reeGUGWW6PBQEYDEfs2A+mxMu796ACzYl5wgbxvyv0rZfDfzUKXmFExvYWbGuy6c8EkogWxELmKZEb0zhLm4cgahUNQwgKCqzicqoLCSDLYSXPDSBYz2S7edGKJg7FfjRyRf4MCEnrYuBaS0bCzVDxvY3GpAqt1o+I2x6OMrdWnfZBnnKiC6o8uKQVropznEvU4ilEx16eRasAqFplft+ubx2kjIw4VrXm18P2y7IwG35lEQ6TUoimV4hAfpTcRAmKiqpsh9QWvEQny2NtM2cX+T0UplOChjTlyhUmnzJkq9qI6DINdiAY6dZgCHKnt0dGaB4WpBpRPSofEtPtRRrDw7URWjscYcTeRVNR7jkGyA51xixmdpnGulKywKmXAASIbkxTfTCUirZtMb072Q2J+c0zH9kwwovdDAUVegW/nsnIkcO+5+wmLocLSgDmzKKIyVpdT7RdS7LSzvaOOsCuAmhOr7X97bea2PwzQGM9+tV9W0jied3TzoBGdcPtE6je2rIs3yfVNA/rB60qxVPBcCJMhSv+4tDTl3tDRlD6j4k5fLvAfhNh/7VZ8mSNH2ffwZSZVlRqr9BKFnPRQR2UCCiSHgK1XeZyMQwKFhf+L8UJn/qBbGB721R2V4l/HibVPU/1zG7Lr2aLGdklJ+h9P0t6mtnU3H73od3Q4OSMtWGNF9QvLxgAF/wajhmg8J9B7+RAwbQRP+FfnphqbPhxxpnTREtJzO07 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9480b971-1324-4254-6977-08d8ffc1f6a0 X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3238.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 03:53:00.6762 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IbOa+OQDfxLSnhmHxKcloTmXTE4C92fT4nT21kiK8JJtOvRDg/RQNiO5kfzG//n+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2726 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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. In this preparation patch add a PCIe quirk for the AMD. Cc: # 5.11+ Signed-off-by: Prike Liang Signed-off-by: Shyam Sundar S K [ck: split patches for nvme and pcie] Signed-off-by: Chaitanya Kulkarni Reviewed-by: Chaitanya Kulkarni --- Changes in v2: Fix the patch format and check chip root complex DID instead of PCIe RP to avoid the storage device plugged in internal PCIe RP by USB adaptor. Changes in v3: According to Christoph Hellwig do NVME PCIe related identify opt better in PCIe quirk driver rather than in NVME module. Changes in v4: Split the fix to PCIe and NVMe part and then call the pci_dev_put() put the device reference count and finally refine the commit info. --- drivers/pci/quirks.c | 10 ++++++++++ include/linux/pci.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 653660e3..f95c8b2 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, 0x1630, 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 { From patchwork Thu Apr 15 03:52:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prike Liang X-Patchwork-Id: 422455 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 53DCEC433B4 for ; Thu, 15 Apr 2021 03:53:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 368E5613BA for ; Thu, 15 Apr 2021 03:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229481AbhDODx3 (ORCPT ); Wed, 14 Apr 2021 23:53:29 -0400 Received: from mail-mw2nam08on2050.outbound.protection.outlook.com ([40.107.101.50]:5358 "EHLO NAM04-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229763AbhDODx3 (ORCPT ); Wed, 14 Apr 2021 23:53:29 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UwHZDV3P1TFibenUmAg6fnpzO/EZHZPlFzuByM97AALwOdTPvenVkLOjCvCEHerTE4mGQVkLTNkPOac+/ElZwsSc0e2UPLN0xMUkHFmvfW8RP3cfoIbmIWTkld7W/LN5hwPNxRYE4Ohei0nULIyfd0PPyw9jN5UibrESSQ/quU5yxQHkL6++/1xj+okU93xHC27eXY1AaKxVZhL9FxgpSbx8QMSksW0Y5wkbuAgWlDOKJhR+bsXRZy23H9CXHnDFybpDgDc5jC+NsWNSHrH8RIyRRJM5woFr+fHz1hS94p+r3PCIUMVXH82a6+zXhZ3majUfE2x152rAmT4vOQTYpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CJJBn48Maq50eEGcFsEgh1EH2D5EBbS4q1+jrTKn6CE=; b=lGntDcm562yTngY6juQLil+XBNcyIgfoixm+DPQpj/pkyOgrouTHZdLgVZNGlO6Ty56iP3zdvEyabFL5tFpVZqidPgoC7hxRUmqus170Fj668i+HZ4X/CtFGqJrg6ry5ihkUY6ttS5a9qkAA+BMN9/hWquml5+ZMMMAysGsL6NUwN9rusG3WXB+oNOUduJ7lBnjEZDqcHg/6cDtrzwiFwlQCa1sO6m+olCLptcYSiZQ6K9KBgmTX8RiEJp8ecphgu3iN3csA6bjl8CXAUxYJ2OWDR4z35F0OScYjhtwur5lD2KJe4Wb3cWB+DxKNGBIp2/Mw/oqxvnGgGjeXsqdVsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CJJBn48Maq50eEGcFsEgh1EH2D5EBbS4q1+jrTKn6CE=; b=ajxwrixcSsZAUjxZ/lTGoldNM7e2BnzRMKC8yIrUCgyODX50T76L3gG5HxeWCgZOvh0GwTjTR9eHJizwrjezfTfhSkVcYvkBBuEGsUvBtmypbiLeal3S7KBeRWmw+/35pLksvbGQHsG4WsAQ499u4p7TdVTO6oGDNkLYsmP9iRM= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=amd.com; Received: from BYAPR12MB3238.namprd12.prod.outlook.com (2603:10b6:a03:13b::20) by BYAPR12MB2726.namprd12.prod.outlook.com (2603:10b6:a03:66::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 03:53:03 +0000 Received: from BYAPR12MB3238.namprd12.prod.outlook.com ([fe80::5870:fcd6:b13a:c49c]) by BYAPR12MB3238.namprd12.prod.outlook.com ([fe80::5870:fcd6:b13a:c49c%5]) with mapi id 15.20.4020.023; Thu, 15 Apr 2021 03:53:03 +0000 From: Prike Liang To: linux-nvme@lists.infradead.org, Chaitanya.Kulkarni@wdc.com, gregkh@linuxfoundation.org, hch@infradead.org Cc: stable@vger.kernel.org, Alexander.Deucher@amd.com, Prike Liang , Shyam Sundar S K , Chaitanya Kulkarni Subject: [PATCH v4 2/2] nvme-pci: add AMD PCIe quirk for suspend/resume Date: Thu, 15 Apr 2021 11:52:05 +0800 Message-Id: <1618458725-17164-2-git-send-email-Prike.Liang@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1618458725-17164-1-git-send-email-Prike.Liang@amd.com> References: <1618458725-17164-1-git-send-email-Prike.Liang@amd.com> X-Originating-IP: [180.167.199.189] X-ClientProxiedBy: HK0PR01CA0070.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::34) To BYAPR12MB3238.namprd12.prod.outlook.com (2603:10b6:a03:13b::20) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from prike.amd.com (180.167.199.189) by HK0PR01CA0070.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 03:53:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 67965976-58cf-4c17-6dc2-08d8ffc1f85b X-MS-TrafficTypeDiagnostic: BYAPR12MB2726: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B7vZ7a04wgY61Fjbg/v7Q/HHmQnsEKEXifhve4sQfnOEYBtL7A+c06aZNBbFlz5rUvCLyXk3idzUCchU/xdCe3lyhAiwrefhgO7jvBeF2vF93ujrgM1eYwPVsb89UmUUDCyyACHHk1FfJjgCtoKO1jFdIflWpbn6Na7OLP2ONNZi7cQv/Kn8OjqXbmBBMzcyu0+Zp8rI1CHU2AybrJiPUvBb7J28ovxl4jzWlQnWy/vqq1CorSbnyCJA+EHOvMi6xf0UR8XrODG+FIi+EnEBJdpdBezMmUta/tXXzVDBTbP6bOMurqjyesJpmmLE39eYF9mi+0+Z3GSbYwl9tiysllyuPS3snfjMrPyJ2pmKQnx5kEnJ/bdQTVyLTpnGr0RpmgsoMnTXaJtsyicH5O/El2FdvP7bTj3Hk7XgeYCEGTxLoi7ryMDZlk4KGnjZSO9Gqf1fNZuGZcLCcvIwNgI4SlxC/yxDzKDXV3Eh19eUkhxmax/aCDvMeGaRuEqgbTmB1qO70T4tWwc0LPncfBZFVqyiV6GgkeyG+JF3kooYTHMa08bZ68txn+wauv03QlLJy/PkexkA49DJMLuhSxz+vY4XfppTA5lOyLdie4vGaDkFKZ/mAAV+XTISgFxKtq8Ld2pePoc3uwWAvIKvoZnqawJjTMzHghCzpBp0OkbBAt4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR12MB3238.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(366004)(5660300002)(6486002)(316002)(478600001)(4326008)(15650500001)(8936002)(86362001)(16526019)(956004)(66946007)(83380400001)(2616005)(66556008)(66476007)(38350700002)(186003)(38100700002)(36756003)(54906003)(52116002)(8676002)(26005)(2906002)(7696005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 7YtEVvLHoVchexzWCsFR+j3p3Rj3MZIKe4osh5YAZBH3xotlJvShOVESF2gjWdQJJ4//uTXw6Ta0IRX/Dpw6v3Dm3c9cUAvaJu+ms1Ln/1yUcBqsR8Sb4yN5kBVwITFeLf1y9FDgPXjSNmH+b1QYujLXgKtwX7GawVeSOmDYfiH4D8KYsf8ZbgcViIcZKt3tBme5x+53NQ46fUL+sN5CGU3i0XXJ3ZM8cYRqfWGblRlXxg4ReqnLV6z2tkpZ29/InPXxlGcNn+zNoPfHgCdaVR9GdpCaodFtacy5kL6ZCsEe1tMSc0zp/U3ZeQjNL7RgV2Cc/ftWEJMOGtEjtnj/huMgJkHs9GPudpkkZPjqeMnxV8nHhEsxtHu3RVFcNpLB3bHz2LXaYxXBKT6YGcAcIJ2s8lWNX1CSqKx7V1Lo+m4uND1SvMgflPGqonwDUe22EZAXW7bIjWp9aUd5YIwgR1opuPAizCcZLPt0mLB7C6asXL4ZcIF+xT+P0JqLDqtqIQ2XrRz+afK9tnJOCOOTOANzi6hJTYr6quGxR7MrmpHo6T97C5M5POc4tQu+ZcrLgavHJRMMmOMbtMc1rrKMhwQ/EN7G01a/wd8NQaEEYvz6HKm/otSOa7z7pw30EP1thlMIskFYj/L2KuzIDsZtb6sYzKo5ulV5kC4SDB6fODxLcjJU5EkWj2wuOA2xIrED4jZvzBSoyjktwCgTlbUl47CdH+6ca/vY5oxk1Y0jMRTzJZrfq97YRpUCVJvM/rxGkYUzq1Q34OK0SzPRJcLOkB0YgBqg3kaHInk3/4wAg82CtQO4DzqAkIefUbjltfGpifBZ6rMTGEvfJg/TXivYPNGBNH+aj+M6EIDcFgPTSjNY94aEkclHs3e14NXBCS7MCCaqrd3ZLk7Vvz1nmrdo3/wz2rNTkSx2th3jKROQXDerxplzA1yQBjPJO/qRyRc9wvaQyvpj0erPWHGXNCYR1tUQBcLBPZu1I/bA6kJ8qBTvICCtI1/PdNAsG26lgQKys5F5RGNTxBXTQ7e52eKFU6TM7nXjFctlObLgaXlzdv5VhdylI5J6kzsG+mu5ma6i9y21D7Qwp53nkHoRZP8V4OmCT/LIp6qFiCntCoteljXQ/vywtRidFcLUB8QMP8yFrY7cihW3P4ng2LNLIXQREbeOdH4b4azg1luQ6X5AqKKbJirmMtAeYcPEhDbkefA5RHczr0HozeYcG/Jms6TDEk7qoOBgfs77NiqeJ2HRwGEj72SlyPY/lKpOJRYR/UAWNuxP7a7W3yzPuKWmQC+zBTS8I5uAjGQJdkfztLIrd82Rxgi0J7PK3+W/DmJ1npil X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67965976-58cf-4c17-6dc2-08d8ffc1f85b X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3238.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 03:53:03.5196 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rxLYCDHEZfUbsFcdyX5CDA5bvHpGjx7lndAJJCl8+t9IWWIHepWUfDw+iPnEU4DM X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2726 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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. Update the nvme_acpi_storage_d3() _with previously added quirk. Cc: # 5.11+ Signed-off-by: Prike Liang Signed-off-by: Shyam Sundar S K [ck: split patches for nvme and pcie] Signed-off-by: Chaitanya Kulkarni Reviewed-by: Chaitanya Kulkarni --- Changes in v2: Fix the patch format and check chip root complex DID instead of PCIe RP to avoid the storage device plugged in internal PCIe RP by USB adaptor. Changes in v3: According to Christoph Hellwig do NVME PCIe related identify opt better in PCIe quirk driver rather than in NVME module. Changes in v4: Split the fix to PCIe and NVMe part and then call the pci_dev_put() put the device reference count and finally refine the commit info. --- drivers/nvme/host/pci.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 6bad4d4..ce9f42b 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,12 @@ 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 && (rdev->dev_flags & PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND)) { + pci_dev_put(rdev); + return true; + } + adev = ACPI_COMPANION(&root->dev); if (!adev) return false;