diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-12-29 09:04:30 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-11 16:36:15 +0000 |
| commit | f6f1215cdbbae04de8f84654d064b376395cf203 (patch) | |
| tree | cd76ac3b772bd6e128ac6005126ef682fea8c433 /src/soc/intel | |
| parent | d6ccbb9d48f97dd3bbd4b947fe3bc4857216a363 (diff) | |
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>
Diffstat (limited to 'src/soc/intel')
| -rw-r--r-- | src/soc/intel/baytrail/acpi/globalnvs.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/baytrail/include/soc/nvs.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/braswell/acpi/globalnvs.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/braswell/include/soc/nvs.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/include/soc/nvs.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/pch/acpi/globalnvs.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/acpi/acpi/globalnvs.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/block/include/intelblocks/nvs.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/denverton_ns/acpi/globalnvs.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/denverton_ns/include/soc/nvs.h | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi/globalnvs.asl | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/include/soc/nvs.h | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/src/soc/intel/baytrail/acpi/globalnvs.asl b/src/soc/intel/baytrail/acpi/globalnvs.asl index 20b7ed4897..e0720d8186 100644 --- a/src/soc/intel/baytrail/acpi/globalnvs.asl +++ b/src/soc/intel/baytrail/acpi/globalnvs.asl @@ -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 */ diff --git a/src/soc/intel/baytrail/include/soc/nvs.h b/src/soc/intel/baytrail/include/soc/nvs.h index d6136de170..52a744729a 100644 --- a/src/soc/intel/baytrail/include/soc/nvs.h +++ b/src/soc/intel/baytrail/include/soc/nvs.h @@ -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 */ diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl index d13e4a4c88..5642e6afce 100644 --- a/src/soc/intel/braswell/acpi/globalnvs.asl +++ b/src/soc/intel/braswell/acpi/globalnvs.asl @@ -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 */ diff --git a/src/soc/intel/braswell/include/soc/nvs.h b/src/soc/intel/braswell/include/soc/nvs.h index 82ed4f5ad3..ed791010e0 100644 --- a/src/soc/intel/braswell/include/soc/nvs.h +++ b/src/soc/intel/braswell/include/soc/nvs.h @@ -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 */ diff --git a/src/soc/intel/broadwell/include/soc/nvs.h b/src/soc/intel/broadwell/include/soc/nvs.h index 1f9ae04493..c5d249a7c3 100644 --- a/src/soc/intel/broadwell/include/soc/nvs.h +++ b/src/soc/intel/broadwell/include/soc/nvs.h @@ -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 */ diff --git a/src/soc/intel/broadwell/pch/acpi/globalnvs.asl b/src/soc/intel/broadwell/pch/acpi/globalnvs.asl index 876ac89d57..31905a60f7 100644 --- a/src/soc/intel/broadwell/pch/acpi/globalnvs.asl +++ b/src/soc/intel/broadwell/pch/acpi/globalnvs.asl @@ -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 diff --git a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl index 1290fb0ec2..8c29d1efef 100644 --- a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl +++ b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl @@ -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 diff --git a/src/soc/intel/common/block/include/intelblocks/nvs.h b/src/soc/intel/common/block/include/intelblocks/nvs.h index 1bbd4c1660..c98fa012d0 100644 --- a/src/soc/intel/common/block/include/intelblocks/nvs.h +++ b/src/soc/intel/common/block/include/intelblocks/nvs.h @@ -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 */ diff --git a/src/soc/intel/denverton_ns/acpi/globalnvs.asl b/src/soc/intel/denverton_ns/acpi/globalnvs.asl index 5bf706df7d..871a4710b0 100644 --- a/src/soc/intel/denverton_ns/acpi/globalnvs.asl +++ b/src/soc/intel/denverton_ns/acpi/globalnvs.asl @@ -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 diff --git a/src/soc/intel/denverton_ns/include/soc/nvs.h b/src/soc/intel/denverton_ns/include/soc/nvs.h index 21915576ca..3940e61426 100644 --- a/src/soc/intel/denverton_ns/include/soc/nvs.h +++ b/src/soc/intel/denverton_ns/include/soc/nvs.h @@ -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 */ diff --git a/src/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl index 1bb27ebd8a..cc7e8e3bec 100644 --- a/src/soc/intel/skylake/acpi/globalnvs.asl +++ b/src/soc/intel/skylake/acpi/globalnvs.asl @@ -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 diff --git a/src/soc/intel/skylake/include/soc/nvs.h b/src/soc/intel/skylake/include/soc/nvs.h index e04364a527..f8149f335d 100644 --- a/src/soc/intel/skylake/include/soc/nvs.h +++ b/src/soc/intel/skylake/include/soc/nvs.h @@ -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 */ |