soc/intel/{apl,cnl,icl,skl,tgl}: Clean up SA ASL code

List of changes in this patch

1. Remove unused variables
2. Make use of absolute path
3. Define macros and use inside SA ASL
4. Rearrange code in nothbridge.asl to move MCRS object under _CRS

Change-Id: Id74269ec5a96b087562ccdf2141233db5585ae59
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38154
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lance Zhao <lance.zhao@gmail.com>

1 files changed, 191 insertions, 205 deletions

diff --git a/src/soc/intel/cannonlake/acpi/northbridge.asl b/src/soc/intel/cannonlake/acpi/northbridge.asl
index 25291163cf..ead5c02a16 100644
--- a/src/soc/intel/cannonlake/acpi/northbridge.asl
+++ b/src/soc/intel/cannonlake/acpi/northbridge.asl
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2017 Intel Corp.
+ * Copyright (C) 2017-2020 Intel Corp.
  * (Written by Bora Guvendik <bora.guvendik@intel.com> for Intel Corp.)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -62,154 +62,154 @@ Device (MCHC)
 	}
 }
 
-Name (MCRS, ResourceTemplate ()
-{
-	/* Bus Numbers */
-	WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
-			0x0000, 0x0000, 0x00ff, 0x0000, 0x0100)
-
-	/* IO Region 0 */
-	DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode,
-			EntireRange,
-			0x0000, 0x0000, 0x0cf7, 0x0000, 0x0cf8)
-
-	/* PCI Config Space */
-	Io (Decode16, 0x0cf8, 0x0cf8, 0x0001, 0x0008)
-
-	/* IO Region 1 */
-	DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode,
-			EntireRange,
-			0x0000, 0x0d00, 0xffff, 0x0000, 0xf300)
-
-	/* VGA memory (0xa0000-0xbffff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000a0000, 0x000bffff, 0x00000000,
-			0x00020000)
-
-	/*  OPROM reserved (0xc0000-0xc3fff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000c0000, 0x000c3fff, 0x00000000,
-			0x00004000)
-
-	/* OPROM reserved (0xc4000-0xc7fff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000c4000, 0x000c7fff, 0x00000000,
-			0x00004000)
-
-	/* OPROM reserved (0xc8000-0xcbfff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000c8000, 0x000cbfff, 0x00000000,
-			0x00004000)
-
-	/* OPROM reserved (0xcc000-0xcffff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000cc000, 0x000cffff, 0x00000000,
-			0x00004000)
-
-	/* OPROM reserved (0xd0000-0xd3fff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000d0000, 0x000d3fff, 0x00000000,
-			0x00004000)
-
-	/* OPROM reserved (0xd4000-0xd7fff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000d4000, 0x000d7fff, 0x00000000,
-			0x00004000)
-
-	/* OPROM reserved (0xd8000-0xdbfff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000d8000, 0x000dbfff, 0x00000000,
-			0x00004000)
-
-	/* OPROM reserved (0xdc000-0xdffff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000dc000, 0x000dffff, 0x00000000,
-			0x00004000)
-
-	/* BIOS Extension (0xe0000-0xe3fff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000e0000, 0x000e3fff, 0x00000000,
-			0x00004000)
-
-	/* BIOS Extension (0xe4000-0xe7fff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000e4000, 0x000e7fff, 0x00000000,
-			0x00004000)
-
-	/* BIOS Extension (0xe8000-0xebfff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000e8000, 0x000ebfff, 0x00000000,
-			0x00004000)
-
-	/* BIOS Extension (0xec000-0xeffff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000ec000, 0x000effff, 0x00000000,
-			0x00004000)
-
-	/* System BIOS (0xf0000-0xfffff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0x000f0000, 0x000fffff, 0x00000000,
-			0x00010000)
-
-	/* PCI Memory Region (TLUD - 0xdfffffff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			NonCacheable, ReadWrite,
-			0x00000000, 0x00000000, 0xdfffffff, 0x00000000,
-			0xE0000000,,, PM01)
-
-	/* PCI Memory Region (TUUD - (TUUD + ABOVE_4G_MMIO_SIZE)) */
-	QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			NonCacheable, ReadWrite,
-			0x00000000, 0x10000, 0x1ffff, 0x00000000,
-			0x10000,,, PM02)
-
-	/* PCH reserved resource (0xfc800000-0xfe7fffff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, PCH_PRESERVED_BASE_ADDRESS, 0xfe7fffff,
-			0x00000000, PCH_PRESERVED_BASE_SIZE)
-
-	/* TPM Area (0xfed40000-0xfed47fff) */
-	DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
-			Cacheable, ReadWrite,
-			0x00000000, 0xfed40000, 0xfed47fff, 0x00000000,
-			0x00008000)
-})
-
 Method (_CRS, 0, Serialized)
 {
+	Name (MCRS, ResourceTemplate ()
+	{
+		/* Bus Numbers */
+		WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+				0x0000, 0x0000, 0x00ff, 0x0000, 0x0100)
+
+		/* IO Region 0 */
+		DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+				EntireRange,
+				0x0000, 0x0000, 0x0cf7, 0x0000, 0x0cf8)
+
+		/* PCI Config Space */
+		Io (Decode16, 0x0cf8, 0x0cf8, 0x0001, 0x0008)
+
+		/* IO Region 1 */
+		DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+				EntireRange,
+				0x0000, 0x0d00, 0xffff, 0x0000, 0xf300)
+
+		/* VGA memory (0xa0000-0xbffff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000a0000, 0x000bffff, 0x00000000,
+				0x00020000)
+
+		/*  OPROM reserved (0xc0000-0xc3fff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000c0000, 0x000c3fff, 0x00000000,
+				0x00004000)
+
+		/* OPROM reserved (0xc4000-0xc7fff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000c4000, 0x000c7fff, 0x00000000,
+				0x00004000)
+
+		/* OPROM reserved (0xc8000-0xcbfff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000c8000, 0x000cbfff, 0x00000000,
+				0x00004000)
+
+		/* OPROM reserved (0xcc000-0xcffff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000cc000, 0x000cffff, 0x00000000,
+				0x00004000)
+
+		/* OPROM reserved (0xd0000-0xd3fff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000d0000, 0x000d3fff, 0x00000000,
+				0x00004000)
+
+		/* OPROM reserved (0xd4000-0xd7fff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000d4000, 0x000d7fff, 0x00000000,
+				0x00004000)
+
+		/* OPROM reserved (0xd8000-0xdbfff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000d8000, 0x000dbfff, 0x00000000,
+				0x00004000)
+
+		/* OPROM reserved (0xdc000-0xdffff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000dc000, 0x000dffff, 0x00000000,
+				0x00004000)
+
+		/* BIOS Extension (0xe0000-0xe3fff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000e0000, 0x000e3fff, 0x00000000,
+				0x00004000)
+
+		/* BIOS Extension (0xe4000-0xe7fff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000e4000, 0x000e7fff, 0x00000000,
+				0x00004000)
+
+		/* BIOS Extension (0xe8000-0xebfff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000e8000, 0x000ebfff, 0x00000000,
+				0x00004000)
+
+		/* BIOS Extension (0xec000-0xeffff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000ec000, 0x000effff, 0x00000000,
+				0x00004000)
+
+		/* System BIOS (0xf0000-0xfffff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0x000f0000, 0x000fffff, 0x00000000,
+				0x00010000)
+
+		/* PCI Memory Region (TLUD - 0xdfffffff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				NonCacheable, ReadWrite,
+				0x00000000, 0x00000000, 0xdfffffff, 0x00000000,
+				0xE0000000,,, PM01)
+
+		/* PCI Memory Region (TUUD - (TUUD + ABOVE_4G_MMIO_SIZE)) */
+		QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				NonCacheable, ReadWrite,
+				0x00000000, 0x10000, 0x1ffff, 0x00000000,
+				0x10000,,, PM02)
+
+		/* PCH reserved resource (0xfc800000-0xfe7fffff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, PCH_PRESERVED_BASE_ADDRESS, 0xfe7fffff,
+				0x00000000, PCH_PRESERVED_BASE_SIZE)
+
+		/* TPM Area (0xfed40000-0xfed47fff) */
+		DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed,
+				Cacheable, ReadWrite,
+				0x00000000, 0xfed40000, 0xfed47fff, 0x00000000,
+				0x00008000)
+	})
+
 	/* Find PCI resource area in MCRS */
