aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-02-15 18:59:40 +0100
committerVladimir Serbinenko <phcoder@gmail.com>2014-06-01 01:24:53 +0200
commit8ecdc9e877aec90cbc5126a4c82298a7eca89d83 (patch)
treef4c95ef158e02ac8e49e30e4bc7f158c509294ef
parent4b10bb7c807bf60674ff2d4c5494164d7869971a (diff)
downloadcoreboot-8ecdc9e877aec90cbc5126a4c82298a7eca89d83.tar.gz
coreboot-8ecdc9e877aec90cbc5126a4c82298a7eca89d83.tar.xz
coreboot-8ecdc9e877aec90cbc5126a4c82298a7eca89d83.zip
acpigen: Add acpigen_emit_eisaid.
Change-Id: Ib92142a133445018cd152dabe299792ba5f36548 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/5240 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
m---------3rdparty0
-rw-r--r--src/arch/x86/boot/acpigen.c34
-rw-r--r--src/arch/x86/include/arch/acpigen.h1
3 files changed, 35 insertions, 0 deletions
diff --git a/3rdparty b/3rdparty
-Subproject 324ec3cb642a278d6d97ae809bc6098045bc6e6
+Subproject 45f0c04fd788fb29d9e303b2b2d1657ddb03448
diff --git a/src/arch/x86/boot/acpigen.c b/src/arch/x86/boot/acpigen.c
index fdb7e02c9..ba3d2dfe4 100644
--- a/src/arch/x86/boot/acpigen.c
+++ b/src/arch/x86/boot/acpigen.c
@@ -754,3 +754,37 @@ int acpigen_write_mainboard_resources(const char *scope, const char *name)
acpigen_patch_len(len - 1);
return len;
}
+
+static int hex2bin(const char c)
+{
+ if (c >= 'A' && c <= 'F')
+ return c - 'A' + 10;
+ if (c >= 'a' && c <= 'f')
+ return c - 'a' + 10;
+ return c - '0';
+}
+
+int acpigen_emit_eisaid(const char *eisaid)
+{
+ u32 compact = 0;
+
+ /* Clamping individual values would be better but
+ there is a disagreement over what is a valid
+ EISA id, so accept anything and don't clamp,
+ parent code should create a valid EISAid.
+ */
+ compact |= (eisaid[0] - 'A' + 1) << 26;
+ compact |= (eisaid[1] - 'A' + 1) << 21;
+ compact |= (eisaid[2] - 'A' + 1) << 16;
+ compact |= hex2bin(eisaid[3]) << 12;
+ compact |= hex2bin(eisaid[4]) << 8;
+ compact |= hex2bin(eisaid[5]) << 4;
+ compact |= hex2bin(eisaid[6]);
+
+ acpigen_emit_byte(0xc);
+ acpigen_emit_byte((compact >> 24) & 0xff);
+ acpigen_emit_byte((compact >> 16) & 0xff);
+ acpigen_emit_byte((compact >> 8) & 0xff);
+ acpigen_emit_byte(compact & 0xff);
+ return 5;
+}
diff --git a/src/arch/x86/include/arch/acpigen.h b/src/arch/x86/include/arch/acpigen.h
index 2ff996727..3217dbeca 100644
--- a/src/arch/x86/include/arch/acpigen.h
+++ b/src/arch/x86/include/arch/acpigen.h
@@ -34,6 +34,7 @@ int acpigen_write_byte(unsigned int data);
int acpigen_emit_byte(unsigned char data);
int acpigen_emit_stream(const char *data, int size);
int acpigen_emit_namestring(const char *namepath);
+int acpigen_emit_eisaid(const char *eisaid);
int acpigen_write_dword(unsigned int data);
int acpigen_write_qword(uint64_t data);
int acpigen_write_name(const char *name);