diff options
Diffstat (limited to 'usr/src/uts/intel/io/acpica/osl.c')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/osl.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/usr/src/uts/intel/io/acpica/osl.c b/usr/src/uts/intel/io/acpica/osl.c index d5bfab754f..44f8d2f48f 100644 --- a/usr/src/uts/intel/io/acpica/osl.c +++ b/usr/src/uts/intel/io/acpica/osl.c @@ -22,7 +22,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright 2011 Joyent, Inc. All rights reserved. + * Copyright 2012 Joyent, Inc. All rights reserved. */ /* * Copyright (c) 2009-2010, Intel Corporation. @@ -315,6 +315,12 @@ AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable, return (AE_OK); } +ACPI_STATUS +AcpiOsPhysicalTableOverride(ACPI_TABLE_HEADER *ExistingTable, + ACPI_PHYSICAL_ADDRESS *NewAddress, UINT32 *NewTableLength) +{ + return (AE_SUPPORT); +} /* * ACPI semaphore implementation @@ -883,7 +889,7 @@ AcpiOsWritePort(ACPI_IO_ADDRESS Address, UINT32 Value, UINT32 Width) static void -osl_rw_memory(ACPI_PHYSICAL_ADDRESS Address, UINT32 *Value, +osl_rw_memory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, UINT32 Width, int write) { size_t maplen = Width / 8; @@ -902,6 +908,9 @@ osl_rw_memory(ACPI_PHYSICAL_ADDRESS Address, UINT32 *Value, case 4: OSL_RW(ptr, Value, uint32_t, write); break; + case 8: + OSL_RW(ptr, Value, uint64_t, write); + break; default: cmn_err(CE_WARN, "!osl_rw_memory: invalid size %d", Width); @@ -913,7 +922,7 @@ osl_rw_memory(ACPI_PHYSICAL_ADDRESS Address, UINT32 *Value, ACPI_STATUS AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, - UINT32 *Value, UINT32 Width) + UINT64 *Value, UINT32 Width) { osl_rw_memory(Address, Value, Width, 0); return (AE_OK); @@ -921,7 +930,7 @@ AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, ACPI_STATUS AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, - UINT32 Value, UINT32 Width) + UINT64 Value, UINT32 Width) { osl_rw_memory(Address, &Value, Width, 1); return (AE_OK); |