From patchwork Wed Dec 12 10:58:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 1865511 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 43D0E40079 for ; Wed, 12 Dec 2012 10:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753462Ab2LLK6q (ORCPT ); Wed, 12 Dec 2012 05:58:46 -0500 Received: from cantor2.suse.de ([195.135.220.15]:57419 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753267Ab2LLK6p (ORCPT ); Wed, 12 Dec 2012 05:58:45 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 1E2BFA398E; Wed, 12 Dec 2012 11:58:42 +0100 (CET) Date: Wed, 12 Dec 2012 11:58:41 +0100 Message-ID: From: Takashi Iwai To: "Rafael J. Wysocki" Cc: Borislav Petkov , lkml , Linux PM list Subject: Re: pci_pm_runtime_suspend(): azx_runtime_suspend+0x0/0x50 [snd_hda_intel] returns -11 In-Reply-To: <15066310.xXEWfqCuJc@vostro.rjw.lan> References: <20121211170315.GC28827@liondog.tnic> <2487425.bAQggRZzC4@vostro.rjw.lan> <20121211175508.GE28827@liondog.tnic> <15066310.xXEWfqCuJc@vostro.rjw.lan> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org At Wed, 12 Dec 2012 00:44:33 +0100, Rafael J. Wysocki wrote: > > On Tuesday, December 11, 2012 06:55:08 PM Borislav Petkov wrote: > > On Tue, Dec 11, 2012 at 06:48:23PM +0100, Rafael J. Wysocki wrote: > > > Boris, please send the output of "lspci -vvv' from that box. > > > > Attached. > > So the audio is a Root Complex Integrated Endpoind and there shouldn't be > any problems with it related to PCIe ports power management. > > It looks like azx_runtime_suspend() is new in 3.7 and it returns -EAGAIN > to indicate that it actually can't be suspended (if my understanding the > code is correct). However, it shouldn't do that, because that causes > the runtime PM core to repeat the attempts. It rather should implement > a .runtime_idle() callback returning an error code instead. Borislav, could you test the patch below? thanks, Takashi --- From: Takashi Iwai Subject: [PATCH] ALSA: hda - Move runtime PM check to runtime_idle callback The runtime_idle callback is the right place to check the suspend capability, but currently we do it wrongly in the runtime_suspend callback. This leads to a kernel error message like: pci_pm_runtime_suspend(): azx_runtime_suspend+0x0/0x50 [snd_hda_intel] returns -11 and the runtime PM core would even repeat the attempts. Reported-by: Borislav Petkov Cc: [v3.7] Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_intel.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1da8a5c..0f3d3db 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2691,10 +2691,6 @@ static int azx_runtime_suspend(struct device *dev) struct snd_card *card = dev_get_drvdata(dev); struct azx *chip = card->private_data; - if (!power_save_controller || - !(chip->driver_caps & AZX_DCAPS_PM_RUNTIME)) - return -EAGAIN; - azx_stop_chip(chip); azx_clear_irq_pending(chip); return 0; @@ -2709,12 +2705,25 @@ static int azx_runtime_resume(struct device *dev) azx_init_chip(chip, 1); return 0; } + +static int azx_runtime_idle(struct device *dev) +{ + struct snd_card *card = dev_get_drvdata(dev); + struct azx *chip = card->private_data; + + if (!power_save_controller || + !(chip->driver_caps & AZX_DCAPS_PM_RUNTIME)) + return -EBUSY; + + return 0; +} + #endif /* CONFIG_PM_RUNTIME */ #ifdef CONFIG_PM static const struct dev_pm_ops azx_pm = { SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) - SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, NULL) + SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle) }; #define AZX_PM_OPS &azx_pm