diff options
| author | Lijian Zhao <lijian.zhao@intel.com> | 2018-02-12 17:28:26 -0800 |
|---|---|---|
| committer | Subrata Banik <subrata.banik@intel.com> | 2018-02-16 03:27:59 +0000 |
| commit | 7e2fe06a46ad3c44b1eb77651c27d4b9166033a6 (patch) | |
| tree | 4f9e9b5e4736c50e3e825935855cc57f455471a8 /src/soc/intel/skylake/acpi | |
| parent | c303d741637a2190cd501e835ac07819d01bafea (diff) | |
soc/intel/skylake: Switch to common PCR ASL
Using common PCR asl for skylake/kabylake platform.
BUG=None
TEST=None
Change-Id: I99ec7c878adaea439108553c0fac9d5abe1bc248
Signed-off-by: Lijian Zhao <lijian.zhao@intel.com>
Reviewed-on: https://review.coreboot.org/23725
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Diffstat (limited to 'src/soc/intel/skylake/acpi')
| -rw-r--r-- | src/soc/intel/skylake/acpi/pch.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi/pcr.asl | 88 |
2 files changed, 1 insertions, 89 deletions
diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl index e40dd6b291..0c4decc186 100644 --- a/src/soc/intel/skylake/acpi/pch.asl +++ b/src/soc/intel/skylake/acpi/pch.asl @@ -39,7 +39,7 @@ #include "pcie.asl" /* PCR Access */ -#include "pcr.asl" +#include <soc/intel/common/acpi/pcr.asl> /* PMC 0:1f.2 */ #include "pmc.asl" diff --git a/src/soc/intel/skylake/acpi/pcr.asl b/src/soc/intel/skylake/acpi/pcr.asl deleted file mode 100644 index c73830fe46..0000000000 --- a/src/soc/intel/skylake/acpi/pcr.asl +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2015 Google Inc. - * Copyright (C) 2015 Intel Corporation. - * - * 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 - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* - * Calculate PCR register base at specified PID - * Arg0 - PCR Port ID - */ -Method (PCRB, 1, NotSerialized) -{ - Return (Add (CONFIG_PCR_BASE_ADDRESS, - ShiftLeft (Arg0, PCR_PORTID_SHIFT))) -} - -/* - * Read a PCR register at specified PID and offset - * Arg0 - PCR Port ID - * Arg1 - Register Offset - */ -Method (PCRR, 2, Serialized) -{ - OperationRegion (PCRD, SystemMemory, Add (PCRB (Arg0), Arg1), 4) - Field (PCRD, DWordAcc, NoLock, Preserve) - { - DATA, 32 - } - Return (DATA) -} - -/* - * AND a value with PCR register at specified PID and offset - * Arg0 - PCR Port ID - * Arg1 - Register Offset - * Arg2 - Value to AND - */ -Method (PCRA, 3, Serialized) -{ - OperationRegion (PCRD, SystemMemory, Add (PCRB (Arg0), Arg1), 4) - Field (PCRD, DWordAcc, NoLock, Preserve) - { - DATA, 32 - } - And (DATA, Arg2, DATA) - - /* - * After every write one needs to read an innocuous register - * to ensure the writes are completed for certain ports. This is done - * for all ports so that the callers don't need the per-port knowledge - * for each transaction. - */ - PCRR (Arg0, Arg1) -} - -/* - * OR a value with PCR register at specified PID and offset - * Arg0 - PCR Port ID - * Arg1 - Register Offset - * Arg2 - Value to OR - */ -Method (PCRO, 3, Serialized) -{ - OperationRegion (PCRD, SystemMemory, Add (PCRB (Arg0), Arg1), 4) - Field (PCRD, DWordAcc, NoLock, Preserve) - { - DATA, 32 - } - Or (DATA, Arg2, DATA) - - /* - * After every write one needs to read an innocuous register - * to ensure the writes are completed for certain ports. This is done - * for all ports so that the callers don't need the per-port knowledge - * for each transaction. - */ - PCRR (Arg0, Arg1) -} |