From cae174c30724a4e8e1cda5fe853bfaa38ed27bb8 Mon Sep 17 00:00:00 2001
From: Randy Lin <randy.lin@intel.com>
Date: Wed, 11 May 2022 16:48:44 +0800
Subject: [PATCH] [EHL] Fix ACPI error

Sync from EHL BIOS.

Error: ACPI BIOS Error (bug): AE_AML_BUFFER_LIMIT, Field [IOF2] at
bit offset/length 712/16 exceeds size of target Buffer (664 bits)

Signed-off-by: Randy Lin <randy.lin@intel.com>
---
 .../AcpiTables/Dsdt/Connectivity.asl          | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/Platform/ElkhartlakeBoardPkg/AcpiTables/Dsdt/Connectivity.asl b/Platform/ElkhartlakeBoardPkg/AcpiTables/Dsdt/Connectivity.asl
index 018a084e..5e69e8a6 100644
--- a/Platform/ElkhartlakeBoardPkg/AcpiTables/Dsdt/Connectivity.asl
+++ b/Platform/ElkhartlakeBoardPkg/AcpiTables/Dsdt/Connectivity.asl
@@ -1,7 +1,7 @@
 /** @file
   Intel ACPI Sample Code for connectivity modules
 
-  Copyright (c) 2016 - 2021, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -57,46 +57,26 @@ Scope(\_SB.PC00.UA00)
       SHPO(GBTK,1) // configure gpio pad in gpio driver mode; Bluetooth RF-Kill
     }
 
-    Method(_CRS, 0x0, Serialized){
+    Method(_CRS, 0x0, NotSerialized){
       Name(SBFG, ResourceTemplate (){
         UARTSerialBus(115200,,,0xc0,,,FlowControlHardware,32,32,"\\_SB.PC00.UA00" )
         GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly, "\\_SB.GPI0",,,KIL1 ) {0}
         GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullDefault, 0x0000, "\\_SB.GPI0", 0x00, ResourceConsumer, INT1) { 0 }
       })
-      If(LEqual(\NGPS,1)) {
-        CreateWordField (SBFG, Add(INT1, ACPI_GPIO_CONN_DESC_OFFSET_NAME), IOF1)
-        CreateField (SBFG, Multiply (Add (IOF1, INT1), 8), 72, ICS1)
-        CreateWordField (SBFG, Add(KIL1, ACPI_GPIO_CONN_DESC_OFFSET_NAME), KOF1)
-        CreateField (SBFG, Multiply (Add (KOF1, KIL1), 8), 72, KCS1)
-      }
       CreateWordField(SBFG,INT1._PIN,INT3)
       CreateWordField(SBFG,KIL1._PIN,KIL3)
       Store(GNUM(GBTI),INT3)
       Store(GNUM(GBTK),KIL3)
-      If(LEqual(\NGPS,1)) {
-        Concatenate ("\\_SB.GPI", ToDecimalString(GCOM(GBTI)), ICS1)
-        Concatenate ("\\_SB.GPI", ToDecimalString(GCOM(GBTK)), KCS1)
-      }
 
       Name(SBFI, ResourceTemplate (){
         UARTSerialBus(115200,,,0xc0,,,FlowControlHardware,32,32,"\\_SB.PC00.UA00" )
         GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly, "\\_SB.GPI0",,,KIL2 ) {0}
         Interrupt(ResourceConsumer, Edge, ActiveLow, ExclusiveAndWake,,,INT2 ) {0}
       })
-      If(LEqual(\NGPS,1)) {
-        CreateWordField (SBFI, Add(INT2, ACPI_GPIO_CONN_DESC_OFFSET_NAME), IOF2)
-        CreateField (SBFI, Multiply (Add (IOF2, INT2), 8), 72, ICS2)
-        CreateWordField (SBFI, Add(KIL2, ACPI_GPIO_CONN_DESC_OFFSET_NAME), KOF2)
-        CreateField (SBFI, Multiply (Add (KOF2, KIL2), 8), 72, KCS2)
-      }
       CreateDWordField(SBFI,INT2._INT,INT4)
       CreateWordField(SBFI,KIL2._PIN,KIL4)
       Store(INUM(GBTI),INT4)
       Store(GNUM(GBTK),KIL4)
-      If(LEqual(\NGPS,1)) {
-        Concatenate ("\\_SB.GPI", ToDecimalString(GCOM(GBTI)), ICS2)
-        Concatenate ("\\_SB.GPI", ToDecimalString(GCOM(GBTK)), KCS2)
-      }
 
       If(LEqual(SDM9,0)) {
         Return (SBFG)