mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-30 18:21:28 +02:00
x86: acpi: Adjust order in acpi_table.c
Rearrange the routine order a little bit, to follow the order in which ACPI table is defined in acpi_table.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Tested-by: Stefan Roese <sr@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng
parent
dfbb18bcf6
commit
ab5efd576c
@ -305,14 +305,14 @@ struct acpi_mcfg_mmconfig {
|
|||||||
/* These can be used by the target port */
|
/* These can be used by the target port */
|
||||||
|
|
||||||
void acpi_fill_header(struct acpi_table_header *header, char *signature);
|
void acpi_fill_header(struct acpi_table_header *header, char *signature);
|
||||||
unsigned long acpi_create_madt_lapics(unsigned long current);
|
|
||||||
int acpi_create_madt_ioapic(struct acpi_madt_ioapic *ioapic, u8 id, u32 addr,
|
|
||||||
u32 gsi_base);
|
|
||||||
int acpi_create_madt_irqoverride(struct acpi_madt_irqoverride *irqoverride,
|
|
||||||
u8 bus, u8 source, u32 gsirq, u16 flags);
|
|
||||||
unsigned long acpi_fill_madt(unsigned long current);
|
|
||||||
void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
|
void acpi_create_fadt(struct acpi_fadt *fadt, struct acpi_facs *facs,
|
||||||
void *dsdt);
|
void *dsdt);
|
||||||
int acpi_create_madt_lapic_nmi(struct acpi_madt_lapic_nmi *lapic_nmi, u8 cpu,
|
unsigned long acpi_create_madt_lapics(unsigned long current);
|
||||||
u16 flags, u8 lint);
|
int acpi_create_madt_ioapic(struct acpi_madt_ioapic *ioapic, u8 id,
|
||||||
|
u32 addr, u32 gsi_base);
|
||||||
|
int acpi_create_madt_irqoverride(struct acpi_madt_irqoverride *irqoverride,
|
||||||
|
u8 bus, u8 source, u32 gsirq, u16 flags);
|
||||||
|
int acpi_create_madt_lapic_nmi(struct acpi_madt_lapic_nmi *lapic_nmi,
|
||||||
|
u8 cpu, u16 flags, u8 lint);
|
||||||
|
unsigned long acpi_fill_madt(unsigned long current);
|
||||||
u32 write_acpi_tables(u32 start);
|
u32 write_acpi_tables(u32 start);
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
* Based on acpi.c from coreboot
|
* Based on acpi.c from coreboot
|
||||||
*
|
*
|
||||||
* Copyright (C) 2015, Saket Sinha <saket.sinha89@gmail.com>
|
* Copyright (C) 2015, Saket Sinha <saket.sinha89@gmail.com>
|
||||||
|
* Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -20,6 +21,81 @@
|
|||||||
*/
|
*/
|
||||||
extern const unsigned char AmlCode[];
|
extern const unsigned char AmlCode[];
|
||||||
|
|
||||||
|
static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
|
||||||
|
struct acpi_xsdt *xsdt)
|
||||||
|
{
|
||||||
|
memset(rsdp, 0, sizeof(struct acpi_rsdp));
|
||||||
|
|
||||||
|
memcpy(rsdp->signature, RSDP_SIG, 8);
|
||||||
|
memcpy(rsdp->oem_id, OEM_ID, 6);
|
||||||
|
|
||||||
|
rsdp->length = sizeof(struct acpi_rsdp);
|
||||||
|
rsdp->rsdt_address = (u32)rsdt;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Revision: ACPI 1.0: 0, ACPI 2.0/3.0/4.0: 2
|
||||||
|
*
|
||||||
|
* Some OSes expect an XSDT to be present for RSD PTR revisions >= 2.
|
||||||
|
* If we don't have an ACPI XSDT, force ACPI 1.0 (and thus RSD PTR
|
||||||
|
* revision 0)
|
||||||
|
*/
|
||||||
|
if (xsdt == NULL) {
|
||||||
|
rsdp->revision = ACPI_RSDP_REV_ACPI_1_0;
|
||||||
|
} else {
|
||||||
|
rsdp->xsdt_address = (u64)(u32)xsdt;
|
||||||
|
rsdp->revision = ACPI_RSDP_REV_ACPI_2_0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Calculate checksums */
|
||||||
|
rsdp->checksum = table_compute_checksum((void *)rsdp, 20);
|
||||||
|
rsdp->ext_checksum = table_compute_checksum((void *)rsdp,
|
||||||
|
sizeof(struct acpi_rsdp));
|
||||||
|
}
|
||||||
|
|
||||||
|
void acpi_fill_header(struct acpi_table_header *header, char *signature)
|
||||||
|
{
|
||||||
|
memcpy(header->signature, signature, 4);
|
||||||
|
memcpy(header->oem_id, OEM_ID, 6);
|
||||||
|
memcpy(header->oem_table_id, OEM_TABLE_ID, 8);
|
||||||
|
memcpy(header->aslc_id, ASLC_ID, 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void acpi_write_rsdt(struct acpi_rsdt *rsdt)
|
||||||
|
{
|
||||||
|
struct acpi_table_header *header = &(rsdt->header);
|
||||||
|
|
||||||
|
/* Fill out header fields */
|
||||||
|
acpi_fill_header(header, "RSDT");
|
||||||
|
header->length = sizeof(struct acpi_rsdt);
|
||||||
|
|
||||||
|
/* ACPI 1.0/2.0: 1, ACPI 3.0: 2, ACPI 4.0: 3 */
|
||||||
|
header->revision = ACPI_REV_ACPI_2_0;
|
||||||
|
|
||||||
|
/* Entries are filled in later, we come with an empty set */
|
||||||
|
|
||||||
|
/* Fix checksum */
|
||||||
|
header->checksum = table_compute_checksum((void *)rsdt,
|
||||||
|
sizeof(struct acpi_rsdt));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void acpi_write_xsdt(struct acpi_xsdt *xsdt)
|
||||||
|
{
|
||||||
|
struct acpi_table_header *header = &(xsdt->header);
|
||||||
|
|
||||||
|
/* Fill out header fields */
|
||||||
|
acpi_fill_header(header, "XSDT");
|
||||||
|
header->length = sizeof(struct acpi_xsdt);
|
||||||
|
|
||||||
|
/* ACPI 1.0/2.0: 1, ACPI 3.0: 2, ACPI 4.0: 3 */
|
||||||
|
header->revision = ACPI_REV_ACPI_2_0;
|
||||||
|
|
||||||
|
/* Entries are filled in later, we come with an empty set */
|
||||||
|
|
||||||
|
/* Fix checksum */
|
||||||
|
header->checksum = table_compute_checksum((void *)xsdt,
|
||||||
|
sizeof(struct acpi_xsdt));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add an ACPI table to the RSDT (and XSDT) structure, recalculate length
|
* Add an ACPI table to the RSDT (and XSDT) structure, recalculate length
|
||||||
* and checksum.
|
* and checksum.
|
||||||
@ -80,12 +156,27 @@ static void acpi_add_table(struct acpi_rsdp *rsdp, void *table)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void acpi_create_facs(struct acpi_facs *facs)
|
||||||
|
{
|
||||||
|
memset((void *)facs, 0, sizeof(struct acpi_facs));
|
||||||
|
|
||||||
|
memcpy(facs->signature, "FACS", 4);
|
||||||
|
facs->length = sizeof(struct acpi_facs);
|
||||||
|
facs->hardware_signature = 0;
|
||||||
|
facs->firmware_waking_vector = 0;
|
||||||
|
facs->global_lock = 0;
|
||||||
|
facs->flags = 0;
|
||||||
|
facs->x_firmware_waking_vector_l = 0;
|
||||||
|
facs->x_firmware_waking_vector_h = 0;
|
||||||
|
facs->version = 1;
|
||||||
|
}
|
||||||
|
|
||||||
static int acpi_create_madt_lapic(struct acpi_madt_lapic *lapic,
|
static int acpi_create_madt_lapic(struct acpi_madt_lapic *lapic,
|
||||||
u8 cpu, u8 apic)
|
u8 cpu, u8 apic)
|
||||||
{
|
{
|
||||||
lapic->type = ACPI_APIC_LAPIC; /* Local APIC structure */
|
lapic->type = ACPI_APIC_LAPIC;
|
||||||
lapic->length = sizeof(struct acpi_madt_lapic);
|
lapic->length = sizeof(struct acpi_madt_lapic);
|
||||||
lapic->flags = LOCAL_APIC_FLAG_ENABLED; /* Processor/LAPIC enabled */
|
lapic->flags = LOCAL_APIC_FLAG_ENABLED;
|
||||||
lapic->processor_id = cpu;
|
lapic->processor_id = cpu;
|
||||||
lapic->apic_id = apic;
|
lapic->apic_id = apic;
|
||||||
|
|
||||||
@ -105,11 +196,12 @@ unsigned long acpi_create_madt_lapics(unsigned long current)
|
|||||||
(struct acpi_madt_lapic *)current,
|
(struct acpi_madt_lapic *)current,
|
||||||
plat->cpu_id, plat->cpu_id);
|
plat->cpu_id, plat->cpu_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
int acpi_create_madt_ioapic(struct acpi_madt_ioapic *ioapic, u8 id, u32 addr,
|
int acpi_create_madt_ioapic(struct acpi_madt_ioapic *ioapic, u8 id,
|
||||||
u32 gsi_base)
|
u32 addr, u32 gsi_base)
|
||||||
{
|
{
|
||||||
ioapic->type = ACPI_APIC_IOAPIC;
|
ioapic->type = ACPI_APIC_IOAPIC;
|
||||||
ioapic->length = sizeof(struct acpi_madt_ioapic);
|
ioapic->length = sizeof(struct acpi_madt_ioapic);
|
||||||
@ -146,14 +238,6 @@ int acpi_create_madt_lapic_nmi(struct acpi_madt_lapic_nmi *lapic_nmi,
|
|||||||
return lapic_nmi->length;
|
return lapic_nmi->length;
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpi_fill_header(struct acpi_table_header *header, char *signature)
|
|
||||||
{
|
|
||||||
memcpy(header->signature, signature, 4);
|
|
||||||
memcpy(header->oem_id, OEM_ID, 6);
|
|
||||||
memcpy(header->oem_table_id, OEM_TABLE_ID, 8);
|
|
||||||
memcpy(header->aslc_id, ASLC_ID, 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void acpi_create_madt(struct acpi_madt *madt)
|
static void acpi_create_madt(struct acpi_madt *madt)
|
||||||
{
|
{
|
||||||
struct acpi_table_header *header = &(madt->header);
|
struct acpi_table_header *header = &(madt->header);
|
||||||
@ -223,88 +307,6 @@ static void acpi_create_mcfg(struct acpi_mcfg *mcfg)
|
|||||||
header->checksum = table_compute_checksum((void *)mcfg, header->length);
|
header->checksum = table_compute_checksum((void *)mcfg, header->length);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void acpi_create_facs(struct acpi_facs *facs)
|
|
||||||
{
|
|
||||||
memset((void *)facs, 0, sizeof(struct acpi_facs));
|
|
||||||
|
|
||||||
memcpy(facs->signature, "FACS", 4);
|
|
||||||
facs->length = sizeof(struct acpi_facs);
|
|
||||||
facs->hardware_signature = 0;
|
|
||||||
facs->firmware_waking_vector = 0;
|
|
||||||
facs->global_lock = 0;
|
|
||||||
facs->flags = 0;
|
|
||||||
facs->x_firmware_waking_vector_l = 0;
|
|
||||||
facs->x_firmware_waking_vector_h = 0;
|
|
||||||
facs->version = 1; /* ACPI 1.0: 0, ACPI 2.0/3.0: 1, ACPI 4.0: 2 */
|
|
||||||
}
|
|
||||||
|
|
||||||
static void acpi_write_rsdt(struct acpi_rsdt *rsdt)
|
|
||||||
{
|
|
||||||
struct acpi_table_header *header = &(rsdt->header);
|
|
||||||
|
|
||||||
/* Fill out header fields */
|
|
||||||
acpi_fill_header(header, "RSDT");
|
|
||||||
header->length = sizeof(struct acpi_rsdt);
|
|
||||||
|
|
||||||
/* ACPI 1.0/2.0: 1, ACPI 3.0: 2, ACPI 4.0: 3 */
|
|
||||||
header->revision = ACPI_REV_ACPI_2_0;
|
|
||||||
|
|
||||||
/* Entries are filled in later, we come with an empty set */
|
|
||||||
|
|
||||||
/* Fix checksum */
|
|
||||||
header->checksum = table_compute_checksum((void *)rsdt,
|
|
||||||
sizeof(struct acpi_rsdt));
|
|
||||||
}
|
|
||||||
|
|
||||||
static void acpi_write_xsdt(struct acpi_xsdt *xsdt)
|
|
||||||
{
|
|
||||||
struct acpi_table_header *header = &(xsdt->header);
|
|
||||||
|
|
||||||
/* Fill out header fields */
|
|
||||||
acpi_fill_header(header, "XSDT");
|
|
||||||
header->length = sizeof(struct acpi_xsdt);
|
|
||||||
|
|
||||||
/* ACPI 1.0/2.0: 1, ACPI 3.0: 2, ACPI 4.0: 3 */
|
|
||||||
header->revision = ACPI_REV_ACPI_2_0;
|
|
||||||
|
|
||||||
/* Entries are filled in later, we come with an empty set */
|
|
||||||
|
|
||||||
/* Fix checksum */
|
|
||||||
header->checksum = table_compute_checksum((void *)xsdt,
|
|
||||||
sizeof(struct acpi_xsdt));
|
|
||||||
}
|
|
||||||
|
|
||||||
static void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt,
|
|
||||||
struct acpi_xsdt *xsdt)
|
|
||||||
{
|
|
||||||
memset(rsdp, 0, sizeof(struct acpi_rsdp));
|
|
||||||
|
|
||||||
memcpy(rsdp->signature, RSDP_SIG, 8);
|
|
||||||
memcpy(rsdp->oem_id, OEM_ID, 6);
|
|
||||||
|
|
||||||
rsdp->length = sizeof(struct acpi_rsdp);
|
|
||||||
rsdp->rsdt_address = (u32)rsdt;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Revision: ACPI 1.0: 0, ACPI 2.0/3.0/4.0: 2
|
|
||||||
*
|
|
||||||
* Some OSes expect an XSDT to be present for RSD PTR revisions >= 2.
|
|
||||||
* If we don't have an ACPI XSDT, force ACPI 1.0 (and thus RSD PTR
|
|
||||||
* revision 0)
|
|
||||||
*/
|
|
||||||
if (xsdt == NULL) {
|
|
||||||
rsdp->revision = ACPI_RSDP_REV_ACPI_1_0;
|
|
||||||
} else {
|
|
||||||
rsdp->xsdt_address = (u64)(u32)xsdt;
|
|
||||||
rsdp->revision = ACPI_RSDP_REV_ACPI_2_0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Calculate checksums */
|
|
||||||
rsdp->checksum = table_compute_checksum((void *)rsdp, 20);
|
|
||||||
rsdp->ext_checksum = table_compute_checksum((void *)rsdp,
|
|
||||||
sizeof(struct acpi_rsdp));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* QEMU's version of write_acpi_tables is defined in
|
* QEMU's version of write_acpi_tables is defined in
|
||||||
* arch/x86/cpu/qemu/fw_cfg.c
|
* arch/x86/cpu/qemu/fw_cfg.c
|
||||||
@ -378,15 +380,6 @@ u32 write_acpi_tables(u32 start)
|
|||||||
acpi_create_fadt(fadt, facs, dsdt);
|
acpi_create_fadt(fadt, facs, dsdt);
|
||||||
acpi_add_table(rsdp, fadt);
|
acpi_add_table(rsdp, fadt);
|
||||||
|
|
||||||
debug("ACPI: * MCFG\n");
|
|
||||||
mcfg = (struct acpi_mcfg *)current;
|
|
||||||
acpi_create_mcfg(mcfg);
|
|
||||||
if (mcfg->header.length > sizeof(struct acpi_mcfg)) {
|
|
||||||
current += mcfg->header.length;
|
|
||||||
current = ALIGN(current, 16);
|
|
||||||
acpi_add_table(rsdp, mcfg);
|
|
||||||
}
|
|
||||||
|
|
||||||
debug("ACPI: * MADT\n");
|
debug("ACPI: * MADT\n");
|
||||||
madt = (struct acpi_madt *)current;
|
madt = (struct acpi_madt *)current;
|
||||||
acpi_create_madt(madt);
|
acpi_create_madt(madt);
|
||||||
@ -396,6 +389,15 @@ u32 write_acpi_tables(u32 start)
|
|||||||
}
|
}
|
||||||
current = ALIGN(current, 16);
|
current = ALIGN(current, 16);
|
||||||
|
|
||||||
|
debug("ACPI: * MCFG\n");
|
||||||
|
mcfg = (struct acpi_mcfg *)current;
|
||||||
|
acpi_create_mcfg(mcfg);
|
||||||
|
if (mcfg->header.length > sizeof(struct acpi_mcfg)) {
|
||||||
|
current += mcfg->header.length;
|
||||||
|
current = ALIGN(current, 16);
|
||||||
|
acpi_add_table(rsdp, mcfg);
|
||||||
|
}
|
||||||
|
|
||||||
debug("current = %x\n", current);
|
debug("current = %x\n", current);
|
||||||
|
|
||||||
debug("ACPI: done\n");
|
debug("ACPI: done\n");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user