From patchwork Wed Jul 24 20:02:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 2833003 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 86C64C0319 for ; Wed, 24 Jul 2013 19:52:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9528D203F4 for ; Wed, 24 Jul 2013 19:52:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0756203F7 for ; Wed, 24 Jul 2013 19:52:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753265Ab3GXTwc (ORCPT ); Wed, 24 Jul 2013 15:52:32 -0400 Received: from hydra.sisk.pl ([212.160.235.94]:38368 "EHLO hydra.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752775Ab3GXTwb (ORCPT ); Wed, 24 Jul 2013 15:52:31 -0400 Received: from vostro.rjw.lan (afde219.neoplus.adsl.tpnet.pl [95.49.82.219]) by hydra.sisk.pl (Postfix) with ESMTPSA id D4CAEE3DC5; Wed, 24 Jul 2013 21:47:54 +0200 (CEST) From: "Rafael J. Wysocki" To: Bjorn Helgaas Cc: Yinghai Lu , ACPI Devel Maling List , LKML , Linux PCI , Jiang Liu , Mika Westerberg , "Kirill A. Shutemov" Subject: Re: [PATCH 0/30] ACPI / hotplug / PCI: Major rework + Thunderbolt workarounds Date: Wed, 24 Jul 2013 22:02:35 +0200 Message-ID: <1393554.usuhpOuYgm@vostro.rjw.lan> User-Agent: KMail/4.9.5 (Linux/3.10.0+; KDE/4.9.5; x86_64; ; ) In-Reply-To: References: <26431283.HJCKsss0rt@vostro.rjw.lan> <6958813.eThhpoh5QO@vostro.rjw.lan> MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wednesday, July 24, 2013 10:06:01 AM Bjorn Helgaas wrote: > On Wed, Jul 24, 2013 at 6:58 AM, Rafael J. Wysocki wrote: > > On Tuesday, July 23, 2013 07:20:53 PM Yinghai Lu wrote: > >> On Tue, Jul 23, 2013 at 2:39 PM, Rafael J. Wysocki wrote: > > > > [...] > > > >> [ 102.631369] pci_host_bridge pci0000:00: freeing pci_host_bridge info > > > > By the way this looks fishy: > > > >> [ 102.633091] ACPI: Device does not support D3cold > > This and other printks in that function don't give any clue what > device is involved, even though we have an acpi_device pointer. It'd > be nice to fix that, too. As it turns out, I have that patch ready as well. Appended for completeness. Thanks, Rafael --- From: Rafael J. Wysocki Subject: ACPI / PM: Make messages in acpi_device_set_power() print device name Modify acpi_device_set_power() so that diagnostic messages printed by it to the kernel log always contain the name of the device to make it possible to identify the device if need be. Also replace printk(KERN_WARNING ) with dev_warn() everywhere in that function. Signed-off-by: Rafael J. Wysocki --- drivers/acpi/device_pm.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-pm/drivers/acpi/device_pm.c =================================================================== --- linux-pm.orig/drivers/acpi/device_pm.c +++ linux-pm/drivers/acpi/device_pm.c @@ -166,20 +166,20 @@ int acpi_device_set_power(struct acpi_de /* Make sure this is a valid target state */ if (state == device->power.state) { - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device is already at %s\n", + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] already in %s\n", + device->pnp.bus_id, acpi_power_state_string(state))); return 0; } if (!device->power.states[state].flags.valid) { - printk(KERN_WARNING PREFIX "Device does not support %s\n", - acpi_power_state_string(state)); + dev_warn(&device->dev, "Power state %s not supported\n", + acpi_power_state_string(state)); return -ENODEV; } if (device->parent && (state < device->parent->power.state)) { - printk(KERN_WARNING PREFIX - "Cannot set device to a higher-powered" - " state than parent\n"); + dev_warn(&device->dev, "Cannot transition to a higher-powered " + "state than parent\n"); return -ENODEV; } @@ -192,8 +192,8 @@ int acpi_device_set_power(struct acpi_de if (state < device->power.state && state != ACPI_STATE_D0 && device->power.state >= ACPI_STATE_D3_HOT) { - printk(KERN_WARNING PREFIX - "Cannot transition to non-D0 state from D3\n"); + dev_warn(&device->dev, + "Cannot transition to non-D0 state from D3\n"); return -ENODEV; } @@ -220,10 +220,8 @@ int acpi_device_set_power(struct acpi_de end: if (result) { - printk(KERN_WARNING PREFIX - "Device [%s] failed to transition to %s\n", - device->pnp.bus_id, - acpi_power_state_string(state)); + dev_warn(&device->dev, "Failed to change power state to %s\n", + acpi_power_state_string(state)); } else { device->power.state = state; ACPI_DEBUG_PRINT((ACPI_DB_INFO,