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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D313C433EF for ; Fri, 27 May 2022 22:51:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237945AbiE0Wvx (ORCPT ); Fri, 27 May 2022 18:51:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233958AbiE0Wvw (ORCPT ); Fri, 27 May 2022 18:51:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51FA6122B42; Fri, 27 May 2022 15:51:51 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E1AE361976; Fri, 27 May 2022 22:51:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1168DC385A9; Fri, 27 May 2022 22:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653691910; bh=kcrmwbVJgmeQpC7VwIkR0rPWbm7QoHlUYM7+KxMHgHQ=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=sviv7ZOuXxq48ZDGWG709TP7cQu2vfO9hHSEyZ61ZaxuXmoX0q3d39mgNKcfKRE/X 7PkI8AtbpIJbcllaJjkcME/xOVPYzJpx0f6zkz5CmglCGBNllZv/pNY5edxiUM2kmE Dpn6h1O3FJqm71w4GGmPJRRvcOoDHViQab54GbJt17duNgr4y2nfUX1/LMxWX6AJIe K4Nf/9+8mXGNiiomjxo0wyXHFf+yCHlUhljpimUvsJIF01ZRcI2ymnwHD6E4Ks+MEl TWF3V7qYMaQxCqWPxff6sTvC+mwRkux+6fXAc0oPwQKzFERGmNuuTHGNUIhVDkKMBT hUh6OKw+QhpbQ== Date: Fri, 27 May 2022 17:51:48 -0500 From: Bjorn Helgaas To: "Rafael J. Wysocki" Cc: "Rafael J. Wysocki" , Linux PCI , LKML , Linux PM , Mika Westerberg , Nathan Chancellor , Anders Roxell Subject: Re: [PATCH v1 06/11] PCI/PM: Write 0 to PMCSR in pci_power_up() in all cases Message-ID: <20220527225148.GA511276@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Fri, May 27, 2022 at 08:52:17PM +0200, Rafael J. Wysocki wrote: > On Thu, May 26, 2022 at 9:46 PM Bjorn Helgaas wrote: > > > > On Thu, May 26, 2022 at 11:54:22AM -0500, Bjorn Helgaas wrote: > > > On Thu, May 05, 2022 at 08:10:43PM +0200, Rafael J. Wysocki wrote: > > > > From: Rafael J. Wysocki > > > > > > > > Make pci_power_up() write 0 to the device's PCI_PM_CTRL register in > > > > order to put it into D0 regardless of the power state returned by > > > > the previous read from that register which should not matter. > > > > > > > > Signed-off-by: Rafael J. Wysocki > > > > --- > > > > drivers/pci/pci.c | 11 +++-------- > > > > 1 file changed, 3 insertions(+), 8 deletions(-) > > > > > > > > Index: linux-pm/drivers/pci/pci.c > > > > =================================================================== > > > > --- linux-pm.orig/drivers/pci/pci.c > > > > +++ linux-pm/drivers/pci/pci.c > > > > @@ -1230,15 +1230,10 @@ int pci_power_up(struct pci_dev *dev) > > > > } > > > > > > > > /* > > > > - * If we're (effectively) in D3, force entire word to 0. This doesn't > > > > - * affect PME_Status, disables PME_En, and sets PowerState to 0. > > > > + * Force the entire word to 0. This doesn't affect PME_Status, disables > > > > + * PME_En, and sets PowerState to 0. > > > > */ > > > > - if (state == PCI_D3hot) > > > > - pmcsr = 0; > > > > - else > > > > - pmcsr &= ~PCI_PM_CTRL_STATE_MASK; > > > > - > > > > - pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, pmcsr); > > > > + pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, 0); > > > > > > Can you reassure me why this is safe and useful? > > > > > > This is a 16-bit write that includes (PCIe r6.0, sec 7.5.2.2): > > > > > > 0x0003 PowerState RW > > > 0x0004 RsvdP > > > 0x0008 No_Soft_Reset RO > > > 0x00f0 RsvdP > > > 0x0100 PME_En RW/RWS > > > 0x1e00 Data_Select RW, VF ROZ > > > 0x6000 Data_Scale RO, VF ROZ > > > 0x8000 PME_Status RW1CS > > > > > > We intend to set PowerState to 0 (D0), apparently intend to clear > > > PME_En, and PME_Status is "write 1 to clear" to writing 0 does > > > nothing, so those look OK. > > > > > > But the RsvdP fields are reserved for future RW bits and should be > > > preserved, and it looks like clearing Data_Select could potentially > > > break the Data Register power consumption reporting (which I don't > > > think we support today). > > > > > > It seems like maybe we should do this instead: > > > > > > pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, > > > pmcsr & ~PCI_PM_CTRL_STATE_MASK) > > > > > > to just unconditionally clear PowerState? > > > > Or I guess this, since we want to clear PME_En as well? > > > > pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, pmcsr & > > ~(PCI_PM_CTRL_STATE_MASK | PCI_PM_CTRL_PME_ENABLE)); > > Yes. > > Also, this patch actually only makes a difference if the device is > going into D0 from D1 or D2, because we have always written 0 to the > PMCSR during transitions from D3hot. > > It is inconsistent and confusing to do different things depending on > the initial power state here and the code is simpler when 0 is written > regardless. I agree that depending on the initial power state is confusing (it confused me :)). What would you think of replacing this patch with the one below? commit defde70748bc ("PCI/PM: Always put device in D0 and disable PME in pci_power_up()") Author: Bjorn Helgaas Date: Fri May 27 17:45:07 2022 -0500 PCI/PM: Always put device in D0 and disable PME in pci_power_up() Unconditionally put the device in PCI_D0 and disable PME generation in pci_power_up(), regardless of the power state returned by the previous read from PCI_PM_CTRL, which should not matter. Based-on-patch-by: Rafael J. Wysocki Link: https://lore.kernel.org/r/5748066.MhkbZ0Pkbq@kreacher Signed-off-by: Bjorn Helgaas diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index a5b93f85377a..8e42a9dc1944 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1229,14 +1229,9 @@ int pci_power_up(struct pci_dev *dev) goto end; } - /* - * If we're (effectively) in D3, force entire word to 0. This doesn't - * affect PME_Status, disables PME_En, and sets PowerState to 0. - */ - if (state == PCI_D3hot) - pmcsr = 0; - else - pmcsr &= ~PCI_PM_CTRL_STATE_MASK; + /* Set PowerState to 0 (PCI_D0) and disable PME generation */ + pmcsr &= ~PCI_PM_CTRL_STATE_MASK; + pmcsr &= ~PCI_PM_CTRL_PME_ENABLE; pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, pmcsr);