From: David Shaohua Li <shaohua.li@intel.com>
Date: Wed, 21 Sep 2005 05:35:00 +0000 (-0400)
Subject: [ACPI] properly detect pmtimer on ASUS a8v motherboard
X-Git-Tag: Ubuntu-5.13.0-19.19~61628^2~3^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e6e87b4bfe3720b4308a8e669078d9be58bc9780;p=mirror_ubuntu-jammy-kernel.git

[ACPI] properly detect pmtimer on ASUS a8v motherboard

Handle FADT 2.0 xpmtmr address 0 case.

http://bugzilla.kernel.org/show_bug.cgi?id=5283

Signed-off-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 76b1135d401a..447fa9e33ffb 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
 			return 0;
 
 		pmtmr_ioport = fadt->xpm_tmr_blk.address;
+		/*
+		 * "X" fields are optional extensions to the original V1.0
+		 * fields, so we must selectively expand V1.0 fields if the
+		 * corresponding X field is zero.
+	 	 */
+		if (!pmtmr_ioport)
+			pmtmr_ioport = fadt->V1_pm_tmr_blk;
 	} else {
 		/* FADT rev. 1 */
 		pmtmr_ioport = fadt->V1_pm_tmr_blk;