Return-Path: <linux-kernel-owner+w=401wt.eu-S1755079AbZLVUqN@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755079AbZLVUqN (ORCPT <rfc822;w@1wt.eu>);
	Tue, 22 Dec 2009 15:46:13 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755054AbZLVUqK
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Tue, 22 Dec 2009 15:46:10 -0500
Received: from hera.kernel.org ([140.211.167.34]:59873 "EHLO hera.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752123AbZLVUqF (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 22 Dec 2009 15:46:05 -0500
Message-ID: <4B312FA9.1020301@kernel.org>
Date: Tue, 22 Dec 2009 12:44:25 -0800
From: Yinghai Lu <yinghai@kernel.org>
User-Agent: Thunderbird 2.0.0.23 (X11/20090817)
MIME-Version: 1.0
To: Len Brown <lenb@kernel.org>
CC: Shaohua Li <shaohua.li@intel.com>, Ingo Molnar <mingo@elte.hu>,
       "Barnes, Jesse" <jesse.barnes@intel.com>,
       Linus Torvalds <torvalds@linux-foundation.org>,
       Andrew Morton <akpm@linux-foundation.org>, linux-acpi@vger.kernel.org,
       Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
       linux-pci@vger.kernel.org
Subject: Re: [git pull request] ACPI and driver patches for 2.6.33.merge
References: <alpine.LFD.2.00.0912161453480.10371@localhost.localdomain> <86802c440912171728s27dd7108k85a0f1563660c95b@mail.gmail.com> <alpine.LFD.2.00.0912212107560.5520@localhost.localdomain> <4B3035B0.9030303@kernel.org> <alpine.LFD.2.00.0912220253080.7435@localhost.localdomain> <4B307C4D.501@kernel.org> <alpine.LFD.2.00.0912221440440.5153@localhost.localdomain> <4B312F09.5020602@kernel.org>
In-Reply-To: <4B312F09.5020602@kernel.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2021
Lines: 58

Yinghai Lu wrote:
> Len Brown wrote:
>> On Mon, 21 Dec 2009, Yinghai Lu wrote:
>>
>>> Len Brown wrote:
>>>> Does 3563ff964fdc36358cef0330936fdac28e65142a work or fail on your system? 
>>>> I didn't ask about reverting it, I asked if it works or fails.
>>> i don't know.
>>>
>>> anything i should search in the bootlog?
>> Please check out a branch at the commit identified above
>> and tell us if the following issue:
>>
>> "it seems these three patches broke the _OSC on my intel new systems."
>>
>> "revert them fix the problem with AER and pciehp and etc"
>>
>> is present or absent on that branch.
>>
>> If the answer is yes, when stock 2.6.32 works, then the 3 patches
>> between that commit and 2.6.32 are at fault.  If the answer is no,
>> yet reverting those patches helps top of tree, then the issue must
>> be a merge conflict with other changes in 2.6.33.
> 
> 
> 8aedf8a6ae98d5d4df3254b6afb7e4432d9d8600
> the one just before acpi release was merged to mainline
> <fter pci merge...>
> 
> it works.
> 

with following change, AER could be loaded, but pciehp still can not be loaded.

---
 drivers/acpi/bus.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/acpi/bus.c
===================================================================
--- linux-2.6.orig/drivers/acpi/bus.c
+++ linux-2.6/drivers/acpi/bus.c
@@ -424,7 +424,9 @@ acpi_status acpi_run_osc(acpi_handle han
 		return status;
 
 	/* return buffer should have the same length as cap buffer */
-	if (context->ret.length != context->cap.length)
+	printk(KERN_INFO "run_acpi_osc: ret length %d cap length %d\n",
+			 context->ret.length, context->cap.length);
+	if (context->ret.length < context->cap.length)
 		return AE_NULL_OBJECT;
 
 	out_obj = context->ret.pointer;
--
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/