From 819005f58bbed7642b901c48d06149f2b4f995fa Mon Sep 17 00:00:00 2001 From: Keith Hui Date: Tue, 14 Nov 2017 23:31:20 -0500 Subject: asus/p2b: Align ACPI tables with asus/p2b-ls Updates ACPI tables with work done for asus/p2b-ls, including super I/O related declarations. Change-Id: Id2420da4ab04aa5f59ac0aa237d21477a03b826e Signed-off-by: Keith Hui Reviewed-on: https://review.coreboot.org/22473 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/asus/p2b/dsdt.asl | 165 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 153 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/mainboard/asus/p2b/dsdt.asl b/src/mainboard/asus/p2b/dsdt.asl index 00bea29e17..5ef6bdba50 100644 --- a/src/mainboard/asus/p2b/dsdt.asl +++ b/src/mainboard/asus/p2b/dsdt.asl @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2010 Tobias Diedrich + * Copyright (C) 2017 Keith Hui * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,8 +16,29 @@ #include "southbridge/intel/i82371eb/i82371eb.h" +#define SUPERIO_PNP_BASE 0x3F0 +#define SUPERIO_SHOW_UARTA +#define SUPERIO_SHOW_UARTB +#define SUPERIO_SHOW_FDC +#define SUPERIO_SHOW_LPT + DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1) { + /* \_PR scope defining the main processor is generated in SSDT. */ + + OperationRegion(X80, SystemIO, 0x80, 1) + Field(X80, ByteAcc, NoLock, Preserve) + { + P80, 8 + } + + /* + * For now only define 2 power states: + * - S0 which is fully on + * - S5 which is soft off + * Any others would involve declaring the wake up methods. + */ + /* * Intel 82371EB (PIIX4E) datasheet, section 7.2.3, page 142 * @@ -38,25 +60,41 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1) Name (\_S1, Package () { 0x03, 0x03, 0x00, 0x00 }) Name (\_S5, Package () { 0x00, 0x00, 0x00, 0x00 }) - OperationRegion (SIO1, SystemIO, Add(DEFAULT_PMBASE, GPO0), 2) - Field (SIO1, ByteAcc, NoLock, Preserve) + OperationRegion (GPOB, SystemIO, DEFAULT_PMBASE+DEVCTL, 0x10) + Field (GPOB, ByteAcc, NoLock, Preserve) { - FANP, 1, /* CPU/case fan power */ - Offset (0x01), - PLED, 1, + Offset (0x03), + TO12, 1, /* Device trap 12 */ + Offset (0x08), + FANM, 1, /* GPO0, meant for fan */ + Offset (0x09), + PLED, 1, /* GPO8, meant for power LED. Per PIIX4 datasheet */ + , 3, /* this goes low when power is cut from its core. */ + , 2, + , 16, + MSG0, 1 /* GPO30, message LED */ } + /* Prepare To Sleep, Arg0 is target S-state */ Method (\_PTS, 1, NotSerialized) { - /* Disable fan, blink power led */ - Store (Zero, FANP) - Store (Zero, PLED) + /* Disable fan, blink power LED, if not turning off */ + If (LNotEqual (Arg0, 0x05)) + { + Store (Zero, FANM) + Store (Zero, PLED) + } + + /* Arms SMI for device 12 */ + Store (One, TO12) + /* Put out a POST code */ + Or (Arg0, 0xF0, P80) } Method (\_WAK, 1, NotSerialized) { /* Re-enable fan, stop power led blinking */ - Store (One, FANP) + Store (One, FANM) Store (One, PLED) /* wake OK */ Return(Package(0x02){0x00, 0x00}) @@ -65,6 +103,22 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1) /* Root of the bus hierarchy */ Scope (\_SB) { + Device (PWRB) + { + /* Power Button Device */ + Name (_HID, EisaId ("PNP0C0C")) + Method (_STA, 0, NotSerialized) + { + Return (0x0B) + } + } + #include "southbridge/intel/i82371eb/acpi/intx.asl" + + PCI_INTX_DEV(LNKA, \_SB.PCI0.PX40.PIRA, 1) + PCI_INTX_DEV(LNKB, \_SB.PCI0.PX40.PIRB, 2) + PCI_INTX_DEV(LNKC, \_SB.PCI0.PX40.PIRC, 3) + PCI_INTX_DEV(LNKD, \_SB.PCI0.PX40.PIRD, 4) + /* Top PCI device */ Device (PCI0) { @@ -106,10 +160,97 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "CORE ", "COREBOOT", 1) Package (0x04) { 0x000CFFFF, 3, LNKD, 0 }, }) + #include "northbridge/intel/i440bx/acpi/sb_pci0_crs.asl" + + /* Begin southbridge block */ + Device (PX40) + { + Name(_ADR, 0x00040000) + OperationRegion (PIRQ, PCI_Config, 0x60, 0x04) + Field (PIRQ, ByteAcc, NoLock, Preserve) + { + PIRA, 8, + PIRB, 8, + PIRC, 8, + PIRD, 8 + } + + /* PNP Motherboard Resources */ + Device (SYSR) + { + Name (_HID, EisaId ("PNP0C02")) + Method (_CRS, 0, NotSerialized) + { + Name (BUF1, ResourceTemplate () + { + /* PM register ports */ + IO (Decode16, 0x0000, 0x0000, 0x01, 0x40, _Y06) + /* SMBus register ports */ + IO (Decode16, 0x0000, 0x0000, 0x01, 0x10, _Y07) + /* PIIX4E ports */ + /* Aliased DMA ports */ + IO (Decode16, 0x0010, 0x0010, 0x01, 0x10, ) + /* Aliased PIC ports */ + IO (Decode16, 0x0022, 0x0022, 0x01, 0x1E, ) + /* Aliased timer ports */ + IO (Decode16, 0x0050, 0x0050, 0x01, 0x04, ) + IO (Decode16, 0x0062, 0x0062, 0x01, 0x02, ) + IO (Decode16, 0x0065, 0x0065, 0x01, 0x0B, ) + IO (Decode16, 0x0074, 0x0074, 0x01, 0x0C, ) + IO (Decode16, 0x0091, 0x0091, 0x01, 0x03, ) + IO (Decode16, 0x00A2, 0x00A2, 0x01, 0x1E, ) + IO (Decode16, 0x00E0, 0x00E0, 0x01, 0x10, ) + IO (Decode16, 0x0294, 0x0294, 0x01, 0x04, ) + IO (Decode16, 0x03F0, 0x03F0, 0x01, 0x02, ) + IO (Decode16, 0x04D0, 0x04D0, 0x01, 0x02, ) + }) + CreateWordField (BUF1, _Y06._MIN, PMLO) + CreateWordField (BUF1, _Y06._MAX, PMRL) + CreateWordField (BUF1, _Y07._MIN, SBLO) + CreateWordField (BUF1, _Y07._MAX, SBRL) + + And (\_SB.PCI0.PX43.PM00, 0xFFFE, PMLO) + And (\_SB.PCI0.PX43.SB00, 0xFFFE, SBLO) + Store (PMLO, PMRL) + Store (SBLO, SBRL) + Return (BUF1) + } + } + #include "southbridge/intel/i82371eb/acpi/i82371eb.asl" + } + Device (PX43) + { + Name (_ADR, 0x00040003) // _ADR: Address + OperationRegion (IPMU, PCI_Config, PMBA, 0x02) + Field (IPMU, ByteAcc, NoLock, Preserve) + { + PM00, 16 + } -#include "northbridge/intel/i440bx/acpi/sb_pci0_crs.asl" -#include "southbridge/intel/i82371eb/acpi/isabridge.asl" + OperationRegion (ISMB, PCI_Config, SMBBA, 0x02) + Field (ISMB, ByteAcc, NoLock, Preserve) + { + SB00, 16 + } + } + + #include "superio/winbond/w83977tf/acpi/superio.asl" + } + } + + /* ACPI Message */ + Scope (\_SI) + { + Method (_MSG, 1, NotSerialized) + { + If (LEqual (Arg0, Zero)) + { + Store (One, MSG0) + } + Else + { + Store (Zero, MSG0) + } } -#include "southbridge/intel/i82371eb/acpi/pirq.asl" } } -- cgit v1.2.3