soc/amd: drop fill_fadt_extended_pm_regs
Call fill_fadt_extended_pm_io directly from the SoC's acpi_fill_fadt functions instead of calling fill_fadt_extended_pm_regs that only calls fill_fadt_extended_pm_io. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I442bc2801cf74c1d836d3b0d88f281bceb5122b8 Reviewed-on: https://review.coreboot.org/c/coreboot/+/79529 Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
b2ea2f29b8
commit
b154949004
|
@ -47,7 +47,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->pm_tmr_len = 4; /* 32 bits */
|
fadt->pm_tmr_len = 4; /* 32 bits */
|
||||||
fadt->gpe0_blk_len = 8; /* 64 bits */
|
fadt->gpe0_blk_len = 8; /* 64 bits */
|
||||||
|
|
||||||
fill_fadt_extended_pm_regs(fadt);
|
fill_fadt_extended_pm_io(fadt);
|
||||||
|
|
||||||
fadt->iapc_boot_arch = cfg->common_config.fadt_boot_arch; /* legacy free default */
|
fadt->iapc_boot_arch = cfg->common_config.fadt_boot_arch; /* legacy free default */
|
||||||
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
||||||
|
|
|
@ -93,11 +93,6 @@ void acpi_clear_pm_gpe_status(void)
|
||||||
acpi_write32(MMIO_ACPI_GPE0_STS, acpi_read32(MMIO_ACPI_GPE0_STS));
|
acpi_write32(MMIO_ACPI_GPE0_STS, acpi_read32(MMIO_ACPI_GPE0_STS));
|
||||||
}
|
}
|
||||||
|
|
||||||
void fill_fadt_extended_pm_regs(acpi_fadt_t *fadt)
|
|
||||||
{
|
|
||||||
fill_fadt_extended_pm_io(fadt);
|
|
||||||
}
|
|
||||||
|
|
||||||
int acpi_get_sleep_type(void)
|
int acpi_get_sleep_type(void)
|
||||||
{
|
{
|
||||||
return acpi_sleep_from_pm1(acpi_read16(MMIO_ACPI_PM1_CNT_BLK));
|
return acpi_sleep_from_pm1(acpi_read16(MMIO_ACPI_PM1_CNT_BLK));
|
||||||
|
|
|
@ -36,8 +36,6 @@ void acpi_pm_gpe_add_events_print_events(void);
|
||||||
/* Clear PM and GPE status registers. */
|
/* Clear PM and GPE status registers. */
|
||||||
void acpi_clear_pm_gpe_status(void);
|
void acpi_clear_pm_gpe_status(void);
|
||||||
|
|
||||||
void fill_fadt_extended_pm_regs(acpi_fadt_t *fadt);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If a system reset is about to be requested, modify the PM1 register so it
|
* If a system reset is about to be requested, modify the PM1 register so it
|
||||||
* will never be misinterpreted as an S3 resume.
|
* will never be misinterpreted as an S3 resume.
|
||||||
|
|
|
@ -39,7 +39,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->pm_tmr_len = 4; /* 32 bits */
|
fadt->pm_tmr_len = 4; /* 32 bits */
|
||||||
fadt->gpe0_blk_len = 8; /* 64 bits */
|
fadt->gpe0_blk_len = 8; /* 64 bits */
|
||||||
|
|
||||||
fill_fadt_extended_pm_regs(fadt);
|
fill_fadt_extended_pm_io(fadt);
|
||||||
|
|
||||||
fadt->iapc_boot_arch = ACPI_FADT_LEGACY_FREE; /* legacy free default */
|
fadt->iapc_boot_arch = ACPI_FADT_LEGACY_FREE; /* legacy free default */
|
||||||
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
||||||
|
|
|
@ -49,7 +49,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->pm_tmr_len = 4; /* 32 bits */
|
fadt->pm_tmr_len = 4; /* 32 bits */
|
||||||
fadt->gpe0_blk_len = 8; /* 64 bits */
|
fadt->gpe0_blk_len = 8; /* 64 bits */
|
||||||
|
|
||||||
fill_fadt_extended_pm_regs(fadt);
|
fill_fadt_extended_pm_io(fadt);
|
||||||
|
|
||||||
fadt->iapc_boot_arch = cfg->common_config.fadt_boot_arch; /* legacy free default */
|
fadt->iapc_boot_arch = cfg->common_config.fadt_boot_arch; /* legacy free default */
|
||||||
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
||||||
|
|
|
@ -48,7 +48,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->pm_tmr_len = 4; /* 32 bits */
|
fadt->pm_tmr_len = 4; /* 32 bits */
|
||||||
fadt->gpe0_blk_len = 8; /* 64 bits */
|
fadt->gpe0_blk_len = 8; /* 64 bits */
|
||||||
|
|
||||||
fill_fadt_extended_pm_regs(fadt);
|
fill_fadt_extended_pm_io(fadt);
|
||||||
|
|
||||||
fadt->iapc_boot_arch = cfg->common_config.fadt_boot_arch; /* legacy free default */
|
fadt->iapc_boot_arch = cfg->common_config.fadt_boot_arch; /* legacy free default */
|
||||||
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
||||||
|
|
|
@ -49,7 +49,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->pm_tmr_len = 4; /* 32 bits */
|
fadt->pm_tmr_len = 4; /* 32 bits */
|
||||||
fadt->gpe0_blk_len = 8; /* 64 bits */
|
fadt->gpe0_blk_len = 8; /* 64 bits */
|
||||||
|
|
||||||
fill_fadt_extended_pm_regs(fadt);
|
fill_fadt_extended_pm_io(fadt);
|
||||||
|
|
||||||
fadt->iapc_boot_arch = cfg->common_config.fadt_boot_arch; /* legacy free default */
|
fadt->iapc_boot_arch = cfg->common_config.fadt_boot_arch; /* legacy free default */
|
||||||
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
||||||
|
|
|
@ -53,7 +53,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->pm_tmr_len = 4; /* 32 bits */
|
fadt->pm_tmr_len = 4; /* 32 bits */
|
||||||
fadt->gpe0_blk_len = 8; /* 64 bits */
|
fadt->gpe0_blk_len = 8; /* 64 bits */
|
||||||
|
|
||||||
fill_fadt_extended_pm_regs(fadt);
|
fill_fadt_extended_pm_io(fadt);
|
||||||
|
|
||||||
fadt->iapc_boot_arch = cfg->fadt_boot_arch; /* legacy free default */
|
fadt->iapc_boot_arch = cfg->fadt_boot_arch; /* legacy free default */
|
||||||
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
fadt->flags |= ACPI_FADT_WBINVD | /* See table 5-34 ACPI 6.3 spec */
|
||||||
|
|
|
@ -49,7 +49,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||||
fadt->pm_tmr_len = 4; /* 32 bits */
|
fadt->pm_tmr_len = 4; /* 32 bits */
|
||||||
fadt->gpe0_blk_len = 8; /* 64 bits */
|
fadt->gpe0_blk_len = 8; /* 64 bits */
|
||||||
|
|
||||||
fill_fadt_extended_pm_regs(fadt);
|
fill_fadt_extended_pm_io(fadt);
|
||||||
|
|
||||||
fadt->duty_offset = 1; /* CLK_VAL bits 3:1 */
|
fadt->duty_offset = 1; /* CLK_VAL bits 3:1 */
|
||||||
fadt->duty_width = 3; /* CLK_VAL bits 3:1 */
|
fadt->duty_width = 3; /* CLK_VAL bits 3:1 */
|
||||||
|
|
Loading…
Reference in New Issue