From patchwork Fri Jan 24 00:33:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 3532571 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 BFD07C02DC for ; Fri, 24 Jan 2014 00:19:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C77B4201BC for ; Fri, 24 Jan 2014 00:19:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 078D120114 for ; Fri, 24 Jan 2014 00:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755384AbaAXATJ (ORCPT ); Thu, 23 Jan 2014 19:19:09 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:53573 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752968AbaAXATI (ORCPT ); Thu, 23 Jan 2014 19:19:08 -0500 Received: from aeqt45.neoplus.adsl.tpnet.pl [79.191.175.45] (HELO vostro.rjw.lan) by serwer1319399.home.pl [79.96.170.134] with SMTP (IdeaSmtpServer v0.80) id 274e79b4ea924eed; Fri, 24 Jan 2014 01:19:05 +0100 From: "Rafael J. Wysocki" To: Bjorn Helgaas Cc: Yijing Wang , "Rafael J. Wysocki" , "linux-acpi@vger.kernel.org" , Daniel Vetter , Jani Nikula , Konrad Rzeszutek Wilk , David Airlie , intel-gfx@lists.freedesktop.org, DRI mailing list , "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , Dave Airlie , Hanjun Guo Subject: Re: [PATCH v5] ACPI: Fix acpi_evaluate_object() return value check Date: Fri, 24 Jan 2014 01:33:18 +0100 Message-ID: <38648196.Uh7omNjHIu@vostro.rjw.lan> User-Agent: KMail/4.11.4 (Linux/3.13.0-rc8+; KDE/4.11.4; x86_64; ; ) In-Reply-To: References: <1390448559-33896-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.5 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 Thursday, January 23, 2014 11:21:01 AM Bjorn Helgaas wrote: > On Wed, Jan 22, 2014 at 8:42 PM, Yijing Wang wrote: > > Since acpi_evaluate_object() returns acpi_status and not plain int, > > ACPI_FAILURE() should be used for checking its return value. Also > > add some detailed debug info when acpi_evaluate_object() failed. > > > > Reviewed-by: Jani Nikula > > Acked-by: Bjorn Helgaas > > Signed-off-by: Yijing Wang > > --- > > v4->v5: Add some detailed debug info for acpi_evaluate_object() > > failure suggested by Bjorn. > > v3->v4: Fix spell error, add Jani Nikula reviewed-by. > > v2->v3: Fix compile error pointed out by Hanjun. > > v1->v2: Add CC to related subsystem MAINTAINERS > > --- > > drivers/gpu/drm/i915/intel_acpi.c | 33 ++++++++++++++++------- > > drivers/gpu/drm/nouveau/core/subdev/mxm/base.c | 13 ++++++--- > > drivers/gpu/drm/nouveau/nouveau_acpi.c | 25 +++++++++++------- > > drivers/pci/pci-label.c | 10 +++++-- > > 4 files changed, 54 insertions(+), 27 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c > > index dfff090..e7b526b 100644 > > --- a/drivers/gpu/drm/i915/intel_acpi.c > > +++ b/drivers/gpu/drm/i915/intel_acpi.c > > @@ -31,11 +31,13 @@ static const u8 intel_dsm_guid[] = { > > static int intel_dsm(acpi_handle handle, int func) > > { > > struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; > > + struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL }; > > struct acpi_object_list input; > > union acpi_object params[4]; > > union acpi_object *obj; > > u32 result; > > - int ret = 0; > > + acpi_status status; > > + int ret; > > > > input.count = 4; > > input.pointer = params; > > @@ -50,10 +52,14 @@ static int intel_dsm(acpi_handle handle, int func) > > params[3].package.count = 0; > > params[3].package.elements = NULL; > > > > - ret = acpi_evaluate_object(handle, "_DSM", &input, &output); > > - if (ret) { > > - DRM_DEBUG_DRIVER("failed to evaluate _DSM: %d\n", ret); > > - return ret; > > + status = acpi_evaluate_object(handle, "_DSM", &input, &output); > > + if (ACPI_FAILURE(status)) { > > + acpi_get_name(handle, ACPI_FULL_PATHNAME, &string); > > + DRM_DEBUG_DRIVER( > > + "failed to evaluate _DSM for %s, exit status %u\n", > > + (char *)string.pointer, (unsigned int)status); > > + kfree(string.pointer); > > + return -EINVAL; > > I said "too bad there isn't an *easy* way" to include more > information. IMHO this is too ugly and error-prone to use > consistently. And if you are going to add more information, why did > you only do it for some of the calls and not others? > > I considered adding a %p extension to print the pathname; I don't know > if that's worthwhile or not. I think it would be ideal if we had a > struct device and could use dev_info(), and then a way to connect the > struct device with an ACPI path, like maybe a dmesg note when we > create the struct device corresponding to an ACPI Device node. Well, we can generally print something like that from pci_acpi_setup(). What about the below? Wouldn't it generate too much output on some systems? Rafael --- drivers/pci/pci-acpi.c | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/pci/pci-acpi.c =================================================================== --- linux-pm.orig/drivers/pci/pci-acpi.c +++ linux-pm/drivers/pci/pci-acpi.c @@ -330,6 +330,8 @@ static void pci_acpi_setup(struct device if (!adev) return; + acpi_handle_info(adev->handle, "bound to %s\n", dev_name(dev)); + pci_acpi_add_pm_notifier(adev, pci_dev); if (!adev->wakeup.flags.valid) return;