Len Brown (ACPI) maintainer pointed me to the final fix for this in Linus' BK tree. I'll add it to out tree.