Page MenuHomeFreeBSD
Files F152775359

D37000.id111800.diff
No OneTemporary
Actions

D37000.id111800.diff
View Options

diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -132,6 +132,7 @@
static int dsdt_indent_level;
static int dsdt_error;
+struct basl_table *rsdt;
struct basl_table *xsdt;
struct basl_fio {
@@ -172,42 +173,6 @@
return (errno);
}
-static int
-basl_fwrite_rsdt(FILE *fp)
-{
- EFPRINTF(fp, "/*\n");
- EFPRINTF(fp, " * bhyve RSDT template\n");
- EFPRINTF(fp, " */\n");
- EFPRINTF(fp, "[0004]\t\tSignature : \"RSDT\"\n");
- EFPRINTF(fp, "[0004]\t\tTable Length : 00000000\n");
- EFPRINTF(fp, "[0001]\t\tRevision : 01\n");
- EFPRINTF(fp, "[0001]\t\tChecksum : 00\n");
- EFPRINTF(fp, "[0006]\t\tOem ID : \"BHYVE \"\n");
- EFPRINTF(fp, "[0008]\t\tOem Table ID : \"BVRSDT \"\n");
- EFPRINTF(fp, "[0004]\t\tOem Revision : 00000001\n");
- /* iasl will fill in the compiler ID/revision fields */
- EFPRINTF(fp, "[0004]\t\tAsl Compiler ID : \"xxxx\"\n");
- EFPRINTF(fp, "[0004]\t\tAsl Compiler Revision : 00000000\n");
- EFPRINTF(fp, "\n");
-
- /* Add in pointers to the MADT, FADT and HPET */
- EFPRINTF(fp, "[0004]\t\tACPI Table Address 0 : %08X\n",
- basl_acpi_base + MADT_OFFSET);
- EFPRINTF(fp, "[0004]\t\tACPI Table Address 1 : %08X\n",
- basl_acpi_base + FADT_OFFSET);
- EFPRINTF(fp, "[0004]\t\tACPI Table Address 2 : %08X\n",
- basl_acpi_base + HPET_OFFSET);
- EFPRINTF(fp, "[0004]\t\tACPI Table Address 3 : %08X\n",
- basl_acpi_base + MCFG_OFFSET);
-
- EFFLUSH(fp);
-
- return (0);
-
-err_exit:
- return (errno);
-}
-
/*
* Helper routines for writing to the DSDT from other modules.
*/
@@ -701,6 +666,8 @@
/* Hypervisor Vendor Identity */
BASL_EXEC(basl_table_append_int(fadt, 0, 8));
+ BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_FADT,
+ ACPI_RSDT_ENTRY_SIZE));
BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_FADT,
ACPI_XSDT_ENTRY_SIZE));
@@ -731,6 +698,8 @@
/* Flags */
BASL_EXEC(basl_table_append_int(hpet, ACPI_HPET_PAGE_PROTECT4, 4));
+ BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_HPET,
+ ACPI_RSDT_ENTRY_SIZE));
BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_HPET,
ACPI_XSDT_ENTRY_SIZE));
@@ -828,6 +797,8 @@
/* Local APIC LINT */
BASL_EXEC(basl_table_append_int(madt, 1, 1));
+ BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_MADT,
+ ACPI_RSDT_ENTRY_SIZE));
BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_MADT,
ACPI_XSDT_ENTRY_SIZE));
@@ -859,12 +830,29 @@
/* Reserved */
BASL_EXEC(basl_table_append_int(mcfg, 0, 4));
+ BASL_EXEC(basl_table_append_pointer(rsdt, ACPI_SIG_MCFG,
+ ACPI_RSDT_ENTRY_SIZE));
BASL_EXEC(basl_table_append_pointer(xsdt, ACPI_SIG_MCFG,
ACPI_XSDT_ENTRY_SIZE));
return (0);
}
+static int
+build_rsdt(struct vmctx *const ctx)
+{
+ BASL_EXEC(basl_table_create(&rsdt, ctx, ACPI_SIG_RSDT,
+ BASL_TABLE_ALIGNMENT, RSDT_OFFSET));
+
+ /* Header */
+ BASL_EXEC(
+ basl_table_append_header(rsdt, ACPI_SIG_RSDT, BASL_REVISION_RSDT,
+ BASL_OEM_ID, BASL_OEM_TABLE_ID_RSDT, BASL_OEM_REVISION_RSDT));
+ /* Pointers (added by other build_XXX funcs) */
+
+ return (0);
+}
+
static int
build_xsdt(struct vmctx *const ctx)
{
@@ -918,7 +906,7 @@
* first table after XSDT.
*/
BASL_EXEC(basl_compile(ctx, basl_fwrite_rsdp, 0));
- BASL_EXEC(basl_compile(ctx, basl_fwrite_rsdt, RSDT_OFFSET));
+ BASL_EXEC(build_rsdt(ctx));
BASL_EXEC(build_xsdt(ctx));
BASL_EXEC(build_fadt(ctx));
BASL_EXEC(build_madt(ctx));
diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h
--- a/usr.sbin/bhyve/basl.h
+++ b/usr.sbin/bhyve/basl.h
@@ -23,6 +23,7 @@
#define BASL_REVISION_HPET 1
#define BASL_REVISION_MADT 1
#define BASL_REVISION_MCFG 1
+#define BASL_REVISION_RSDT 1
#define BASL_REVISION_XSDT 1
#define BASL_OEM_ID "BHYVE "
@@ -32,6 +33,7 @@
#define BASL_OEM_TABLE_ID_HPET "BVHPET "
#define BASL_OEM_TABLE_ID_MADT "BVMADT "
#define BASL_OEM_TABLE_ID_MCFG "BVMCFG "
+#define BASL_OEM_TABLE_ID_RSDT "BVRSDT "
#define BASL_OEM_TABLE_ID_XSDT "BVXSDT "
#define BASL_OEM_REVISION_DSDT 1
@@ -39,6 +41,7 @@
#define BASL_OEM_REVISION_HPET 1
#define BASL_OEM_REVISION_MADT 1
#define BASL_OEM_REVISION_MCFG 1
+#define BASL_OEM_REVISION_RSDT 1
#define BASL_OEM_REVISION_XSDT 1
#define BASL_COMPILER_ID "BASL"

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 18, 1:01 AM (8 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31689258
Default Alt Text
D37000.id111800.diff (4 KB)

Event Timeline