From patchwork Thu Dec 13 00:11:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 1871041 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 3AF6E3FC71 for ; Thu, 13 Dec 2012 00:07:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755155Ab2LMAG6 (ORCPT ); Wed, 12 Dec 2012 19:06:58 -0500 Received: from hydra.sisk.pl ([212.160.235.94]:59248 "EHLO hydra.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754276Ab2LMAG5 (ORCPT ); Wed, 12 Dec 2012 19:06:57 -0500 Received: from vostro.rjw.lan (afau2.neoplus.adsl.tpnet.pl [95.49.20.2]) by hydra.sisk.pl (Postfix) with ESMTPSA id 90A10E3EB9; Thu, 13 Dec 2012 01:08:22 +0100 (CET) From: "Rafael J. Wysocki" To: Bjorn Helgaas Cc: LKML , ACPI Devel Maling List , linux-pci@vger.kernel.org, Yinghai Lu , Toshi Kani , Myron Stowe Subject: [Update][PATCH 3/6] ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different Date: Thu, 13 Dec 2012 01:11:58 +0100 Message-ID: <2379293.XqS6hlitES@vostro.rjw.lan> User-Agent: KMail/4.9.3 (Linux/3.7.0; KDE/4.9.3; x86_64; ; ) In-Reply-To: <1693581.lT8eSoGRfL@vostro.rjw.lan> References: <8498184.VilrUmatxI@vostro.rjw.lan> <1693581.lT8eSoGRfL@vostro.rjw.lan> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Rafael J. Wysocki Subject: ACPI: Make acpi_bus_add() and acpi_bus_start() visibly different The current ACPI namespace scanning code suggests that acpi_bus_add() and acpi_bus_start() share some code. In fact, however, they are completely different code paths (except for the initial checks), so refactor the code to make that distinction visibly clear. Signed-off-by: Rafael J. Wysocki --- Update is needed, because of a potential bug found in [1/6], as described here: https://lkml.org/lkml/2012/12/12/460 Thanks, Rafael --- drivers/acpi/scan.c | 66 ++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 30 deletions(-) -- 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/drivers/acpi/scan.c =================================================================== --- linux.orig/drivers/acpi/scan.c +++ linux/drivers/acpi/scan.c @@ -1626,10 +1626,9 @@ static acpi_status acpi_bus_check_add(ac return AE_OK; } -static acpi_status acpi_bus_probe_start(acpi_handle handle, u32 lvl, - void *context, void **not_used) +static acpi_status acpi_bus_match_device(acpi_handle handle, u32 lvl, + void *not_used, void **ret_not_used) { - struct acpi_bus_ops *ops = context; acpi_status status = AE_OK; struct acpi_device *device; unsigned long long sta_not_used; @@ -1645,18 +1644,13 @@ static acpi_status acpi_bus_probe_start( if (acpi_bus_get_device(handle, &device)) return AE_CTRL_DEPTH; - if (ops->acpi_op_add) { - if (!acpi_match_device_ids(device, acpi_platform_device_ids)) { - /* This is a known good platform device. */ - acpi_create_platform_device(device); - } else { - int ret = device_attach(&device->dev); - acpi_hot_add_bind(device); - if (ret) - status = AE_CTRL_DEPTH; - } - } else if (ops->acpi_op_start) { - if (ACPI_FAILURE(acpi_start_single_object(device))) + if (!acpi_match_device_ids(device, acpi_platform_device_ids)) { + /* This is a known good platform device. */ + acpi_create_platform_device(device); + } else { + int ret = device_attach(&device->dev); + acpi_hot_add_bind(device); + if (ret) status = AE_CTRL_DEPTH; } return status; @@ -1679,7 +1673,7 @@ static int acpi_bus_scan(acpi_handle han acpi_bus_check_add, NULL, ops, &device); if (device) acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX, - acpi_bus_probe_start, NULL, ops, NULL); + acpi_bus_match_device, NULL, NULL, NULL); else ret = -ENODEV; @@ -1706,31 +1700,43 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent, acpi_handle handle, int type) { - struct acpi_bus_ops ops; - - memset(&ops, 0, sizeof(ops)); - ops.acpi_op_add = 1; + struct acpi_bus_ops ops = { .acpi_op_add = 1, }; return acpi_bus_scan(handle, &ops, child); } EXPORT_SYMBOL(acpi_bus_add); -int acpi_bus_start(struct acpi_device *device) +static acpi_status acpi_bus_start_device(acpi_handle handle, u32 lvl, + void *not_used, void **ret_not_used) { - struct acpi_bus_ops ops; - int result; + struct acpi_device *device; + unsigned long long sta_not_used; + int type_not_used; + acpi_status status; - if (!device) - return -EINVAL; + /* + * Ignore errors ignored by acpi_bus_check_add() to avoid terminating + * namespace walks prematurely. + */ + if (acpi_bus_type_and_status(handle, &type_not_used, &sta_not_used)) + return AE_OK; - memset(&ops, 0, sizeof(ops)); - ops.acpi_op_start = 1; + if (acpi_bus_get_device(handle, &device)) + return AE_CTRL_DEPTH; - result = acpi_bus_scan(device->handle, &ops, NULL); + status = acpi_start_single_object(device); + return ACPI_SUCCESS(status) ? status : AE_CTRL_DEPTH; +} - acpi_update_all_gpes(); +int acpi_bus_start(struct acpi_device *device) +{ + if (!device) + return -EINVAL; - return result; + acpi_walk_namespace(ACPI_TYPE_ANY, device->handle, ACPI_UINT32_MAX, + acpi_bus_start_device, NULL, NULL, NULL); + acpi_update_all_gpes(); + return 0; } EXPORT_SYMBOL(acpi_bus_start);