Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3769262rwa; Tue, 23 Aug 2022 09:49:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR7nmCnHfOETfdn3Mdqg5PP5AbnaQ+ZI0yNyWdW3ItyTzrw6QIERtvsLfqSUlCqQQ1fgmF1y X-Received: by 2002:a17:906:4fc3:b0:72e:eab4:d9d7 with SMTP id i3-20020a1709064fc300b0072eeab4d9d7mr289749ejw.599.1661273347956; Tue, 23 Aug 2022 09:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661273347; cv=none; d=google.com; s=arc-20160816; b=ciEdH9K61Ncetzvh6KUC80RZotkXHwO7Z7rConRWnMXwE4V7ITaQy9P/vv6/mNwxaG 5FTXd9HyQQ27bo2l92JQO4aGfkBDN2kK5UURK+ZRe5XewSaM6CeP+firmRxvyOiehgmA Kud4wQQIX5dKqalN0b9LhV0WJm85ep43R8OYOK3bXrqO0Bbp78u1CFGvyMJnxAg7dj7Q dpQXj2H4Kd5wjCYI8sUo4mRZY3FF67VdwxCyVFrkRio7RKfSCEYYW9QWiS5xXEoSEBbW eaNEKtUGMx2Zb7aMeYzZ2leAIq5i3PM35XxDiRtGdSzOGlJunra8zMEFUvpRDoaN3hGG rrnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=rLCrWOJxLKLbIRQocbDZ7iuDBoRRdE46Z6DB5cm9Ooo=; b=sEDiM16WQhEI8NALVIi6J0uPDP1UTX+X/x/W02ot2bXEWXPI2tDO0In1QTExFzEXVU cpF19E0CF0hptqsbq9J57j65OvY9hYIxSwPeE0jQVPFwBTtTP7Ne1SpWm9aLYy/HzPY0 9SFY0zHRlDXRrbnvW/60a5sztUdZu6kXbpmCVbm+YDPrdMYfVVkqqyRJOrQzrpblBYz7 WzLT9cA0nE88Y+YVKDoM3xImDaHk+a32Jj2Cyzw6ytinLv7iXlr/kIHiGLorONIAKRuk Nyd/HpwXaGyvg7uxah6qzJLRR+3cBr7wr11CVuf8Y3jkaVJMn9EsJbM0ZBxy+GZfV1KF G7/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=SWnVEhmS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nb30-20020a1709071c9e00b00730a5a456e9si138213ejc.758.2022.08.23.09.48.40; Tue, 23 Aug 2022 09:49:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=SWnVEhmS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243049AbiHWQdQ (ORCPT + 99 others); Tue, 23 Aug 2022 12:33:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240191AbiHWQcz (ORCPT ); Tue, 23 Aug 2022 12:32:55 -0400 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFD9730563 for ; Tue, 23 Aug 2022 07:55:21 -0700 (PDT) Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 852E53F11D for ; Tue, 23 Aug 2022 14:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1661266514; bh=rLCrWOJxLKLbIRQocbDZ7iuDBoRRdE46Z6DB5cm9Ooo=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=SWnVEhmSdRWni362obOduBmkNt393+R8f3fDmf1qmV8KFswMqqfaCKffkneDn14Tb +ubyud1qv8MKnfchgTlfFw032Of8UtRd4CRfpXbmNahoWnChV7n2CW/AZ4jwfBPCuv 3GYPoftnqKrC0o7D+b1d/za3h7q8wAEY7gM6mDaBpw/bbwjiq8Xg6IK3SQrFXiJnlA FDdCsTUM9fgh7dW0tc6OsJ0RJjBp0Uqa+GztdNgRJIOamx8EW1Gmi322hXEpwiTvs2 s2smuyLIW02mO/Ku3IuOg5+/DayRxV8alpJltR8hB4/bbNn3byokEumP/CttKJZuWW UY2G1ZTyB4jQA== Received: by mail-oi1-f199.google.com with SMTP id q184-20020acaf2c1000000b003432f020449so4819043oih.15 for ; Tue, 23 Aug 2022 07:55:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc; bh=rLCrWOJxLKLbIRQocbDZ7iuDBoRRdE46Z6DB5cm9Ooo=; b=KcOQf5ulevZ8M4SbYC0cGYLyVzuh1urzdCTRNLNYZnS32ZZoup0UQRX/bCJB2PVLcF 3EHSHpV/3PIl/WuPKCDCR+W++qkhomP9NlCGvJ7auDWivHCKujw0ZnKTm4myNO97Ehir l7WP2D1XudibR8DyfFHmizZFCNNGmQ7DL1nms9QkhWZZtOlfzinEfts6AMPbnE9i73aa SVogbSSbf0BltLds+CosTrNDiJgZ+spVZDgz07Ht2rjy8zD/z+rAorguJrii/qQi6MSU vVYSYpFvrG3dW1X7QtPZUPPKsDxqq054dRkLVMmFbK7J7nGCGi8rTyjEhgLLxVFv3YXc ygyQ== X-Gm-Message-State: ACgBeo2X316MagPF6l2xtyCcRiCZq5BIas/+LE1D2JpZAbMXzybxVswA rUGuXtmM4q2j12Lad+8XUAhFpbcN1vRipR1U2NSPEAP7wiqdfTkxAfm44j5e6ygtV1uWLl0uSjm 3JLs54AZsx9Tmm9PWPaMRCpdTceRhDbB5QpQ/atsTlGJ2vKnAX+wwBTZKVA== X-Received: by 2002:a05:6830:56:b0:639:bbb:f0cf with SMTP id d22-20020a056830005600b006390bbbf0cfmr6987753otp.161.1661266513198; Tue, 23 Aug 2022 07:55:13 -0700 (PDT) X-Received: by 2002:a05:6830:56:b0:639:bbb:f0cf with SMTP id d22-20020a056830005600b006390bbbf0cfmr6987731otp.161.1661266512696; Tue, 23 Aug 2022 07:55:12 -0700 (PDT) MIME-Version: 1.0 References: <20220722174212.GA1911979@bhelgaas> <86522aa5-2855-0f73-ddb2-a2b50b2fd1b7@nvidia.com> <8b36f97c-0cc4-3f4a-3b5b-49ad5786d9e9@nvidia.com> In-Reply-To: From: Kai-Heng Feng Date: Tue, 23 Aug 2022 22:55:01 +0800 Message-ID: Subject: Re: [PATCH V2] PCI/ASPM: Save/restore L1SS Capability for suspend/resume To: Vidya Sagar Cc: Lukasz Majczak , Bjorn Helgaas , Rajat Jain , Ben Chuang , bhelgaas@google.com, lorenzo.pieralisi@arm.com, refactormyself@gmail.com, kw@linux.com, kenny@panix.com, treding@nvidia.com, jonathanh@nvidia.com, abhsahu@nvidia.com, sagupta@nvidia.com, linux-pci@vger.kernel.org, Linux Kernel Mailing List , kthota@nvidia.com, mmaddireddy@nvidia.com, sagar.tv@gmail.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Vidya, On Tue, Aug 9, 2022 at 12:17 AM Vidya Sagar wrote: > > Thanks Lukasz for the update. > I think confirms that there is no issue with the patch as such. > Bjorn, could you please define the next step for this patch? I think the L1SS cap went away _after_ L1SS registers are restored, since your patch already check the cap before doing any write: + aspm_l1ss =3D pci_find_ext_capability(dev, PCI_EXT_CAP_ID_L1SS); + if (!aspm_l1ss) + return; That means it's more likely to be caused by the following change: + pci_write_config_dword(dev, aspm_l1ss + PCI_L1SS_CTL2, *cap++); + pci_write_config_dword(dev, aspm_l1ss + PCI_L1SS_CTL1, *cap++); So is it possible to clear PCI_L1SS_CTL1 before setting PCI_L1SS_CTL2, like what aspm_calc_l1ss_info() does? Kai-Heng > > Thanks, > Vidya Sagar > > On 8/8/2022 7:37 PM, Lukasz Majczak wrote: > > External email: Use caution opening links or attachments > > > > > > =C5=9Br., 3 sie 2022 o 14:55 Vidya Sagar napisa=C5= =82(a): > >> > >> Thanks Lukasz for the logs. > >> I still that the L1SS capability in the root port (00:14.0) disappeare= d > >> after resume. > >> I still don't understand how this patch can make the capability regist= er > >> itself disappear. Honestly, I still see this as a HW issue. > >> Bjorn, could you please throw some light on this? > >> > >> Thanks, > >> Vidya Sagar > >> > >> On 8/3/2022 5:34 PM, Lukasz Majczak wrote: > >>> External email: Use caution opening links or attachments > >>> > >>> > >>> pt., 29 lip 2022 o 16:36 Vidya Sagar napisa=C5=82= (a): > >>>> > >>>> Hi Lukasz, > >>>> Thanks for sharing your observations. > >>>> > >>>> Could you please also share the output of 'sudo lspci -vvvv' before = and > >>>> after suspend-resume cycle with the latest linux-next? > >>>> Do we still see the L1SS capabilities getting disappeared post resum= e? > >>>> > >>>> Thanks, > >>>> Vidya Sagar > >>>> > >>>> On 7/29/2022 3:09 PM, Lukasz Majczak wrote: > >>>>> External email: Use caution opening links or attachments > >>>>> > >>>>> > >>>>> wt., 26 lip 2022 o 09:20 Lukasz Majczak napisa= =C5=82(a): > >>>>>> > >>>>>> wt., 26 lip 2022 o 00:51 Rajat Jain napisa=C5= =82(a): > >>>>>>> > >>>>>>> Hello, > >>>>>>> > >>>>>>> On Sat, Jul 23, 2022 at 10:03 AM Vidya Sagar = wrote: > >>>>>>>> > >>>>>>>> Agree with Bjorn's observations. > >>>>>>>> The fact that the L1SS capability registers themselves disappear= ed in > >>>>>>>> the root port post resume indicates that there seems to be somet= hing > >>>>>>>> wrong with the BIOS itself. > >>>>>>>> Could you please check from that perspective? > >>>>>>> > >>>>>>> ChromeOS Intel platforms use S0ix (suspend-to-idle) for suspend. = This > >>>>>>> is a shallower sleep state that preserves more state than, for e.= g. S3 > >>>>>>> (suspend-to-RAM). When we use S0ix, then BIOS does not come in pi= cture > >>>>>>> at all. i.e. after the kernel runs its suspend routines, it just = puts > >>>>>>> the CPU into S0ix state. So I do not think there is a BIOS angle = to > >>>>>>> this. > >>>>>>> > >>>>>>> > >>>>>>>> > >>>>>>>> Thanks, > >>>>>>>> Vidya Sagar > >>>>>>>> > >>>>>>>> > >>>>>>>> On 7/22/2022 11:12 PM, Bjorn Helgaas wrote: > >>>>>>>>> External email: Use caution opening links or attachments > >>>>>>>>> > >>>>>>>>> > >>>>>>>>> On Fri, Jul 22, 2022 at 11:41:14AM +0200, Lukasz Majczak wrote: > >>>>>>>>>> pt., 22 lip 2022 o 09:31 Kai-Heng Feng napisa=C5=82(a): > >>>>>>>>>>> On Fri, Jul 15, 2022 at 6:38 PM Ben Chuang wrote: > >>>>>>>>>>>> On Tue, Jul 5, 2022 at 2:00 PM Vidya Sagar wrote: > >>>>>>>>>>>>> > >>>>>>>>>>>>> Previously ASPM L1 Substates control registers (CTL1 and CT= L2) weren't > >>>>>>>>>>>>> saved and restored during suspend/resume leading to L1 Subs= tates > >>>>>>>>>>>>> configuration being lost post-resume. > >>>>>>>>>>>>> > >>>>>>>>>>>>> Save the L1 Substates control registers so that the configu= ration is > >>>>>>>>>>>>> retained post-resume. > >>>>>>>>>>>>> > >>>>>>>>>>>>> Signed-off-by: Vidya Sagar > >>>>>>>>>>>>> Tested-by: Abhishek Sahu > >>>>>>>>>>>> > >>>>>>>>>>>> Hi Vidya, > >>>>>>>>>>>> > >>>>>>>>>>>> I tested this patch on kernel v5.19-rc6. > >>>>>>>>>>>> The test device is GL9755 card reader controller on Intel i5= -10210U RVP. > >>>>>>>>>>>> This patch can restore L1SS after suspend/resume. > >>>>>>>>>>>> > >>>>>>>>>>>> The test results are as follows: > >>>>>>>>>>>> > >>>>>>>>>>>> After Boot: > >>>>>>>>>>>> #lspci -d 17a0:9755 -vvv | grep -A5 "L1 PM Substates" > >>>>>>>>>>>> Capabilities: [110 v1] L1 PM Substates > >>>>>>>>>>>> L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM= _L1.2+ > >>>>>>>>>>>> ASPM_L1.1+ L1_PM_Substates+ > >>>>>>>>>>>> PortCommonModeRestoreTime=3D25= 5us > >>>>>>>>>>>> PortTPowerOnTime=3D3100us > >>>>>>>>>>>> L1SubCtl1: PCI-PM_L1.2+ PCI-PM_L1.1+ ASP= M_L1.2+ ASPM_L1.1+ > >>>>>>>>>>>> T_CommonMode=3D0us LTR1.2_Thr= eshold=3D3145728ns > >>>>>>>>>>>> L1SubCtl2: T_PwrOn=3D3100us > >>>>>>>>>>>> > >>>>>>>>>>>> > >>>>>>>>>>>> After suspend/resume without this patch. > >>>>>>>>>>>> #lspci -d 17a0:9755 -vvv | grep -A5 "L1 PM Substates" > >>>>>>>>>>>> Capabilities: [110 v1] L1 PM Substates > >>>>>>>>>>>> L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM= _L1.2+ > >>>>>>>>>>>> ASPM_L1.1+ L1_PM_Substates+ > >>>>>>>>>>>> PortCommonModeRestoreTime=3D25= 5us > >>>>>>>>>>>> PortTPowerOnTime=3D3100us > >>>>>>>>>>>> L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1- ASP= M_L1.2- ASPM_L1.1- > >>>>>>>>>>>> T_CommonMode=3D0us LTR1.2_Thr= eshold=3D0ns > >>>>>>>>>>>> L1SubCtl2: T_PwrOn=3D10us > >>>>>>>>>>>> > >>>>>>>>>>>> > >>>>>>>>>>>> After suspend/resume with this patch. > >>>>>>>>>>>> #lspci -d 17a0:9755 -vvv | grep -A5 "L1 PM Substates" > >>>>>>>>>>>> Capabilities: [110 v1] L1 PM Substates > >>>>>>>>>>>> L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM= _L1.2+ > >>>>>>>>>>>> ASPM_L1.1+ L1_PM_Substates+ > >>>>>>>>>>>> PortCommonModeRestoreTime=3D25= 5us > >>>>>>>>>>>> PortTPowerOnTime=3D3100us > >>>>>>>>>>>> L1SubCtl1: PCI-PM_L1.2+ PCI-PM_L1.1+ ASP= M_L1.2+ ASPM_L1.1+ > >>>>>>>>>>>> T_CommonMode=3D0us LTR1.2_Thr= eshold=3D3145728ns > >>>>>>>>>>>> L1SubCtl2: T_PwrOn=3D3100us > >>>>>>>>>>>> > >>>>>>>>>>>> > >>>>>>>>>>>> Tested-by: Ben Chuang > >>>>>>>>>>> > >>>>>>>>>>> Forgot to add mine: > >>>>>>>>>>> Tested-by: Kai-Heng Feng > >>>>>>>>>>> > >>>>>>>>>>>> > >>>>>>>>>>>> Best regards, > >>>>>>>>>>>> Ben Chuang > >>>>>>>>>>>> > >>>>>>>>>>>> > >>>>>>>>>>>>> --- > >>>>>>>>>>>>> Hi, > >>>>>>>>>>>>> Kenneth R. Crudup , Could you please verif= y this patch > >>>>>>>>>>>>> on your laptop (Dell XPS 13) one last time? > >>>>>>>>>>>>> IMHO, the regression observed on your laptop with an old ve= rsion of the patch > >>>>>>>>>>>>> could be due to a buggy old version BIOS in the laptop. > >>>>>>>>>>>>> > >>>>>>>>>>>>> Thanks, > >>>>>>>>>>>>> Vidya Sagar > >>>>>>>>>>>>> > >>>>>>>>>>>>> drivers/pci/pci.c | 7 +++++++ > >>>>>>>>>>>>> drivers/pci/pci.h | 4 ++++ > >>>>>>>>>>>>> drivers/pci/pcie/aspm.c | 44 +++++++++++++++++++++++++= ++++++++++++++++ > >>>>>>>>>>>>> 3 files changed, 55 insertions(+) > >>>>>>>>>>>>> > >>>>>>>>>>>>> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > >>>>>>>>>>>>> index cfaf40a540a8..aca05880aaa3 100644 > >>>>>>>>>>>>> --- a/drivers/pci/pci.c > >>>>>>>>>>>>> +++ b/drivers/pci/pci.c > >>>>>>>>>>>>> @@ -1667,6 +1667,7 @@ int pci_save_state(struct pci_dev *de= v) > >>>>>>>>>>>>> return i; > >>>>>>>>>>>>> > >>>>>>>>>>>>> pci_save_ltr_state(dev); > >>>>>>>>>>>>> + pci_save_aspm_l1ss_state(dev); > >>>>>>>>>>>>> pci_save_dpc_state(dev); > >>>>>>>>>>>>> pci_save_aer_state(dev); > >>>>>>>>>>>>> pci_save_ptm_state(dev); > >>>>>>>>>>>>> @@ -1773,6 +1774,7 @@ void pci_restore_state(struct pci_dev= *dev) > >>>>>>>>>>>>> * LTR itself (in the PCIe capability). > >>>>>>>>>>>>> */ > >>>>>>>>>>>>> pci_restore_ltr_state(dev); > >>>>>>>>>>>>> + pci_restore_aspm_l1ss_state(dev); > >>>>>>>>>>>>> > >>>>>>>>>>>>> pci_restore_pcie_state(dev); > >>>>>>>>>>>>> pci_restore_pasid_state(dev); > >>>>>>>>>>>>> @@ -3489,6 +3491,11 @@ void pci_allocate_cap_save_buffers(s= truct pci_dev *dev) > >>>>>>>>>>>>> if (error) > >>>>>>>>>>>>> pci_err(dev, "unable to allocate suspen= d buffer for LTR\n"); > >>>>>>>>>>>>> > >>>>>>>>>>>>> + error =3D pci_add_ext_cap_save_buffer(dev, PCI_EXT_= CAP_ID_L1SS, > >>>>>>>>>>>>> + 2 * sizeof(u32)= ); > >>>>>>>>>>>>> + if (error) > >>>>>>>>>>>>> + pci_err(dev, "unable to allocate suspend bu= ffer for ASPM-L1SS\n"); > >>>>>>>>>>>>> + > >>>>>>>>>>>>> pci_allocate_vc_save_buffers(dev); > >>>>>>>>>>>>> } > >>>>>>>>>>>>> > >>>>>>>>>>>>> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > >>>>>>>>>>>>> index e10cdec6c56e..92d8c92662a4 100644 > >>>>>>>>>>>>> --- a/drivers/pci/pci.h > >>>>>>>>>>>>> +++ b/drivers/pci/pci.h > >>>>>>>>>>>>> @@ -562,11 +562,15 @@ void pcie_aspm_init_link_state(struct= pci_dev *pdev); > >>>>>>>>>>>>> void pcie_aspm_exit_link_state(struct pci_dev *pdev); > >>>>>>>>>>>>> void pcie_aspm_pm_state_change(struct pci_dev *pdev); > >>>>>>>>>>>>> void pcie_aspm_powersave_config_link(struct pci_dev *p= dev); > >>>>>>>>>>>>> +void pci_save_aspm_l1ss_state(struct pci_dev *dev); > >>>>>>>>>>>>> +void pci_restore_aspm_l1ss_state(struct pci_dev *dev); > >>>>>>>>>>>>> #else > >>>>>>>>>>>>> static inline void pcie_aspm_init_link_state(struct pc= i_dev *pdev) { } > >>>>>>>>>>>>> static inline void pcie_aspm_exit_link_state(struct pc= i_dev *pdev) { } > >>>>>>>>>>>>> static inline void pcie_aspm_pm_state_change(struct pc= i_dev *pdev) { } > >>>>>>>>>>>>> static inline void pcie_aspm_powersave_config_link(str= uct pci_dev *pdev) { } > >>>>>>>>>>>>> +static inline void pci_save_aspm_l1ss_state(struct pci_dev= *dev) { } > >>>>>>>>>>>>> +static inline void pci_restore_aspm_l1ss_state(struct pci_= dev *dev) { } > >>>>>>>>>>>>> #endif > >>>>>>>>>>>>> > >>>>>>>>>>>>> #ifdef CONFIG_PCIE_ECRC > >>>>>>>>>>>>> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/asp= m.c > >>>>>>>>>>>>> index a96b7424c9bc..2c29fdd20059 100644 > >>>>>>>>>>>>> --- a/drivers/pci/pcie/aspm.c > >>>>>>>>>>>>> +++ b/drivers/pci/pcie/aspm.c > >>>>>>>>>>>>> @@ -726,6 +726,50 @@ static void pcie_config_aspm_l1ss(stru= ct pcie_link_state *link, u32 state) > >>>>>>>>>>>>> PCI_L1SS_CTL1_L1SS_MASK= , val); > >>>>>>>>>>>>> } > >>>>>>>>>>>>> > >>>>>>>>>>>>> +void pci_save_aspm_l1ss_state(struct pci_dev *dev) > >>>>>>>>>>>>> +{ > >>>>>>>>>>>>> + int aspm_l1ss; > >>>>>>>>>>>>> + struct pci_cap_saved_state *save_state; > >>>>>>>>>>>>> + u32 *cap; > >>>>>>>>>>>>> + > >>>>>>>>>>>>> + if (!pci_is_pcie(dev)) > >>>>>>>>>>>>> + return; > >>>>>>>>>>>>> + > >>>>>>>>>>>>> + aspm_l1ss =3D pci_find_ext_capability(dev, PCI_EXT_= CAP_ID_L1SS); > >>>>>>>>>>>>> + if (!aspm_l1ss) > >>>>>>>>>>>>> + return; > >>>>>>>>>>>>> + > >>>>>>>>>>>>> + save_state =3D pci_find_saved_ext_cap(dev, PCI_EXT_= CAP_ID_L1SS); > >>>>>>>>>>>>> + if (!save_state) > >>>>>>>>>>>>> + return; > >>>>>>>>>>>>> + > >>>>>>>>>>>>> + cap =3D (u32 *)&save_state->cap.data[0]; > >>>>>>>>>>>>> + pci_read_config_dword(dev, aspm_l1ss + PCI_L1SS_CTL= 2, cap++); > >>>>>>>>>>>>> + pci_read_config_dword(dev, aspm_l1ss + PCI_L1SS_CTL= 1, cap++); > >>>>>>>>>>>>> +} > >>>>>>>>>>>>> + > >>>>>>>>>>>>> +void pci_restore_aspm_l1ss_state(struct pci_dev *dev) > >>>>>>>>>>>>> +{ > >>>>>>>>>>>>> + int aspm_l1ss; > >>>>>>>>>>>>> + struct pci_cap_saved_state *save_state; > >>>>>>>>>>>>> + u32 *cap; > >>>>>>>>>>>>> + > >>>>>>>>>>>>> + if (!pci_is_pcie(dev)) > >>>>>>>>>>>>> + return; > >>>>>>>>>>>>> + > >>>>>>>>>>>>> + aspm_l1ss =3D pci_find_ext_capability(dev, PCI_EXT_= CAP_ID_L1SS); > >>>>>>>>>>>>> + if (!aspm_l1ss) > >>>>>>>>>>>>> + return; > >>>>>>>>>>>>> + > >>>>>>>>>>>>> + save_state =3D pci_find_saved_ext_cap(dev, PCI_EXT_= CAP_ID_L1SS); > >>>>>>>>>>>>> + if (!save_state) > >>>>>>>>>>>>> + return; > >>>>>>>>>>>>> + > >>>>>>>>>>>>> + cap =3D (u32 *)&save_state->cap.data[0]; > >>>>>>>>>>>>> + pci_write_config_dword(dev, aspm_l1ss + PCI_L1SS_CT= L2, *cap++); > >>>>>>>>>>>>> + pci_write_config_dword(dev, aspm_l1ss + PCI_L1SS_CT= L1, *cap++); > >>>>>>>>>>>>> +} > >>>>>>>>>>>>> + > >>>>>>>>>>>>> static void pcie_config_aspm_dev(struct pci_dev *pdev,= u32 val) > >>>>>>>>>>>>> { > >>>>>>>>>>>>> pcie_capability_clear_and_set_word(pdev, PCI_EX= P_LNKCTL, > >>>>>>>>>>>>> -- > >>>>>>>>>>>>> 2.17.1 > >>>>>>>>>>>>> > >>>>>>>>>> > >>>>>>>>>> Hi, > >>>>>>>>>> > >>>>>>>>>> With this patch (and also mentioned > >>>>>>>>>> https://lore.kernel.org/all/20220509073639.2048236-1-kai.heng.= feng@canonical.com/) > >>>>>>>>>> applied on 5.10 (chromeos-5.10) I am observing problems after > >>>>>>>>>> suspend/resume with my WiFi card - it looks like whole communi= cation > >>>>>>>>>> via PCI fails. Attaching logs (dmesg, lspci -vvv before suspen= d/resume > >>>>>>>>>> and after) https://gist.github.com/semihalf-majczak-lukasz/fb3= 6dfa2eff22911109dfb91ab0fc0e3 > >>>>>>>>>> > >>>>>>>>>> I played a little bit with this code and it looks like the > >>>>>>>>>> pci_write_config_dword() to the PCI_L1SS_CTL1 breaks it (don't= know > >>>>>>>>>> why, not a PCI expert). > >>>>>>>>> > >>>>>>>>> Thanks a lot for testing this! I'm not quite sure what to make= of the > >>>>>>>>> results since v5.10 is fairly old (Dec 2020) and I don't know w= hat > >>>>>>>>> other changes are in chromeos-5.10. > >>>>>>> > >>>>>>> Lukasz: I assume you are running this on Atlas and are seeing thi= s bug > >>>>>>> when uprev'ving it to 5.10 kernel. Can you please try it on a new= er > >>>>>>> Intel platform that have the latest upstream kernel running alrea= dy > >>>>>>> and see if this can be reproduced there too? > >>>>>>> Note that the wifi PCI device is different on newer Intel platfor= ms, > >>>>>>> but platform design is similar enough that I suspect we should se= e > >>>>>>> similar bug on those too. The other option is to try the latest > >>>>>>> ustream kernel on Atlas. Perhaps if we just care about wifi (and > >>>>>>> ignore bringing up the graphics stack and GUI), it may come up > >>>>>>> sufficiently enough to try this patch? > >>>>>>> > >>>>>>> Thanks, > >>>>>>> > >>>>>>> Rajat > >>>>>>> > >>>>>>> > >>>>>>>>> > >>>>>>>>> Random observations, no analysis below. This from your dmesg > >>>>>>>>> certainly looks like PCI reads failing and returning ~0: > >>>>>>>>> > >>>>>>>>> Timeout waiting for hardware access (CSR_GP_CNTRL 0xfffff= fff) > >>>>>>>>> iwlwifi 0000:01:00.0: 00000000: ffffffff ffffffff fffffff= f ffffffff ffffffff ffffffff ffffffff ffffffff > >>>>>>>>> iwlwifi 0000:01:00.0: Device gone - attempting removal > >>>>>>>>> Hardware became unavailable upon resume. This could be a = software issue prior to suspend or a hardware issue. > >>>>>>>>> > >>>>>>>>> And then we re-enumerate 01:00.0 and it looks like it may have = been > >>>>>>>>> reset (BAR is 0): > >>>>>>>>> > >>>>>>>>> pci 0000:01:00.0: [8086:095a] type 00 class 0x028000 > >>>>>>>>> pci 0000:01:00.0: reg 0x10: [mem 0x00000000-0x00001fff 64= bit] > >>>>>>>>> > >>>>>>>>> lspci diffs from before/after suspend: > >>>>>>>>> > >>>>>>>>> 00:14.0 PCI bridge: Intel Corporation Celeron N3350/Pent= ium N4200/Atom E3900 Series PCI Express Port B #1 (rev fb) (prog-if 00 [Nor= mal decode]) > >>>>>>>>> Bus: primary=3D00, secondary=3D01, subordinate=3D01, s= ec-latency=3D64 > >>>>>>>>> - DevSta: CorrErr- NonFatalErr+ FatalErr- U= nsupReq+ AuxPwr+ TransPend- > >>>>>>>>> + DevSta: CorrErr+ NonFatalErr- FatalErr- U= nsupReq- AuxPwr+ TransPend- > >>>>>>>>> - LnkCtl: ASPM L1 Enabled; RCB 64 bytes, Di= sabled- CommClk+ > >>>>>>>>> + LnkCtl: ASPM Disabled; RCB 64 bytes, Disa= bled- CommClk+ > >>>>>>>>> - LnkSta2: Current De-emphasis Level: -6dB,= EqualizationComplete- EqualizationPhase1- > >>>>>>>>> + LnkSta2: Current De-emphasis Level: -3.5d= B, EqualizationComplete- EqualizationPhase1- > >>>>>>>>> - Capabilities: [150 v0] Null > >>>>>>>>> - Capabilities: [200 v1] L1 PM Substates > >>>>>>>>> - L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM_= L1.2+ ASPM_L1.1+ L1_PM_Substates+ > >>>>>>>>> - PortCommonModeRestoreTime=3D40u= s PortTPowerOnTime=3D10us > >>>>>>>>> - L1SubCtl1: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM= _L1.2+ ASPM_L1.1+ > >>>>>>>>> - T_CommonMode=3D40us LTR1.2_Thr= eshold=3D98304ns > >>>>>>>>> - L1SubCtl2: T_PwrOn=3D60us > >>>>>>>>> > >>>>>>>>> The DevSta differences might be BIOS bugs, probably not relevan= t. > >>>>>>>>> Interesting that ASPM is disabled, maybe didn't get enabled aft= er > >>>>>>>>> re-enumerating 01:00.0? Strange that the L1 PM Substates capab= ility > >>>>>>>>> disappeared. > >>>>>>>>> > >>>>>>>>> 01:00.0 Network controller: Intel Corporation Wireless 7= 265 (rev 59) > >>>>>>>>> LnkCtl: ASPM L1 Enabled; RCB 64 bytes, Di= sabled- CommClk+ > >>>>>>>>> - ExtSynch- ClockPM+ AutWidDis- BWI= nt- AutBWInt- > >>>>>>>>> + ExtSynch- ClockPM- AutWidDis- BWI= nt- AutBWInt- > >>>>>>>>> Capabilities: [154 v1] L1 PM Substates > >>>>>>>>> L1SubCap: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM_= L1.2+ ASPM_L1.1+ L1_PM_Substates+ > >>>>>>>>> PortCommonModeRestoreTime=3D30u= s PortTPowerOnTime=3D60us > >>>>>>>>> - L1SubCtl1: PCI-PM_L1.2+ PCI-PM_L1.1+ ASPM= _L1.2+ ASPM_L1.1+ > >>>>>>>>> - T_CommonMode=3D0us LTR1.2_Thre= shold=3D98304ns > >>>>>>>>> + L1SubCtl1: PCI-PM_L1.2- PCI-PM_L1.1- ASPM= _L1.2- ASPM_L1.1- > >>>>>>>>> + T_CommonMode=3D0us LTR1.2_Thre= shold=3D0ns > >>>>>>>>> > >>>>>>>>> Dmesg claimed we reconfigured common clock config. Maybe ASPM = didn't > >>>>>>>>> get reinitialized after re-enumeration? Looks like we didn't r= estore > >>>>>>>>> L1SubCtl1. > >>>>>>>>> > >>>>>>>>> Bjorn > >>>>>>>>> > >>>>>> > >>>>>> Hi, > >>>>>> > >>>>>> Thank you all for the response and input! As Rajat mentioned I'm u= sing > >>>>>> chromebook - but not Atlas (Amberlake) - in this case it is Babyme= ga > >>>>>> (Apollolake) - I will try to load most recent kernel and give it = a > >>>>>> try once again. > >>>>>> > >>>>>> Best regards, > >>>>>> Lukasz > >>>>> > >>>>> Hi, > >>>>> > >>>>> I have applied this patch on top of v5.19-rc7 (chromeos) and I'= m > >>>>> still getting same results: > >>>>> https://gist.github.com/semihalf-majczak-lukasz/4b716704c21a3758d67= 11b2030ea34b9 > >>>>> > >>>>> Best regards, > >>>>> Lukasz > >>>>> > >>> Hi Vidya, > >>> > >>> Sorry for the long delay, I have retested your patch on top of > >>> linux-next/master (next-20220802) - the results for my device remain > >>> the same. > >>> Here are the logs (lspci -vvv before suspend, lspci -vvv after resume= and dmesg) > >>> https://gist.github.com/semihalf-majczak-lukasz/c7bfd811359f232780340= 56a8002b3ef > >>> Let me know if you need any more logs and/or tests. > >>> > >>> Best regards, > >>> Lukasz > >>> > > Hi Vidya, > > > > After your last email, I've re-tested my setup and (without your > > patch) the capability register also disappears - so it looks there is > > - in fact - some problem in my setup and your patch just brings it to > > the top as after resume tries to write to a register that is no longer > > present. I'm very sorry for the confusion here and I've not notice > > that at the very beginning. > > > > Best regards, > > Lukasz > >