Re: [git pull request] ACPI and driver patches for 2.6.33.merge

Yinghai Lu
2009-12-22T20:46:13Z

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;