From 286c771657036152302136369fb067fd98477cd5 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 27 Sep 2021 12:11:14 +0200 Subject: [PATCH] {sb,soc}/intel: Drop LCKF from GNVS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This field is never used in the code. Drop it. Change-Id: I88207ec369ab83823ef2f3fc40f68a0980ce9663 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/57982 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/soc/intel/baytrail/acpi/globalnvs.asl | 2 +- src/soc/intel/baytrail/include/soc/nvs.h | 2 +- src/soc/intel/braswell/acpi/globalnvs.asl | 2 +- src/soc/intel/braswell/include/soc/nvs.h | 2 +- src/soc/intel/broadwell/include/soc/nvs.h | 2 +- src/soc/intel/broadwell/pch/acpi/globalnvs.asl | 2 +- src/soc/intel/denverton_ns/acpi/globalnvs.asl | 2 +- src/soc/intel/denverton_ns/include/soc/nvs.h | 2 +- src/soc/intel/skylake/acpi/globalnvs.asl | 2 +- src/soc/intel/skylake/include/soc/nvs.h | 2 +- src/southbridge/intel/bd82x6x/acpi/globalnvs.asl | 2 +- src/southbridge/intel/bd82x6x/include/soc/nvs.h | 2 +- src/southbridge/intel/i82801gx/acpi/globalnvs.asl | 2 +- src/southbridge/intel/i82801gx/include/soc/nvs.h | 2 +- src/southbridge/intel/i82801ix/acpi/globalnvs.asl | 2 +- src/southbridge/intel/i82801ix/include/soc/nvs.h | 2 +- src/southbridge/intel/lynxpoint/acpi/globalnvs.asl | 2 +- src/southbridge/intel/lynxpoint/include/soc/nvs.h | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/soc/intel/baytrail/acpi/globalnvs.asl b/src/soc/intel/baytrail/acpi/globalnvs.asl index 8ae426cfae..99cd38094b 100644 --- a/src/soc/intel/baytrail/acpi/globalnvs.asl +++ b/src/soc/intel/baytrail/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, /* 0x05 - SCI function */ PRM2, 8, /* 0x06 - SCI function parameter */ PRM3, 8, /* 0x07 - SCI function parameter */ - LCKF, 8, /* 0x08 - Global Lock function for EC */ + , 8, /* 0x08 - Global Lock function for EC */ PRM4, 8, /* 0x09 - Lock function parameter */ PRM5, 8, /* 0x0a - Lock function parameter */ P80D, 32, /* 0x0b - Debug port (IO 0x80) value */ diff --git a/src/soc/intel/baytrail/include/soc/nvs.h b/src/soc/intel/baytrail/include/soc/nvs.h index 52a744729a..cd5c630c93 100644 --- a/src/soc/intel/baytrail/include/soc/nvs.h +++ b/src/soc/intel/baytrail/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u32 p80d; /* 0x0b - Debug port (IO 0x80) value */ diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl index 206b4666a8..3cc614e27a 100644 --- a/src/soc/intel/braswell/acpi/globalnvs.asl +++ b/src/soc/intel/braswell/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, /* 0x05 - SCI function */ PRM2, 8, /* 0x06 - SCI function parameter */ PRM3, 8, /* 0x07 - SCI function parameter */ - LCKF, 8, /* 0x08 - Global Lock function for EC */ + , 8, /* 0x08 - Global Lock function for EC */ PRM4, 8, /* 0x09 - Lock function parameter */ PRM5, 8, /* 0x0a - Lock function parameter */ P80D, 32, /* 0x0b - Debug port (IO 0x80) value */ diff --git a/src/soc/intel/braswell/include/soc/nvs.h b/src/soc/intel/braswell/include/soc/nvs.h index ed791010e0..c803826fad 100644 --- a/src/soc/intel/braswell/include/soc/nvs.h +++ b/src/soc/intel/braswell/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u32 p80d; /* 0x0b - Debug port (IO 0x80) value */ diff --git a/src/soc/intel/broadwell/include/soc/nvs.h b/src/soc/intel/broadwell/include/soc/nvs.h index c5d249a7c3..5020c45047 100644 --- a/src/soc/intel/broadwell/include/soc/nvs.h +++ b/src/soc/intel/broadwell/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u8 unused_was_pcnt; /* 0x0b - Processor Count */ diff --git a/src/soc/intel/broadwell/pch/acpi/globalnvs.asl b/src/soc/intel/broadwell/pch/acpi/globalnvs.asl index 03aa1d68b3..ae5cfb539c 100644 --- a/src/soc/intel/broadwell/pch/acpi/globalnvs.asl +++ b/src/soc/intel/broadwell/pch/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, // 0x05 - SCI function PRM2, 8, // 0x06 - SCI function parameter PRM3, 8, // 0x07 - SCI function parameter - LCKF, 8, // 0x08 - Global Lock function for EC + , 8, // 0x08 - Global Lock function for EC PRM4, 8, // 0x09 - Lock function parameter PRM5, 8, // 0x0a - Lock function parameter , 8, // 0x0b - Processor Count diff --git a/src/soc/intel/denverton_ns/acpi/globalnvs.asl b/src/soc/intel/denverton_ns/acpi/globalnvs.asl index a6b216a5b1..5419bd863e 100644 --- a/src/soc/intel/denverton_ns/acpi/globalnvs.asl +++ b/src/soc/intel/denverton_ns/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, // 0x05 - SCI function PRM2, 8, // 0x06 - SCI function parameter PRM3, 8, // 0x07 - SCI function parameter - LCKF, 8, // 0x08 - Global Lock function for EC + , 8, // 0x08 - Global Lock function for EC PRM4, 8, // 0x09 - Lock function parameter PRM5, 8, // 0x0a - Lock function parameter P80D, 32, // 0x0b - Debug port (IO 0x80) value diff --git a/src/soc/intel/denverton_ns/include/soc/nvs.h b/src/soc/intel/denverton_ns/include/soc/nvs.h index 3940e61426..c236a5deb2 100644 --- a/src/soc/intel/denverton_ns/include/soc/nvs.h +++ b/src/soc/intel/denverton_ns/include/soc/nvs.h @@ -12,7 +12,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u32 p80d; /* 0x0b - Debug port (IO 0x80) value */ diff --git a/src/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl index a3fbbbca32..4cbcd5c680 100644 --- a/src/soc/intel/skylake/acpi/globalnvs.asl +++ b/src/soc/intel/skylake/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, // 0x05 - SCI function PRM2, 8, // 0x06 - SCI function parameter PRM3, 8, // 0x07 - SCI function parameter - LCKF, 8, // 0x08 - Global Lock function for EC + , 8, // 0x08 - Global Lock function for EC PRM4, 8, // 0x09 - Lock function parameter PRM5, 8, // 0x0a - Lock function parameter , 8, // 0x0b - Processor Count diff --git a/src/soc/intel/skylake/include/soc/nvs.h b/src/soc/intel/skylake/include/soc/nvs.h index f8149f335d..270a3766f4 100644 --- a/src/soc/intel/skylake/include/soc/nvs.h +++ b/src/soc/intel/skylake/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u8 unused_was_pcnt; /* 0x0b - Processor Count */ diff --git a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl index 8d2bbca79a..cb4e9672e4 100644 --- a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl +++ b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, // 0x05 - SCI function PRM2, 8, // 0x06 - SCI function parameter PRM3, 8, // 0x07 - SCI function parameter - LCKF, 8, // 0x08 - Global Lock function for EC + , 8, // 0x08 - Global Lock function for EC PRM4, 8, // 0x09 - Lock function parameter PRM5, 8, // 0x0a - Lock function parameter P80D, 32, // 0x0b - Debug port (IO 0x80) value diff --git a/src/southbridge/intel/bd82x6x/include/soc/nvs.h b/src/southbridge/intel/bd82x6x/include/soc/nvs.h index 22becfb719..f4fe89a413 100644 --- a/src/southbridge/intel/bd82x6x/include/soc/nvs.h +++ b/src/southbridge/intel/bd82x6x/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u32 p80d; /* 0x0b - Debug port (IO 0x80) value */ diff --git a/src/southbridge/intel/i82801gx/acpi/globalnvs.asl b/src/southbridge/intel/i82801gx/acpi/globalnvs.asl index bfa1b7ec02..9abd0ecb81 100644 --- a/src/southbridge/intel/i82801gx/acpi/globalnvs.asl +++ b/src/southbridge/intel/i82801gx/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, // 0x05 - SCI function PRM2, 8, // 0x06 - SCI function parameter PRM3, 8, // 0x07 - SCI function parameter - LCKF, 8, // 0x08 - Global Lock function for EC + , 8, // 0x08 - Global Lock function for EC PRM4, 8, // 0x09 - Lock function parameter PRM5, 8, // 0x0a - Lock function parameter P80D, 32, // 0x0b - Debug port (IO 0x80) value diff --git a/src/southbridge/intel/i82801gx/include/soc/nvs.h b/src/southbridge/intel/i82801gx/include/soc/nvs.h index 09cb8860ea..54a293aa65 100644 --- a/src/southbridge/intel/i82801gx/include/soc/nvs.h +++ b/src/southbridge/intel/i82801gx/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u32 p80d; /* 0x0b - Debug port (IO 0x80) value */ diff --git a/src/southbridge/intel/i82801ix/acpi/globalnvs.asl b/src/southbridge/intel/i82801ix/acpi/globalnvs.asl index a565ec8745..f46c0970cc 100644 --- a/src/southbridge/intel/i82801ix/acpi/globalnvs.asl +++ b/src/southbridge/intel/i82801ix/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, // 0x05 - SCI function PRM2, 8, // 0x06 - SCI function parameter PRM3, 8, // 0x07 - SCI function parameter - LCKF, 8, // 0x08 - Global Lock function for EC + , 8, // 0x08 - Global Lock function for EC PRM4, 8, // 0x09 - Lock function parameter PRM5, 8, // 0x0a - Lock function parameter P80D, 32, // 0x0b - Debug port (IO 0x80) value diff --git a/src/southbridge/intel/i82801ix/include/soc/nvs.h b/src/southbridge/intel/i82801ix/include/soc/nvs.h index 6ee61be42b..5f94d03c46 100644 --- a/src/southbridge/intel/i82801ix/include/soc/nvs.h +++ b/src/southbridge/intel/i82801ix/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u32 p80d; /* 0x0b - Debug port (IO 0x80) value */ diff --git a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl index 26f98112eb..20a41e2f5a 100644 --- a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl +++ b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve) SCIF, 8, // 0x05 - SCI function PRM2, 8, // 0x06 - SCI function parameter PRM3, 8, // 0x07 - SCI function parameter - LCKF, 8, // 0x08 - Global Lock function for EC + , 8, // 0x08 - Global Lock function for EC PRM4, 8, // 0x09 - Lock function parameter PRM5, 8, // 0x0a - Lock function parameter P80D, 32, // 0x0b - Debug port (IO 0x80) value diff --git a/src/southbridge/intel/lynxpoint/include/soc/nvs.h b/src/southbridge/intel/lynxpoint/include/soc/nvs.h index 39b51cc557..503666f181 100644 --- a/src/southbridge/intel/lynxpoint/include/soc/nvs.h +++ b/src/southbridge/intel/lynxpoint/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { u8 scif; /* 0x05 - SCI function call (via _L00) */ u8 prm2; /* 0x06 - SCI function call parameter */ u8 prm3; /* 0x07 - SCI function call parameter */ - u8 lckf; /* 0x08 - Global Lock function for EC */ + u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */ u8 prm4; /* 0x09 - Lock function parameter */ u8 prm5; /* 0x0a - Lock function parameter */ u32 p80d; /* 0x0b - Debug port (IO 0x80) value */