From patchwork Mon Jun 21 17:26:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 107221 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 o5LHQfKQ029873 for ; Mon, 21 Jun 2010 17:26:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758087Ab0FUR0K (ORCPT ); Mon, 21 Jun 2010 13:26:10 -0400 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:50464 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758016Ab0FUR0J (ORCPT ); Mon, 21 Jun 2010 13:26:09 -0400 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 2E2ED8EE0D8; Mon, 21 Jun 2010 10:26:09 -0700 (PDT) Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WLdQwZX8GQwD; Mon, 21 Jun 2010 10:26:09 -0700 (PDT) Received: from [192.168.10.224] (newmulgrave.ext.hansenpartnership.com [192.168.10.224]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 931138EE0D2; Mon, 21 Jun 2010 10:26:08 -0700 (PDT) Subject: Re: 2.6.35-rc3 regression: IBM Maia system is unbootable [ACPI related?] From: James Bottomley To: Andi Kleen Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org In-Reply-To: <1277139286.10998.72.camel@mulgrave.site> References: <1277136189.10998.63.camel@mulgrave.site> <87pqzkqrzq.fsf@basil.nowhere.org> <1277138034.10998.69.camel@mulgrave.site> <1277139286.10998.72.camel@mulgrave.site> Date: Mon, 21 Jun 2010 12:26:06 -0500 Message-ID: <1277141166.10998.79.camel@mulgrave.site> Mime-Version: 1.0 X-Mailer: Evolution 2.28.2 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]); Mon, 21 Jun 2010 17:26:56 +0000 (UTC) diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c index d5a5efc..bace473 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 = 0; ACPI_FUNCTION_TRACE(acpi_enable); @@ -98,6 +99,11 @@ acpi_status acpi_enable(void) /* Sanity check that transition succeeded */ + while (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI && retry < 3000) { + ACPI_ERROR((AE_INFO, + "Hardware did not enter ACPI mode, retry = %d", retry++)); + acpi_os_stall(1000); + } if (acpi_hw_get_mode() != ACPI_SYS_MODE_ACPI) { ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode"));