-	CreateDwordField (^MCRS, ^PM01._MIN, PMIN)
-	CreateDwordField (^MCRS, ^PM01._MAX, PMAX)
-	CreateDwordField (^MCRS, ^PM01._LEN, PLEN)
+	CreateDwordField (MCRS, PM01._MIN, PMIN)
+	CreateDwordField (MCRS, PM01._MAX, PMAX)
+	CreateDwordField (MCRS, PM01._LEN, PLEN)
 
 	/*
 	 * Fix up PCI memory region
 	 * Start with Top of Lower Usable DRAM
 	 */
-	Store (^MCHC.TLUD, PMIN)
+	Store (\_SB.PCI0.MCHC.TLUD, PMIN)
 	Add (Subtract (PMAX, PMIN), 1, PLEN)
 
 	/* Patch PM02 range based on Memory Size */
-	CreateQwordField (^MCRS, ^PM02._MIN, MMIN)
-	CreateQwordField (^MCRS, ^PM02._MAX, MMAX)
-	CreateQwordField (^MCRS, ^PM02._LEN, MLEN)
+	CreateQwordField (MCRS, PM02._MIN, MMIN)
+	CreateQwordField (MCRS, PM02._MAX, MMAX)
+	CreateQwordField (MCRS, PM02._LEN, MLEN)
 
