diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-18 01:11:19 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-20 18:16:31 +0200 |
| commit | defee17c670c6ec20edfea39afc751cc1c77871f (patch) | |
| tree | 79d37b18e5c0023852c0bb1255016ee2458e6c3f | |
| parent | bef400b96cbce8a4947f6b147b4030a9422c2b7f (diff) | |
x86: Make ACPI 64bit clean
Change-Id: I29eaba74185711df055cf56c23ef2bdae0c7b43e
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10578
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
| -rw-r--r-- | src/arch/x86/boot/acpi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 4090a1d71c..208411edba 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -65,11 +65,11 @@ void acpi_add_table(acpi_rsdp_t *rsdp, void *table) acpi_xsdt_t *xsdt = NULL; /* The RSDT is mandatory... */ - rsdt = (acpi_rsdt_t *)rsdp->rsdt_address; + rsdt = (acpi_rsdt_t *)(uintptr_t)rsdp->rsdt_address; /* ...while the XSDT is not. */ if (rsdp->xsdt_address) - xsdt = (acpi_xsdt_t *)((u32)rsdp->xsdt_address); + xsdt = (acpi_xsdt_t *)((uintptr_t)rsdp->xsdt_address); /* This should always be MAX_ACPI_TABLES. */ entries_num = ARRAY_SIZE(rsdt->entry); @@ -86,7 +86,7 @@ void acpi_add_table(acpi_rsdp_t *rsdp, void *table) } /* Add table to the RSDT. */ - rsdt->entry[i] = (u32)table; + rsdt->entry[i] = (uintptr_t)table; /* Fix RSDT length or the kernel will assume invalid entries. */ rsdt->header.length = sizeof(acpi_header_t) + (sizeof(u32) * (i + 1)); @@ -101,7 +101,7 @@ void acpi_add_table(acpi_rsdp_t *rsdp, void *table) */ if (xsdt) { /* Add table to the XSDT. */ - xsdt->entry[i] = (u64)(u32)table; + xsdt->entry[i] = (u64)(uintptr_t)table; /* Fix XSDT length. */ xsdt->header.length = sizeof(acpi_header_t) + @@ -299,7 +299,7 @@ static void acpi_create_tcpa(acpi_tcpa_t *tcpa) tcpa->platform_class = 0; tcpa->laml = tcpa_log_len; - tcpa->lasa = (u32) lasa; + tcpa->lasa = (uintptr_t) lasa; /* Calculate checksum. */ header->checksum = acpi_checksum((void *)tcpa, header->length); @@ -588,7 +588,7 @@ static void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, memcpy(rsdp->oem_id, oem_id, 6); rsdp->length = sizeof(acpi_rsdp_t); - rsdp->rsdt_address = (u32)rsdt; + rsdp->rsdt_address = (uintptr_t)rsdt; /* * Revision: ACPI 1.0: 0, ACPI 2.0/3.0/4.0: 2. @@ -600,7 +600,7 @@ static void acpi_write_rsdp(acpi_rsdp_t *rsdp, acpi_rsdt_t *rsdt, if (xsdt == NULL) { rsdp->revision = 0; } else { - rsdp->xsdt_address = (u64)(u32)xsdt; + rsdp->xsdt_address = (u64)(uintptr_t)xsdt; rsdp->revision = 2; } |