From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 28 Mar 2013 08:06:19 +0000 (+0100)
Subject: ACPI/APEI: revert "accept validly sized ERST on Intel systems only for now"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7075
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3920df230bbe9eb2fcb5147df97f7ab7ece22fc2;p=xen.git

ACPI/APEI: revert "accept validly sized ERST on Intel systems only for now"

With the recent two fixes to ERST handling, this should no longer be
necessary.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/drivers/acpi/apei/erst.c b/xen/drivers/acpi/apei/erst.c
index 6519042baa..98f73d9061 100644
--- a/xen/drivers/acpi/apei/erst.c
+++ b/xen/drivers/acpi/apei/erst.c
@@ -738,19 +738,6 @@ static int __init erst_check_table(struct acpi_table_erst *erst_tab)
 
 	switch (erst_tab->header_length) {
 	case sizeof(*erst_tab) - sizeof(erst_tab->header):
-#ifdef CONFIG_X86
-		/* XXX
-		 * While the rest of the ERST code appears to work on Intel
-		 * systems with properly sized tables, various AMD systems
-		 * appear to get hung (at boot time) by allowing this. Until
-		 * someone with access to suitable hardware can debug this,
-		 * disable the rest of the code by considering this case
-		 * invalid.
-		 */
-		if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
-			return -EINVAL;
-		/* fall through */
-#endif
 	/*
 	 * While invalid per specification, there are (early?) systems
 	 * indicating the full header size here, so accept that value too.