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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 A6DB4C0650F for ; Mon, 5 Aug 2019 21:14:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 732B820B1F for ; Mon, 5 Aug 2019 21:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565039688; bh=lNsv9jHussUPiyLIAWUhViIxuDtGxjP/EQCrgV4ad6w=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=frDToP95MKzKi1pmPgfTLaP0Fooj3EFzoCTiXJgDELm8iMR8sWG5QRRpGIUHSi7RC NF+/07JY2Max79HZpqnKPvz9IX5QDyXZxe6PXXo7JZ4dwIyxbH+3SnQkVWWfROj7Vp ygAuBTeYUz1ZECIldmJE04ZxhlJ50baifA5mS0dw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730036AbfHEVOr (ORCPT ); Mon, 5 Aug 2019 17:14:47 -0400 Received: from mail-ot1-f67.google.com ([209.85.210.67]:35229 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729383AbfHEVOr (ORCPT ); Mon, 5 Aug 2019 17:14:47 -0400 Received: by mail-ot1-f67.google.com with SMTP id j19so10642333otq.2; Mon, 05 Aug 2019 14:14:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=K81VJiYZHz48k5xpZL9JVC+H5GcFEAdkpsb0gf8wQuM=; b=SMtfl8tVA71nFqJGEm+lxR2HMNcCzgcHWuldb5bGXwb1iSPuM9If0bbkc5FdTbxrJN 6FjTMYRWrqnaWeLK4Mp9UgqiEiUrwxWBRbOw50IvEvKF1t2Gq7Rf3k8Kdl/1wDuKkimF 0P+9eKadA4orH2fNnrOb98xaCxkWiW23rx+xH7unCaLHhG7y9iSa/6/OeRLB3EsfJzmJ dqhylpAPXI/73Web3YcSIHUVqQ2g8OQP0ayiEj7Ht9osqYNHY1LpjvfFq0WCd1hw2pht orTM+7SSVHXm4Hv9J8gr1Vm1hOGcWfzz6yzYkxQUA6oaTH05Mgk59pPcw4eZHAkQ73av tFww== X-Gm-Message-State: APjAAAVQ+yjn7FqlrtILypAl4tRRBMLFDjHWqe1WYVIZzS0J9xLIkbx+ KMvD80fx/wFNDzaf9L17oyKMx24IBUHoxmZR2h0= X-Google-Smtp-Source: APXvYqxAOvq6brWaQzk/LEyKzX+snTQA2yXv4SbP05AZTRriz+D8QJvlIqBpei/jWnH2T4tFiMx8z/ExVaTjVwvcCJM= X-Received: by 2002:a05:6830:8a:: with SMTP id a10mr2078732oto.167.1565039686381; Mon, 05 Aug 2019 14:14:46 -0700 (PDT) MIME-Version: 1.0 References: <20190805205214.194981-1-helgaas@kernel.org> <20190805205214.194981-6-helgaas@kernel.org> In-Reply-To: <20190805205214.194981-6-helgaas@kernel.org> From: "Rafael J. Wysocki" Date: Mon, 5 Aug 2019 23:14:34 +0200 Message-ID: Subject: Re: [PATCH 5/5] PCI / PM: Decode D3cold power state correctly To: Bjorn Helgaas Cc: Linux PCI , Lorenzo Pieralisi , Keith Busch , Greg Kroah-Hartman , "Rafael J . Wysocki" , Mika Westerberg , Linux PM , Linux Kernel Mailing List , Bjorn Helgaas Content-Type: text/plain; charset="UTF-8" Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Mon, Aug 5, 2019 at 10:52 PM Bjorn Helgaas wrote: > > From: Bjorn Helgaas > > Use pci_power_name() to print pci_power_t correctly. This changes: > > "state 0" or "D0" to "D0" > "state 1" or "D1" to "D1" > "state 2" or "D2" to "D2" > "state 3" or "D3" to "D3hot" > "state 4" or "D4" to "D3cold" > > Changes dmesg logging only, no other functional change intended. > > Signed-off-by: Bjorn Helgaas Reviewed-by: Rafael J. Wysocki > --- > drivers/pci/pci.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index d8686e3cd5eb..17ae2615ac11 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -834,14 +834,16 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state) > return -EINVAL; > > /* > - * Validate current state: > - * Can enter D0 from any state, but if we can only go deeper > - * to sleep if we're already in a low power state > + * Validate transition: We can enter D0 from any state, but if > + * we're already in a low-power state, we can only go deeper. E.g., > + * we can go from D1 to D3, but we can't go directly from D3 to D1; > + * we'd have to go from D3 to D0, then to D1. > */ > if (state != PCI_D0 && dev->current_state <= PCI_D3cold > && dev->current_state > state) { > - pci_err(dev, "invalid power transition (from state %d to %d)\n", > - dev->current_state, state); > + pci_err(dev, "invalid power transition (from %s to %s)\n", > + pci_power_name(dev->current_state), > + pci_power_name(state)); > return -EINVAL; > } > > @@ -896,8 +898,8 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state) > pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); > dev->current_state = pci_power_state(pmcsr); > if (dev->current_state != state && printk_ratelimit()) > - pci_info(dev, "Refused to change power state, currently in D%d\n", > - dev->current_state); > + pci_info(dev, "refused to change power state (currently %s)\n", > + pci_power_name(dev->current_state)); > > /* > * According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT > -- > 2.22.0.770.g0f2c4a37fd-goog >