soc/intel/xeon_sp/skx: Clean up FADT
Both `acpi_fill_fadt` and `soc_fill_fadt` set many FADT fields. Since the latter runs later, the values programmed in it overwrite any other values. Drop unused assignments and consolidate everything in a single function. Use `acpi_fill_fadt` as it is mandatory (no weak definition). Change-Id: Ia8248f20dae2b93426f309605bb2076592b08df4 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43386 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Maxim Polyakov <max.senia.poliak@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
e8e2e3e00d
commit
4b1b0efeda
|
@ -221,15 +221,31 @@ void generate_cpu_entries(const struct device *device)
|
||||||
acpigen_write_processor_cnot(threads_per_package);
|
acpigen_write_processor_cnot(threads_per_package);
|
||||||
}
|
}
|
||||||
|
|
||||||
void soc_fill_fadt(acpi_fadt_t *fadt)
|
void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||||
{
|
{
|
||||||
uint16_t pmbase = ACPI_BASE_ADDRESS;
|
const uint16_t pmbase = ACPI_BASE_ADDRESS;
|
||||||
|
|
||||||
|
fadt->header.revision = get_acpi_table_revision(FADT);
|
||||||
|
|
||||||
|
fadt->sci_int = acpi_sci_irq();
|
||||||
|
|
||||||
|
/* TODO: enabled SMM mode switch when SMM handlers are set up. */
|
||||||
|
if (0 && permanent_smi_handler()) {
|
||||||
|
fadt->smi_cmd = APM_CNT;
|
||||||
|
fadt->acpi_enable = APM_CNT_ACPI_ENABLE;
|
||||||
|
fadt->acpi_disable = APM_CNT_ACPI_DISABLE;
|
||||||
|
}
|
||||||
|
|
||||||
/* Power Control */
|
/* Power Control */
|
||||||
|
fadt->pm1a_evt_blk = pmbase + PM1_STS;
|
||||||
|
fadt->pm1a_cnt_blk = pmbase + PM1_CNT;
|
||||||
fadt->pm2_cnt_blk = pmbase + PM2_CNT;
|
fadt->pm2_cnt_blk = pmbase + PM2_CNT;
|
||||||
fadt->pm_tmr_blk = pmbase + PM1_TMR;
|
fadt->pm_tmr_blk = pmbase + PM1_TMR;
|
||||||
|
fadt->gpe0_blk = pmbase + GPE0_STS(0);
|
||||||
|
|
||||||
/* Control Registers - Length */
|
/* Control Registers - Length */
|
||||||
|
fadt->pm1_evt_len = 4;
|
||||||
|
fadt->pm1_cnt_len = 2;
|
||||||
fadt->pm2_cnt_len = 1;
|
fadt->pm2_cnt_len = 1;
|
||||||
fadt->pm_tmr_len = 4;
|
fadt->pm_tmr_len = 4;
|
||||||
/* There are 4 GPE0 STS/EN pairs each 32 bits wide. */
|
/* There are 4 GPE0 STS/EN pairs each 32 bits wide. */
|
||||||
|
@ -242,7 +258,7 @@ void soc_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->duty_width = 0;
|
fadt->duty_width = 0;
|
||||||
|
|
||||||
/* RTC Registers */
|
/* RTC Registers */
|
||||||
fadt->day_alrm = 0x0D;
|
fadt->day_alrm = 0x0d;
|
||||||
fadt->mon_alrm = 0x00;
|
fadt->mon_alrm = 0x00;
|
||||||
fadt->century = 0x00;
|
fadt->century = 0x00;
|
||||||
fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042;
|
fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042;
|
||||||
|
@ -302,95 +318,6 @@ void soc_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->x_gpe0_blk.addrh = 0x00;
|
fadt->x_gpe0_blk.addrh = 0x00;
|
||||||
}
|
}
|
||||||
|
|
||||||
void acpi_fill_fadt(acpi_fadt_t *fadt)
|
|
||||||
{
|
|
||||||
const uint16_t pmbase = ACPI_BASE_ADDRESS;
|
|
||||||
|
|
||||||
fadt->header.revision = get_acpi_table_revision(FADT);
|
|
||||||
|
|
||||||
fadt->sci_int = acpi_sci_irq();
|
|
||||||
|
|
||||||
/* TODO: enabled SMM mode switch when SMM handlers are set up. */
|
|
||||||
if (0 && permanent_smi_handler()) {
|
|
||||||
fadt->smi_cmd = APM_CNT;
|
|
||||||
fadt->acpi_enable = APM_CNT_ACPI_ENABLE;
|
|
||||||
fadt->acpi_disable = APM_CNT_ACPI_DISABLE;
|
|
||||||
}
|
|
||||||
|
|
||||||
fadt->pm1a_evt_blk = pmbase + PM1_STS;
|
|
||||||
fadt->pm1a_cnt_blk = pmbase + PM1_CNT;
|
|
||||||
fadt->pm2_cnt_blk = pmbase + PM2_CNT;
|
|
||||||
fadt->pm_tmr_blk = pmbase + PM1_TMR;
|
|
||||||
fadt->gpe0_blk = pmbase + GPE0_STS(0);
|
|
||||||
|
|
||||||
fadt->pm1_evt_len = 4;
|
|
||||||
fadt->pm1_cnt_len = 2;
|
|
||||||
fadt->pm2_cnt_len = 1;
|
|
||||||
fadt->pm_tmr_len = 4;
|
|
||||||
/* There are 4 GPE0 STS/EN pairs each 32 bits wide. */
|
|
||||||
fadt->gpe0_blk_len = 2 * GPE0_REG_MAX * sizeof(uint32_t);
|
|
||||||
fadt->p_lvl2_lat = 1;
|
|
||||||
fadt->p_lvl3_lat = 87;
|
|
||||||
fadt->flush_size = 1024;
|
|
||||||
fadt->flush_stride = 16;
|
|
||||||
fadt->duty_offset = 1;
|
|
||||||
fadt->duty_width = 0;
|
|
||||||
fadt->day_alrm = 0xd;
|
|
||||||
fadt->mon_alrm = 0x00;
|
|
||||||
fadt->century = 0x00;
|
|
||||||
fadt->iapc_boot_arch = ACPI_FADT_LEGACY_FREE;
|
|
||||||
if (!CONFIG(NO_FADT_8042))
|
|
||||||
fadt->iapc_boot_arch |= ACPI_FADT_8042;
|
|
||||||
|
|
||||||
fadt->flags = ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED |
|
|
||||||
ACPI_FADT_C2_MP_SUPPORTED | ACPI_FADT_SLEEP_BUTTON |
|
|
||||||
ACPI_FADT_RESET_REGISTER | ACPI_FADT_SEALED_CASE |
|
|
||||||
ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK;
|
|
||||||
|
|
||||||
fadt->reset_reg.space_id = 1;
|
|
||||||
fadt->reset_reg.bit_width = 8;
|
|
||||||
fadt->reset_reg.bit_offset = 0;
|
|
||||||
fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
|
|
||||||
fadt->reset_reg.addrl = 0xcf9;
|
|
||||||
fadt->reset_reg.addrh = 0;
|
|
||||||
fadt->reset_value = 6;
|
|
||||||
|
|
||||||
fadt->x_pm1a_evt_blk.space_id = 1;
|
|
||||||
fadt->x_pm1a_evt_blk.bit_width = fadt->pm1_evt_len * 8;
|
|
||||||
fadt->x_pm1a_evt_blk.bit_offset = 0;
|
|
||||||
fadt->x_pm1a_evt_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
|
|
||||||
fadt->x_pm1a_evt_blk.addrl = pmbase + PM1_STS;
|
|
||||||
fadt->x_pm1a_evt_blk.addrh = 0x0;
|
|
||||||
|
|
||||||
fadt->x_pm1a_cnt_blk.space_id = 1;
|
|
||||||
fadt->x_pm1a_cnt_blk.bit_width = fadt->pm1_cnt_len * 8;
|
|
||||||
fadt->x_pm1a_cnt_blk.bit_offset = 0;
|
|
||||||
fadt->x_pm1a_cnt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS;
|
|
||||||
fadt->x_pm1a_cnt_blk.addrl = pmbase + PM1_CNT;
|
|
||||||
fadt->x_pm1a_cnt_blk.addrh = 0x0;
|
|
||||||
|
|
||||||
fadt->x_pm2_cnt_blk.space_id = 1;
|
|
||||||
fadt->x_pm2_cnt_blk.bit_width = fadt->pm2_cnt_len * 8;
|
|
||||||
fadt->x_pm2_cnt_blk.bit_offset = 0;
|
|
||||||
fadt->x_pm2_cnt_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
|
|
||||||
fadt->x_pm2_cnt_blk.addrl = pmbase + PM2_CNT;
|
|
||||||
fadt->x_pm2_cnt_blk.addrh = 0x0;
|
|
||||||
|
|
||||||
fadt->x_pm_tmr_blk.space_id = 1;
|
|
||||||
fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
|
|
||||||
fadt->x_pm_tmr_blk.bit_offset = 0;
|
|
||||||
fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
|
|
||||||
fadt->x_pm_tmr_blk.addrl = pmbase + PM1_TMR;
|
|
||||||
fadt->x_pm_tmr_blk.addrh = 0x0;
|
|
||||||
|
|
||||||
fadt->x_gpe0_blk.space_id = ACPI_ADDRESS_SPACE_IO;
|
|
||||||
fadt->x_gpe0_blk.bit_width = fadt->gpe0_blk_len * 8;
|
|
||||||
fadt->x_gpe0_blk.bit_offset = 0;
|
|
||||||
fadt->x_gpe0_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
|
|
||||||
fadt->x_gpe0_blk.addrl = fadt->gpe0_blk;
|
|
||||||
fadt->x_gpe0_blk.addrh = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static acpi_tstate_t xeon_sp_tss_table[] = {
|
static acpi_tstate_t xeon_sp_tss_table[] = {
|
||||||
{ 100, 1000, 0, 0x00, 0 },
|
{ 100, 1000, 0, 0x00, 0 },
|
||||||
{ 88, 875, 0, 0x1e, 0 },
|
{ 88, 875, 0, 0x1e, 0 },
|
||||||
|
|
Loading…
Reference in New Issue