Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754073Ab3FOKFl (ORCPT ); Sat, 15 Jun 2013 06:05:41 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:60188 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753548Ab3FOKFi (ORCPT ); Sat, 15 Jun 2013 06:05:38 -0400 Message-ID: <51BC3C6B.9010908@gmail.com> Date: Sat, 15 Jun 2013 18:05:31 +0800 From: Jiang Liu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Yinghai Lu CC: Jiang Liu , "Rafael J . Wysocki" , Bjorn Helgaas , "Alexander E . Patrakov" , Greg Kroah-Hartman , Yijing Wang , ACPI Devel Maling List , "linux-pci@vger.kernel.org" , Linux Kernel Mailing List , "stable@vger.kernel.org" Subject: Re: [BUGFIX v2 1/4] ACPI, DOCK: initialize dock subsystem before scanning PCI root buses References: <1371238081-32260-1-git-send-email-jiang.liu@huawei.com> <1371238081-32260-2-git-send-email-jiang.liu@huawei.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3314 Lines: 94 On 06/15/2013 02:51 PM, Yinghai Lu wrote: > On Fri, Jun 14, 2013 at 12:27 PM, Jiang Liu wrote: >> Changeset "3b63aaa70e1 PCI: acpiphp: Do not use ACPI PCI subdriver >> mechanism" causes a regression which breaks ACPI dock support, >> please refer to https://bugzilla.kernel.org/show_bug.cgi?id=59501 >> >> The root cause is that changeset 3b63aaa70e1 changed the relative >> initialization order of ACPI dock subsystem and acpiphp driver, >> and acpiphp driver has dependency on ACPI dock subsystem's >> initialization result, so that acpiphp can't correctly detect ACPI >> dock stations now. >> >> On the other hand, ACPI dock is a built-in driver, so we could >> explicitly initialize it before the acpiphp driver is used. >> >> Signed-off-by: Jiang Liu >> Reported-by: Alexander E. Patrakov >> Tested-by: Alexander E. Patrakov >> Cc: "Rafael J. Wysocki" >> Cc: linux-acpi@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Cc: # 3.9+ >> --- >> drivers/acpi/dock.c | 7 +------ >> drivers/acpi/internal.h | 5 +++++ >> drivers/acpi/scan.c | 1 + >> 3 files changed, 7 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c >> index 4fdea38..02b0563 100644 >> --- a/drivers/acpi/dock.c >> +++ b/drivers/acpi/dock.c >> @@ -1033,7 +1033,7 @@ find_dock_and_bay(acpi_handle handle, u32 lvl, void *context, void **rv) >> return AE_OK; >> } >> >> -static int __init dock_init(void) >> +int __init acpi_dock_init(void) >> { >> if (acpi_disabled) >> return 0; >> @@ -1062,9 +1062,4 @@ static void __exit dock_exit(void) >> dock_remove(dock_station); >> } >> >> -/* >> - * Must be called before drivers of devices in dock, otherwise we can't know >> - * which devices are in a dock >> - */ >> -subsys_initcall(dock_init); >> module_exit(dock_exit); > > why not remove dock_exit? I have a pending patchset to clean up dock driver, Rafael suggested to focus on bugfix first, so I will send out the clean up patchset later. > >> diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h >> index 297cbf4..c610a76 100644 >> --- a/drivers/acpi/internal.h >> +++ b/drivers/acpi/internal.h >> @@ -40,6 +40,11 @@ void acpi_container_init(void); >> #else >> static inline void acpi_container_init(void) {} >> #endif >> +#ifdef CONFIG_ACPI_DOCK >> +void acpi_dock_init(void); >> +#else >> +static inline void acpi_dock_init(void) {} >> +#endif >> #ifdef CONFIG_ACPI_HOTPLUG_MEMORY >> void acpi_memory_hotplug_init(void); >> #else >> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c >> index 44225cb..4148163 100644 >> --- a/drivers/acpi/scan.c >> +++ b/drivers/acpi/scan.c >> @@ -2045,6 +2045,7 @@ int __init acpi_scan_init(void) >> acpi_lpss_init(); >> acpi_container_init(); >> acpi_memory_hotplug_init(); >> + acpi_dock_init(); >> >> mutex_lock(&acpi_scan_lock); >> /* >> -- >> 1.8.1.2 >> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/