diff options
| author | Toomas Soome <tsoome@me.com> | 2016-02-16 11:28:33 +0200 |
|---|---|---|
| committer | Joshua M. Clulow <josh@sysmgr.org> | 2017-04-21 20:09:34 -0700 |
| commit | 1738dd6ec94e36a9828d13a6e52ac7fb68cb52ed (patch) | |
| tree | 7f5a6cabbb67f1e367cc65717052aa15f2dfa411 /usr/src/uts/intel | |
| parent | 660946868929e02041af7b5b1c3e14f547c53f11 (diff) | |
| download | illumos-gate-1738dd6ec94e36a9828d13a6e52ac7fb68cb52ed.tar.gz | |
7461 illumos should support multiboot2 protocol
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Approved by: Joshua M. Clulow <josh@sysmgr.org>
Diffstat (limited to 'usr/src/uts/intel')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/osl.c | 26 | ||||
| -rw-r--r-- | usr/src/uts/intel/sys/bootinfo.h | 4 |
2 files changed, 16 insertions, 14 deletions
diff --git a/usr/src/uts/intel/io/acpica/osl.c b/usr/src/uts/intel/io/acpica/osl.c index 5bc1b855fd..5c32604088 100644 --- a/usr/src/uts/intel/io/acpica/osl.c +++ b/usr/src/uts/intel/io/acpica/osl.c @@ -229,7 +229,7 @@ AcpiOsGetRootPointer() * The boot code process the table and put the physical address * in the acpi-root-tab property. */ - Address = ddi_prop_get_int(DDI_DEV_T_ANY, ddi_root_node(), + Address = ddi_prop_get_int64(DDI_DEV_T_ANY, ddi_root_node(), DDI_PROP_DONTPASS, "acpi-root-tab", NULL); if ((Address == NULL) && ACPI_FAILURE(AcpiFindRootPointer(&Address))) @@ -241,7 +241,7 @@ AcpiOsGetRootPointer() /*ARGSUSED*/ ACPI_STATUS AcpiOsPredefinedOverride(const ACPI_PREDEFINED_NAMES *InitVal, - ACPI_STRING *NewVal) + ACPI_STRING *NewVal) { *NewVal = 0; @@ -260,7 +260,7 @@ acpica_strncpy(char *dest, const char *src, int len) ACPI_STATUS AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable, - ACPI_TABLE_HEADER **NewTable) + ACPI_TABLE_HEADER **NewTable) { char signature[5]; char oemid[7]; @@ -418,7 +418,7 @@ acpi_sema_v(acpi_sema_t *sp, unsigned count) ACPI_STATUS AcpiOsCreateSemaphore(UINT32 MaxUnits, UINT32 InitialUnits, -ACPI_HANDLE *OutHandle) + ACPI_HANDLE *OutHandle) { acpi_sema_t *sp; @@ -622,7 +622,7 @@ AcpiOsUnmapMemory(void *LogicalAddress, ACPI_SIZE Size) /*ARGSUSED*/ ACPI_STATUS AcpiOsGetPhysicalAddress(void *LogicalAddress, - ACPI_PHYSICAL_ADDRESS *PhysicalAddress) + ACPI_PHYSICAL_ADDRESS *PhysicalAddress) { /* UNIMPLEMENTED: not invoked by ACPI CA code */ @@ -653,8 +653,8 @@ static int acpi_intr_hooked = 0; ACPI_STATUS AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, - ACPI_OSD_HANDLER ServiceRoutine, - void *Context) + ACPI_OSD_HANDLER ServiceRoutine, + void *Context) { _NOTE(ARGUNUSED(InterruptNumber)) @@ -687,7 +687,7 @@ AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, ACPI_STATUS AcpiOsRemoveInterruptHandler(UINT32 InterruptNumber, - ACPI_OSD_HANDLER ServiceRoutine) + ACPI_OSD_HANDLER ServiceRoutine) { _NOTE(ARGUNUSED(ServiceRoutine)) @@ -931,7 +931,7 @@ osl_rw_memory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, ACPI_STATUS AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, - UINT64 *Value, UINT32 Width) + UINT64 *Value, UINT32 Width) { osl_rw_memory(Address, Value, Width, 0); return (AE_OK); @@ -939,7 +939,7 @@ AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, ACPI_STATUS AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, - UINT64 Value, UINT32 Width) + UINT64 Value, UINT32 Width) { osl_rw_memory(Address, &Value, Width, 1); return (AE_OK); @@ -948,7 +948,7 @@ AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, ACPI_STATUS AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Reg, - UINT64 *Value, UINT32 Width) + UINT64 *Value, UINT32 Width) { switch (Width) { @@ -980,7 +980,7 @@ int acpica_write_pci_config_ok = 1; ACPI_STATUS AcpiOsWritePciConfiguration(ACPI_PCI_ID *PciId, UINT32 Reg, - UINT64 Value, UINT32 Width) + UINT64 Value, UINT32 Width) { if (!acpica_write_pci_config_ok) { @@ -1034,7 +1034,7 @@ AcpiOsWritePciConfiguration(ACPI_PCI_ID *PciId, UINT32 Reg, */ void AcpiOsDerivePciId(ACPI_HANDLE rhandle, ACPI_HANDLE chandle, - ACPI_PCI_ID **PciId) + ACPI_PCI_ID **PciId) { ACPI_HANDLE handle; dev_info_t *dip; diff --git a/usr/src/uts/intel/sys/bootinfo.h b/usr/src/uts/intel/sys/bootinfo.h index 3adce64fc4..9e205e342f 100644 --- a/usr/src/uts/intel/sys/bootinfo.h +++ b/usr/src/uts/intel/sys/bootinfo.h @@ -107,7 +107,9 @@ struct xboot_info { native_ptr_t bi_xen_start_info; native_ptr_t bi_shared_info; /* VA for shared_info */ #else - native_ptr_t bi_mb_info; + native_ptr_t bi_mb_info; /* multiboot 1 or 2 info */ + int bi_mb_version; /* multiboot version */ + native_ptr_t bi_acpi_rsdp; #endif }; #pragma pack() |