GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sb,soc/intel: Drop OSYS from GNVS 

The value should be set by OSPM using some combination of
_OSI() queris in the \_SB._INI() method.

To maintain previous behaviour with this commit, boards where
GNVS osys initialisation was removed now do the same in ASL.

Change-Id: Id4957b12a72fbf7fa988e7ff039e47abcc072e1c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49353
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2020-12-29 09:04:30 +02:00
parent d6ccbb9d48
commit f6f1215cdb
35 changed files with 37 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/acpi/dsdt_top.asl
View File

@ -8,5 +8,8 @@
#include <vendorcode/google/chromeos/acpi/chromeos.asl>
#endif
/* Operating system enumeration. */
Name (OSYS, 0)
/* Power state (AC = 1) */
Name (PWRS, One)

9
src/mainboard/acer/g43t-am3/acpi_tables.c
View File

@ -1,9 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <soc/nvs.h>
void mainboard_fill_gnvs(struct global_nvs *gnvs)
{
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
}

2
src/mainboard/acer/g43t-am3/dsdt.asl
View File

@ -11,6 +11,8 @@ DefinitionBlock(
)
{
#include <acpi/dsdt_top.asl>
OSYS = 2002
// global NVS and variables
#include <southbridge/intel/common/acpi/platform.asl>
#include <southbridge/intel/i82801jx/acpi/globalnvs.asl>

9
src/mainboard/asus/p5qc/acpi_tables.c
View File

@ -1,9 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <soc/nvs.h>
void mainboard_fill_gnvs(struct global_nvs *gnvs)
{
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
}

2
src/mainboard/asus/p5qc/dsdt.asl
View File

@ -11,6 +11,8 @@ DefinitionBlock(
)
{
#include <acpi/dsdt_top.asl>
OSYS = 2002
// global NVS and variables
#include <southbridge/intel/common/acpi/platform.asl>
#include <southbridge/intel/i82801jx/acpi/globalnvs.asl>

9
src/mainboard/asus/p5ql-em/acpi_tables.c
View File

@ -1,9 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <soc/nvs.h>
void mainboard_fill_gnvs(struct global_nvs *gnvs)
{
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
}

2
src/mainboard/asus/p5ql-em/dsdt.asl
View File

@ -13,6 +13,8 @@ DefinitionBlock(
)
{
#include <acpi/dsdt_top.asl>
OSYS = 2002
// global NVS and variables
#include <southbridge/intel/common/acpi/platform.asl>
#include <southbridge/intel/i82801jx/acpi/globalnvs.asl>

9
src/mainboard/gigabyte/ga-g41m-es2l/acpi_tables.c
View File

@ -1,9 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <soc/nvs.h>
void mainboard_fill_gnvs(struct global_nvs *gnvs)
{
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
}

2
src/mainboard/gigabyte/ga-g41m-es2l/dsdt.asl
View File

@ -11,6 +11,8 @@ DefinitionBlock(
)
{
#include <acpi/dsdt_top.asl>
OSYS = 2002
// global NVS and variables
#include <southbridge/intel/common/acpi/platform.asl>
#include <southbridge/intel/i82801gx/acpi/globalnvs.asl>

9
src/mainboard/intel/dg43gt/acpi_tables.c
View File

@ -1,9 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <soc/nvs.h>
void mainboard_fill_gnvs(struct global_nvs *gnvs)
{
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */
}

2
src/mainboard/intel/dg43gt/dsdt.asl
View File

@ -11,6 +11,8 @@ DefinitionBlock(
)
{
#include <acpi/dsdt_top.asl>
OSYS = 2002
// global NVS and variables
#include <southbridge/intel/common/acpi/platform.asl>
#include <southbridge/intel/i82801jx/acpi/globalnvs.asl>

2
src/soc/intel/baytrail/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name(\PICM, 0) /* IOAPIC/8259 */
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, /* 0x00 - Operating System */
, 16, /* 0x00 - Operating System */
SMIF, 8, /* 0x02 - SMI function */
PRM0, 8, /* 0x03 - SMI function parameter */
PRM1, 8, /* 0x04 - SMI function parameter */

2
src/soc/intel/baytrail/include/soc/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/soc/intel/braswell/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name(\PICM, 0) /* IOAPIC/8259 */
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, /* 0x00 - Operating System */
, 16, /* 0x00 - Operating System */
SMIF, 8, /* 0x02 - SMI function */
PRM0, 8, /* 0x03 - SMI function parameter */
PRM1, 8, /* 0x04 - SMI function parameter */

2
src/soc/intel/braswell/include/soc/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/soc/intel/broadwell/include/soc/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/soc/intel/broadwell/pch/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name (\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/soc/intel/common/block/acpi/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name (\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
, 8, // 0x03 - Processor Count
PPCM, 8, // 0x04 - Max PPC State

2
src/soc/intel/common/block/include/intelblocks/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - 0x01 Operating System */
u16 unused_was_osys; /* 0x00 - 0x01 Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 unused_was_pcnt; /* 0x03 - Processor Count */
u8 ppcm; /* 0x04 - Max PPC State */

2
src/soc/intel/denverton_ns/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/soc/intel/denverton_ns/include/soc/nvs.h
View File

@ -5,7 +5,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/soc/intel/skylake/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name (\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/soc/intel/skylake/include/soc/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/southbridge/intel/bd82x6x/include/soc/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/southbridge/intel/i82801gx/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/southbridge/intel/i82801gx/include/soc/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/southbridge/intel/i82801ix/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/southbridge/intel/i82801ix/include/soc/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/southbridge/intel/i82801jx/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/southbridge/intel/i82801jx/include/soc/nvs.h
View File

@ -6,7 +6,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/southbridge/intel/ibexpeak/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name(\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/southbridge/intel/ibexpeak/include/soc/nvs.h
View File

@ -8,7 +8,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */

2
src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
View File

@ -7,7 +7,7 @@ Name (\PICM, 0) // IOAPIC/8259
Field (GNVS, ByteAcc, NoLock, Preserve)
{
/* Miscellaneous */
OSYS, 16, // 0x00 - Operating System
, 16, // 0x00 - Operating System
SMIF, 8, // 0x02 - SMI function
PRM0, 8, // 0x03 - SMI function parameter
PRM1, 8, // 0x04 - SMI function parameter

2
src/southbridge/intel/lynxpoint/include/soc/nvs.h
View File

@ -7,7 +7,7 @@
struct __packed global_nvs {
/* Miscellaneous */
u16 osys; /* 0x00 - Operating System */
u16 unused_was_osys; /* 0x00 - Operating System */
u8 smif; /* 0x02 - SMI function call ("TRAP") */
u8 prm0; /* 0x03 - SMI function call parameter */
u8 prm1; /* 0x04 - SMI function call parameter */