Hudson: Port to 64bit
Bring http://review.coreboot.org/#/c/10582/ to Hudson Change-Id: I1ba3047699c304a769215fe901dc3511bf23199d Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: http://review.coreboot.org/11022 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
parent
77a1d1adae
commit
fce128cdfb
|
@ -59,8 +59,16 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
|
||||||
memcpy(header->asl_compiler_id, ASLC, 4);
|
memcpy(header->asl_compiler_id, ASLC, 4);
|
||||||
header->asl_compiler_revision = 0;
|
header->asl_compiler_revision = 0;
|
||||||
|
|
||||||
fadt->firmware_ctrl = (u32) facs;
|
if ((uintptr_t)facs > 0xffffffff)
|
||||||
fadt->dsdt = (u32) dsdt;
|
printk(BIOS_DEBUG, "ACPI: FACS lives above 4G\n");
|
||||||
|
else
|
||||||
|
fadt->firmware_ctrl = (uintptr_t)facs;
|
||||||
|
|
||||||
|
if ((uintptr_t)dsdt > 0xffffffff)
|
||||||
|
printk(BIOS_DEBUG, "ACPI: DSDT lives above 4G\n");
|
||||||
|
else
|
||||||
|
fadt->dsdt = (uintptr_t)dsdt;
|
||||||
|
|
||||||
fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
|
fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
|
||||||
fadt->preferred_pm_profile = FADT_PM_PROFILE;
|
fadt->preferred_pm_profile = FADT_PM_PROFILE;
|
||||||
fadt->sci_int = 9; /* HUDSON - IRQ 09 – ACPI SCI */
|
fadt->sci_int = 9; /* HUDSON - IRQ 09 – ACPI SCI */
|
||||||
|
@ -138,10 +146,11 @@ void acpi_create_fadt(acpi_fadt_t * fadt, acpi_facs_t * facs, void *dsdt)
|
||||||
fadt->res4 = 0; /* reserved, MUST be 0 ACPI 3.0 */
|
fadt->res4 = 0; /* reserved, MUST be 0 ACPI 3.0 */
|
||||||
fadt->res5 = 0; /* reserved, MUST be 0 ACPI 3.0 */
|
fadt->res5 = 0; /* reserved, MUST be 0 ACPI 3.0 */
|
||||||
|
|
||||||
fadt->x_firmware_ctl_l = 0; /* set to 0 if firmware_ctrl is used */
|
|
||||||
fadt->x_firmware_ctl_h = 0;
|
fadt->x_firmware_ctl_l = ((uintptr_t)facs) & 0xffffffff;
|
||||||
fadt->x_dsdt_l = (u32) dsdt;
|
fadt->x_firmware_ctl_h = ((uint64_t)(uintptr_t)facs) >> 32;
|
||||||
fadt->x_dsdt_h = 0;
|
fadt->x_dsdt_l = ((uintptr_t)dsdt) & 0xffffffff;
|
||||||
|
fadt->x_dsdt_h = ((uint64_t)(uintptr_t)dsdt) >> 32;
|
||||||
|
|
||||||
fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
|
fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
|
||||||
fadt->x_pm1a_evt_blk.bit_width = 32;
|
fadt->x_pm1a_evt_blk.bit_width = 32;
|
||||||
|
|
|
@ -49,7 +49,7 @@ static int bus_claimed = 0;
|
||||||
#define AMD_SB_SPI_TX_LEN 8
|
#define AMD_SB_SPI_TX_LEN 8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static u32 spibar;
|
static uintptr_t spibar;
|
||||||
|
|
||||||
static inline uint8_t spi_read(uint8_t reg)
|
static inline uint8_t spi_read(uint8_t reg)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue