*****************************************************************************/
/*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
ACPI_MODULE_NAME("tbutils")
/* Local prototypes */
-static void acpi_tb_parse_fadt(acpi_native_uint table_index, u8 flags);
+static acpi_physical_address
+acpi_tb_get_root_table_entry(u8 * table_entry,
+ acpi_native_uint table_entry_size);
-static void acpi_tb_convert_fadt(void);
+/*******************************************************************************
+ *
+ * FUNCTION: acpi_tb_tables_loaded
+ *
+ * PARAMETERS: None
+ *
+ * RETURN: TRUE if required ACPI tables are loaded
+ *
+ * DESCRIPTION: Determine if the minimum required ACPI tables are present
+ * (FADT, FACS, DSDT)
+ *
+ ******************************************************************************/
-static void
-acpi_tb_install_table(acpi_physical_address address,
- u8 flags, char *signature, acpi_native_uint table_index);
-
-static void inline
-acpi_tb_init_generic_address(struct acpi_generic_address *new_gas_struct,
- u8 bit_width, u64 address);
-
-/* Table used for conversion of FADT to common format */
-
-typedef struct acpi_fadt_conversion {
- u8 target;
- u8 source;
- u8 length;
-
-} acpi_fadt_conversion;
-
-static struct acpi_fadt_conversion fadt_conversion_table[] = {
- {ACPI_FADT_OFFSET(xpm1a_event_block),
- ACPI_FADT_OFFSET(pm1a_event_block),
- ACPI_FADT_OFFSET(pm1_event_length)},
- {ACPI_FADT_OFFSET(xpm1b_event_block),
- ACPI_FADT_OFFSET(pm1b_event_block),
- ACPI_FADT_OFFSET(pm1_event_length)},
- {ACPI_FADT_OFFSET(xpm1a_control_block),
- ACPI_FADT_OFFSET(pm1a_control_block),
- ACPI_FADT_OFFSET(pm1_control_length)},
- {ACPI_FADT_OFFSET(xpm1b_control_block),
- ACPI_FADT_OFFSET(pm1b_control_block),
- ACPI_FADT_OFFSET(pm1_control_length)},
- {ACPI_FADT_OFFSET(xpm2_control_block),
- ACPI_FADT_OFFSET(pm2_control_block),
- ACPI_FADT_OFFSET(pm2_control_length)},
- {ACPI_FADT_OFFSET(xpm_timer_block), ACPI_FADT_OFFSET(pm_timer_block),
- ACPI_FADT_OFFSET(pm_timer_length)},
- {ACPI_FADT_OFFSET(xgpe0_block), ACPI_FADT_OFFSET(gpe0_block),
- ACPI_FADT_OFFSET(gpe0_block_length)},
- {ACPI_FADT_OFFSET(xgpe1_block), ACPI_FADT_OFFSET(gpe1_block),
- ACPI_FADT_OFFSET(gpe1_block_length)}
-};
-
-#define ACPI_FADT_CONVERSION_ENTRIES (sizeof (fadt_conversion_table) / sizeof (struct acpi_fadt_conversion))
+u8 acpi_tb_tables_loaded(void)
+{
+
+ if (acpi_gbl_root_table_list.count >= 3) {
+ return (TRUE);
+ }
+
+ return (FALSE);
+}
/*******************************************************************************
*
/* FACS only has signature and length fields of common table header */
- ACPI_INFO((AE_INFO, "%4.4s @ 0x%p/0x%04X",
- header->signature, ACPI_CAST_PTR(void, address),
+ ACPI_INFO((AE_INFO, "%4.4s %08lX, %04X",
+ header->signature, (unsigned long)address,
header->length));
} else if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_RSDP)) {
/* RSDP has no common fields */
- ACPI_INFO((AE_INFO, "RSDP @ 0x%p/0x%04X (v%3.3d %6.6s)",
- ACPI_CAST_PTR(void, address),
- (((struct acpi_table_rsdp *)header)->revision > 0) ?
- ((struct acpi_table_rsdp *)header)->length : 20,
- ((struct acpi_table_rsdp *)header)->revision,
- ((struct acpi_table_rsdp *)header)->oem_id));
+ ACPI_INFO((AE_INFO, "RSDP %08lX, %04X (r%d %6.6s)",
+ (unsigned long)address,
+ (ACPI_CAST_PTR(struct acpi_table_rsdp, header)->
+ revision >
+ 0) ? ACPI_CAST_PTR(struct acpi_table_rsdp,
+ header)->length : 20,
+ ACPI_CAST_PTR(struct acpi_table_rsdp,
+ header)->revision,
+ ACPI_CAST_PTR(struct acpi_table_rsdp,
+ header)->oem_id));
} else {
/* Standard ACPI table with full common header */
ACPI_INFO((AE_INFO,
- "%4.4s @ 0x%p/0x%04X (v%3.3d %6.6s %8.8s 0x%08X %4.4s 0x%08X)",
- header->signature, ACPI_CAST_PTR(void, address),
+ "%4.4s %08lX, %04X (r%d %6.6s %8.8s %8X %4.4s %8X)",
+ header->signature, (unsigned long)address,
header->length, header->revision, header->oem_id,
header->oem_table_id, header->oem_revision,
header->asl_compiler_id,
}
}
-/*******************************************************************************
- *
- * FUNCTION: acpi_tb_init_generic_address
- *
- * PARAMETERS: new_gas_struct - GAS struct to be initialized
- * bit_width - Width of this register
- * Address - Address of the register
- *
- * RETURN: None
- *
- * DESCRIPTION: Initialize a GAS structure.
- *
- ******************************************************************************/
-
-static void inline
-acpi_tb_init_generic_address(struct acpi_generic_address *new_gas_struct,
- u8 bit_width, u64 address)
-{
-
- ACPI_MOVE_64_TO_64(&new_gas_struct->address, &address);
- new_gas_struct->space_id = ACPI_ADR_SPACE_SYSTEM_IO;
- new_gas_struct->bit_width = bit_width;
- new_gas_struct->bit_offset = 0;
- new_gas_struct->access_width = 0;
-}
-
/*******************************************************************************
*
* FUNCTION: acpi_tb_validate_checksum
return sum;
}
-/*******************************************************************************
- *
- * FUNCTION: acpi_tb_convert_fadt
- *
- * PARAMETERS: None, uses acpi_gbl_FADT
- *
- * RETURN: None
- *
- * DESCRIPTION: Converts all versions of the FADT to a common internal format.
- *
- * NOTE: acpi_gbl_FADT must be of size (struct acpi_table_fadt), and must contain
- * a copy of the actual FADT.
- *
- * ACPICA will use the "X" fields of the FADT for all addresses.
- *
- * "X" fields are optional extensions to the original V1.0 fields. Even if
- * they are present in the structure, they can be optionally not used by
- * setting them to zero. Therefore, we must selectively expand V1.0 fields
- * if the corresponding X field is zero.
- *
- * For ACPI 1.0 FADTs, all address fields are expanded to the corresponding
- * "X" fields.
- *
- * For ACPI 2.0 FADTs, any "X" fields that are NULL are filled in by
- * expanding the corresponding ACPI 1.0 field.
- *
- ******************************************************************************/
-
-static void acpi_tb_convert_fadt(void)
-{
- u8 pm1_register_length;
- struct acpi_generic_address *target;
- acpi_native_uint i;
-
- /* Expand the FACS and DSDT addresses as necessary */
-
- if (!acpi_gbl_FADT.Xfacs) {
- acpi_gbl_FADT.Xfacs = (u64) acpi_gbl_FADT.facs;
- }
-
- if (!acpi_gbl_FADT.Xdsdt) {
- acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;
- }
-
- /*
- * Expand the V1.0 addresses to the "X" generic address structs,
- * as necessary.
- */
- for (i = 0; i < ACPI_FADT_CONVERSION_ENTRIES; i++) {
- target =
- ACPI_ADD_PTR(struct acpi_generic_address, &acpi_gbl_FADT,
- fadt_conversion_table[i].target);
-
- /* Expand only if the X target is null */
-
- if (!target->address) {
- acpi_tb_init_generic_address(target,
- *ACPI_ADD_PTR(u8,
- &acpi_gbl_FADT,
- fadt_conversion_table
- [i].length),
- *ACPI_ADD_PTR(u32,
- &acpi_gbl_FADT,
- fadt_conversion_table
- [i].source));
- }
- }
-
- /*
- * Calculate separate GAS structs for the PM1 Enable registers.
- * These addresses do not appear (directly) in the FADT, so it is
- * useful to calculate them once, here.
- *
- * The PM event blocks are split into two register blocks, first is the
- * PM Status Register block, followed immediately by the PM Enable Register
- * block. Each is of length (pm1_event_length/2)
- */
- pm1_register_length = (u8) ACPI_DIV_2(acpi_gbl_FADT.pm1_event_length);
-
- /* PM1A is required */
-
- acpi_tb_init_generic_address(&acpi_gbl_xpm1a_enable,
- pm1_register_length,
- (acpi_gbl_FADT.xpm1a_event_block.address +
- pm1_register_length));
-
- /* PM1B is optional; leave null if not present */
-
- if (acpi_gbl_FADT.xpm1b_event_block.address) {
- acpi_tb_init_generic_address(&acpi_gbl_xpm1b_enable,
- pm1_register_length,
- (acpi_gbl_FADT.xpm1b_event_block.
- address + pm1_register_length));
- }
-
- /* Global FADT is the new common V2.0 FADT */
-
- acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt);
-}
-
/*******************************************************************************
*
* FUNCTION: acpi_tb_install_table
*
******************************************************************************/
-static void
+void
acpi_tb_install_table(acpi_physical_address address,
u8 flags, char *signature, acpi_native_uint table_index)
{
/*******************************************************************************
*
- * FUNCTION: acpi_tb_parse_fadt
+ * FUNCTION: acpi_tb_get_root_table_entry
*
- * PARAMETERS: table_index - Index for the FADT
- * Flags - Flags
+ * PARAMETERS: table_entry - Pointer to the RSDT/XSDT table entry
+ * table_entry_size - sizeof 32 or 64 (RSDT or XSDT)
*
- * RETURN: None
+ * RETURN: Physical address extracted from the root table
+ *
+ * DESCRIPTION: Get one root table entry. Handles 32-bit and 64-bit cases on
+ * both 32-bit and 64-bit platforms
*
- * DESCRIPTION: Initialize the FADT, DSDT and FACS tables
- * (FADT contains the addresses of the DSDT and FACS)
+ * NOTE: acpi_physical_address is 32-bit on 32-bit platforms, 64-bit on
+ * 64-bit platforms.
*
******************************************************************************/
-static void acpi_tb_parse_fadt(acpi_native_uint table_index, u8 flags)
+static acpi_physical_address
+acpi_tb_get_root_table_entry(u8 * table_entry,
+ acpi_native_uint table_entry_size)
{
- u32 length;
- struct acpi_table_header *table;
+ u64 address64;
/*
- * Special case for the FADT because of multiple versions and the fact
- * that it contains pointers to both the DSDT and FACS tables.
- *
- * Get a local copy of the FADT and convert it to a common format
- * Map entire FADT, assumed to be smaller than one page.
+ * Get the table physical address (32-bit for RSDT, 64-bit for XSDT):
+ * Note: Addresses are 32-bit aligned (not 64) in both RSDT and XSDT
*/
- length = acpi_gbl_root_table_list.tables[table_index].length;
-
- table =
- acpi_os_map_memory(acpi_gbl_root_table_list.tables[table_index].
- address, length);
- if (!table) {
- return;
- }
-
- /*
- * Validate the FADT checksum before we copy the table. Ignore
- * checksum error as we want to try to get the DSDT and FACS.
- */
- (void)acpi_tb_verify_checksum(table, length);
-
- /* Copy the entire FADT locally */
-
- ACPI_MEMSET(&acpi_gbl_FADT, sizeof(struct acpi_table_fadt), 0);
-
- ACPI_MEMCPY(&acpi_gbl_FADT, table,
- ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
- acpi_os_unmap_memory(table, length);
-
- /* Convert local FADT to the common internal format */
-
- acpi_tb_convert_fadt();
+ if (table_entry_size == sizeof(u32)) {
+ /*
+ * 32-bit platform, RSDT: Return 32-bit table entry
+ * 64-bit platform, RSDT: Expand 32-bit to 64-bit and return
+ */
+ return ((acpi_physical_address)
+ (*ACPI_CAST_PTR(u32, table_entry)));
+ } else {
+ /*
+ * 32-bit platform, XSDT: Truncate 64-bit to 32-bit and return
+ * 64-bit platform, XSDT: Move (unaligned) 64-bit to local, return 64-bit
+ */
+ ACPI_MOVE_64_TO_64(&address64, table_entry);
- /* Extract the DSDT and FACS tables from the FADT */
+#if ACPI_MACHINE_WIDTH == 32
+ if (address64 > ACPI_UINT32_MAX) {
- acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,
- flags, ACPI_SIG_DSDT, ACPI_TABLE_INDEX_DSDT);
+ /* Will truncate 64-bit address to 32 bits, issue warning */
- acpi_tb_install_table((acpi_physical_address) acpi_gbl_FADT.Xfacs,
- flags, ACPI_SIG_FACS, ACPI_TABLE_INDEX_FACS);
+ ACPI_WARNING((AE_INFO,
+ "64-bit Physical Address in XSDT is too large (%8.8X%8.8X), truncating",
+ ACPI_FORMAT_UINT64(address64)));
+ }
+#endif
+ return ((acpi_physical_address) (address64));
+ }
}
/*******************************************************************************
*
******************************************************************************/
-acpi_status
+acpi_status __init
acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags)
{
struct acpi_table_rsdp *rsdp;
/* Calculate the number of tables described in the root table */
table_count =
- (table->length -
- sizeof(struct acpi_table_header)) / table_entry_size;
+ (u32) ((table->length -
+ sizeof(struct acpi_table_header)) / table_entry_size);
/*
* First two entries in the table array are reserved for the DSDT and FACS,
}
}
- /*
- * Get the table physical address (32-bit for RSDT, 64-bit for XSDT)
- */
- if ((table_entry_size == sizeof(u32)) ||
- (sizeof(acpi_physical_address) == sizeof(u32))) {
- /*
- * 32-bit platform, RSDT: Move 32-bit to 32-bit
- * 32-bit platform, XSDT: Truncate 64-bit to 32-bit
- * 64-bit platform, RSDT: Expand 32-bit to 64-bit
- *
- * Note: Addresses are 32-bit aligned in both RSDT and XSDT
- */
- acpi_gbl_root_table_list.
- tables[acpi_gbl_root_table_list.count].address =
- (acpi_physical_address) (*ACPI_CAST_PTR
- (u32, table_entry));
- } else {
- /*
- * 64-bit platform, XSDT: Move 64-bit to 64-bit
- *
- * Note: 64-bit addresses are only 32-bit aligned in the XSDT
- */
- ACPI_MOVE_64_TO_64(&acpi_gbl_root_table_list.
- tables[acpi_gbl_root_table_list.
- count].address, table_entry);
- }
+ /* Get the table physical address (32-bit for RSDT, 64-bit for XSDT) */
+
+ acpi_gbl_root_table_list.tables[acpi_gbl_root_table_list.count].
+ address =
+ acpi_tb_get_root_table_entry(table_entry, table_entry_size);
table_entry += table_entry_size;
acpi_gbl_root_table_list.count++;
return_ACPI_STATUS(AE_OK);
}
-
-/******************************************************************************
- *
- * FUNCTION: acpi_tb_map
- *
- * PARAMETERS: Address - Address to be mapped
- * Length - Length to be mapped
- * Flags - Logical or physical addressing mode
- *
- * RETURN: Pointer to mapped region
- *
- * DESCRIPTION: Maps memory according to flag
- *
- *****************************************************************************/
-
-void *acpi_tb_map(acpi_physical_address address, u32 length, u32 flags)
-{
-
- if (flags == ACPI_TABLE_ORIGIN_MAPPED) {
- return (acpi_os_map_memory(address, length));
- } else {
- return (ACPI_CAST_PTR(void, address));
- }
-}
-
-/******************************************************************************
- *
- * FUNCTION: acpi_tb_unmap
- *
- * PARAMETERS: Pointer - To mapped region
- * Length - Length to be unmapped
- * Flags - Logical or physical addressing mode
- *
- * RETURN: None
- *
- * DESCRIPTION: Unmaps memory according to flag
- *
- *****************************************************************************/
-
-void acpi_tb_unmap(void *pointer, u32 length, u32 flags)
-{
-
- if (flags == ACPI_TABLE_ORIGIN_MAPPED) {
- acpi_os_unmap_memory(pointer, length);
- }
-}
projects / linux-2.6 / blobdiff