-	Store (^MCHC.TUUD, Local0)
+	Store (\_SB.PCI0.MCHC.TUUD, Local0)
 
 	If (LLessEqual (Local0, BASE_32GB)) {
 		Store (BASE_32GB, MMIN)
@@ -220,58 +220,42 @@ Method (_CRS, 0, Serialized)
 	}
 	Subtract (Add (MMIN, MLEN), 1, MMAX)
 
-	Return (^MCRS)
+	Return (MCRS)
 }
 
-Name (EP_B, 0) /* to store EP BAR */
-Name (MH_B, 0) /* to store MCH BAR */
-Name (PC_B, 0) /* to store PCIe BAR */
-Name (PC_L, 0) /* to store PCIe BAR Length */
-Name (DM_B, 0) /* to store DMI BAR */
-
 /* Get MCH BAR */
 Method (GMHB, 0, Serialized)
 {
-	If (LEqual (MH_B, 0)) {
-		ShiftLeft (\_SB.PCI0.MCHC.MHBR, 15, MH_B)
-	}
-	Return (MH_B)
+	ShiftLeft (\_SB.PCI0.MCHC.MHBR, 15, Local0)
+	Return (Local0)
 }
 
 /* Get EP BAR */
 Method (GEPB, 0, Serialized)
 {
-	If (LEqual (EP_B, 0)) {
-		ShiftLeft (\_SB.PCI0.MCHC.EPBR, 12, EP_B)
-	}
-	Return (EP_B)
+	ShiftLeft (\_SB.PCI0.MCHC.EPBR, 12, Local0)
+	Return (Local0)
 }
 
 /* Get PCIe BAR */
 Method (GPCB, 0, Serialized)
 {
-	If (LEqual (PC_B, 0)) {
-		ShiftLeft (\_SB.PCI0.MCHC.PXBR, 26, PC_B)
-	}
-	Return (PC_B)
+	ShiftLeft (\_SB.PCI0.MCHC.PXBR, 26, Local0)
+	Return (Local0)
 }
 
 /* Get PCIe Length */
 Method (GPCL, 0, Serialized)
 {
-	If (LEqual (PC_L, 0)) {
-		ShiftRight (0x10000000, \_SB.PCI0.MCHC.PXSZ, PC_L)
-	}
-	Return (PC_L)
+	ShiftRight (0x10000000, \_SB.PCI0.MCHC.PXSZ, Local0)
+	Return (Local0)
 }
 
 /* Get DMI BAR */
 Method (GDMB, 0, Serialized)
 {
-	If (LEqual (DM_B, 0)) {
-		ShiftLeft (\_SB.PCI0.MCHC.DIBR, 12, DM_B)
-	}
-	Return (DM_B)
+	ShiftLeft (\_SB.PCI0.MCHC.DIBR, 12, Local0)
+	Return (Local0)
 }
 
 /* PCI Device Resource Consumption */
@@ -280,59 +264,61 @@ Device (PDRC)
 	Name (_HID, EISAID ("PNP0C02"))
 	Name (_UID, 1)
 
