From patchwork Tue Jun 29 03:49:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 108496 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5T3oXAc015402 for ; Tue, 29 Jun 2010 03:50:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752537Ab0F2DuH (ORCPT ); Mon, 28 Jun 2010 23:50:07 -0400 Received: from vms173005pub.verizon.net ([206.46.173.5]:47816 "EHLO vms173005pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751320Ab0F2DuF (ORCPT ); Mon, 28 Jun 2010 23:50:05 -0400 Received: from localhost.localdomain ([unknown] [64.140.212.33]) by vms173005.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0L4R000SCBZ0LW30@vms173005.mailsrvcs.net>; Mon, 28 Jun 2010 22:49:55 -0500 (CDT) Received: from localhost.localdomain (d975xbx2 [127.0.0.1]) by localhost.localdomain (8.14.2/8.14.2) with ESMTP id o5T3nl54019862; Mon, 28 Jun 2010 23:49:48 -0400 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.2/8.14.2/Submit) with ESMTP id o5T3nkfp019857; Mon, 28 Jun 2010 23:49:46 -0400 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Mon, 28 Jun 2010 23:49:46 -0400 (EDT) From: Len Brown X-X-Sender: lenb@localhost.localdomain To: James Bottomley Cc: Andi Kleen , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Subject: Re: 2.6.35-rc3 regression: IBM Maia system is unbootable [ACPI related?] In-reply-to: <1277141166.10998.79.camel@mulgrave.site> Message-id: References: <1277136189.10998.63.camel@mulgrave.site> <87pqzkqrzq.fsf@basil.nowhere.org> <1277138034.10998.69.camel@mulgrave.site> <1277139286.10998.72.camel@mulgrave.site> <1277141166.10998.79.camel@mulgrave.site> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 29 Jun 2010 03:50:34 +0000 (UTC) diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c index d97b8dc..18b3f14 100644 --- a/drivers/acpi/acpica/evxfevnt.c +++ b/drivers/acpi/acpica/evxfevnt.c @@ -70,6 +70,7 @@ acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info, acpi_status acpi_enable(void) { acpi_status status; + int retry; ACPI_FUNCTION_TRACE(acpi_enable); @@ -98,16 +99,18 @@ acpi_status acpi_enable(void) /* Sanity check that transition succeeded */ - if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) { - ACPI_ERROR((AE_INFO, - "Hardware did not enter ACPI mode")); - return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); + for (retry = 0; retry < 30000; ++retry) { + if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) { + if (retry != 0) + ACPI_WARNING((AE_INFO, + "Platform took > %d00 usec to enter ACPI mode", retry)); + return_ACPI_STATUS(AE_OK); + } + acpi_os_stall(100); /* 100 usec */ } - ACPI_DEBUG_PRINT((ACPI_DB_INIT, - "Transition to ACPI mode successful\n")); - - return_ACPI_STATUS(AE_OK); + ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode")); + return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); } ACPI_EXPORT_SYMBOL(acpi_enable)