From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [PATCH] ACPI: don't attempt to use hest_tab unless !acpi_pci_disabled Date: Sat, 15 Jan 2011 14:01:18 +0100 Message-ID: <201101151401.18846.rjw@sisk.pl> References: <20110114181620.188e7a62@queued.net> <20110114235437.669f820d@queued.net> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from ogre.sisk.pl ([217.79.144.158]:38349 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752911Ab1AONCI (ORCPT ); Sat, 15 Jan 2011 08:02:08 -0500 In-Reply-To: <20110114235437.669f820d@queued.net> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Andres Salomon Cc: Len Brown , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Huang Ying , Jesse Barnes On Saturday, January 15, 2011, Andres Salomon wrote: > On Fri, 14 Jan 2011 23:24:27 -0500 (EST) > Len Brown wrote: > > [...] > > > This patch causes apei_hest_parse to check both hest_disabled and > > > acpi_pci_disabled before continuing. With it, the XO-1 boots > > > properly. > > > > The X0-1 has no ACPI support, and thus you are running > > with acpi_disabled=1, yes? > > The XO-1 has no ACPI support, but ACPI support is enabled in the kernel > (as the XO-1.5 does have ACPI support, and the same kernel is used > between both) and I'm not passing any arguments to the kernel regarding > it. The kernel's ACPI code detects that it's not there and disables it > (the kernel message that's seen is "ACPI: Interpreter disabled.") > > This is what sets apci_pci_disabled to 1; I'm not doing it manually. Hmm. Does the appended patch help instead? Rafael --- drivers/acpi/pci_root.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6/drivers/acpi/pci_root.c =================================================================== --- linux-2.6.orig/drivers/acpi/pci_root.c +++ linux-2.6/drivers/acpi/pci_root.c @@ -631,11 +631,11 @@ static int acpi_pci_root_remove(struct a static int __init acpi_pci_root_init(void) { + acpi_hest_init(); + if (acpi_pci_disabled) return 0; - acpi_hest_init(); - pci_acpi_crs_quirks(); if (acpi_bus_register_driver(&acpi_pci_root_driver) < 0) return -ENODEV;