-	Name (BUF0, ResourceTemplate ()
-	{
-		/* MCH BAR _BAS will be updated in _CRS below according to
-		 * B0:D0:F0:Reg.48h
-		 */
-		Memory32Fixed (ReadWrite, 0, 0x08000, MCHB)
-
-		/* DMI BAR _BAS will be updated in _CRS below according to
-		 * B0:D0:F0:Reg.68h
-		 */
-		Memory32Fixed (ReadWrite, 0, 0x01000, DMIB)
-
-		/* EP BAR _BAS will be updated in _CRS below according to
-		 * B0:D0:F0:Reg.40h
-		 */
-		Memory32Fixed (ReadWrite, 0, 0x01000, EGPB)
-
-		/* PCI Express BAR _BAS and _LEN will be updated in
-		 * _CRS below according to B0:D0:F0:Reg.60h
-		 */
-		Memory32Fixed (ReadWrite, 0, 0, PCIX)
-
-		/* VTD engine memory range.
-		 */
-		Memory32Fixed (ReadOnly, VTD_BASE_ADDRESS, VTD_BASE_SIZE)
-
-		/* FLASH range */
-		Memory32Fixed (ReadOnly, 0xFF000000, 0x1000000, FIOH)
-
-		/* Local APIC range(0xFEE0_0000 to 0xFEEF_FFFF) */
-		Memory32Fixed (ReadOnly, 0xFEE00000, 0x100000, LIOH)
-
-		/* HPET address decode range */
-		Memory32Fixed (ReadWrite, HPET_BASE_ADDRESS, 0x400)
-	})
-
 	Method (_CRS, 0, Serialized)
 	{
-		CreateDwordField (BUF0, ^MCHB._BAS, MBR0)
+		Name (BUF0, ResourceTemplate ()
+		{
+			/* MCH BAR _BAS will be updated in _CRS below according to
+			 * B0:D0:F0:Reg.48h
+			 */
+			Memory32Fixed (ReadWrite, 0, 0x08000, MCHB)
+
+			/* DMI BAR _BAS will be updated in _CRS below according to
+			 * B0:D0:F0:Reg.68h
+			 */
+			Memory32Fixed (ReadWrite, 0, 0x01000, DMIB)
+
+			/* EP BAR _BAS will be updated in _CRS below according to
+			 * B0:D0:F0:Reg.40h
+			 */
+			Memory32Fixed (ReadWrite, 0, 0x01000, EGPB)
+
+			/* PCI Express BAR _BAS and _LEN will be updated in
+			 * _CRS below according to B0:D0:F0:Reg.60h
+			 */
+			Memory32Fixed (ReadWrite, 0, 0, PCIX)
+
+			/* VTD engine memory range. */
+			Memory32Fixed (ReadOnly, VTD_BASE_ADDRESS, VTD_BASE_SIZE)
+
+			/* FLASH range */
+			Memory32Fixed (ReadOnly, 0, CONFIG_ROM_SIZE, FIOH)
+
+			/* Local APIC range(0xFEE0_0000 to 0xFEEF_FFFF) */
+			Memory32Fixed (ReadOnly, 0xFEE00000, 0x100000)
+
+			/* HPET address decode range */
+			Memory32Fixed (ReadWrite, HPET_BASE_ADDRESS, 0x400)
+		})
+
+		CreateDwordField (BUF0, MCHB._BAS, MBR0)
 		Store (\_SB.PCI0.GMHB (), MBR0)
 
-		CreateDwordField (BUF0, ^DMIB._BAS, DBR0)
+		CreateDwordField (BUF0, DMIB._BAS, DBR0)
 		Store (\_SB.PCI0.GDMB (), DBR0)
 
-		CreateDwordField (BUF0, ^EGPB._BAS, EBR0)
+		CreateDwordField (BUF0, EGPB._BAS, EBR0)
 		Store (\_SB.PCI0.GEPB (), EBR0)
 
-		CreateDwordField (BUF0, ^PCIX._BAS, XBR0)
+		CreateDwordField (BUF0, PCIX._BAS, XBR0)
 		Store (\_SB.PCI0.GPCB (), XBR0)
 
-		CreateDwordField (BUF0, ^PCIX._LEN, XSZ0)
+		CreateDwordField (BUF0, PCIX._LEN, XSZ0)
 		Store (\_SB.PCI0.GPCL (), XSZ0)
 
+		CreateDwordField (BUF0, FIOH._BAS, FBR0)
+		Subtract(0x100000000, CONFIG_ROM_SIZE, FBR0)
+
 		Return (BUF0)
 	}
 }