ACPI: Have common acpi_fill_mcfg()
As long as there is only one PCI segment we do not need more complicated MCFG generation. Change-Id: Ic2a8e84383883039bb7f994227e2e425366f9e13 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50666 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Kyösti Mälkki
parent
9ae922abf7
commit
b54388df63
|
|
@ -263,6 +263,13 @@ void acpi_create_madt(acpi_madt_t *madt)
|
|||
header->checksum = acpi_checksum((void *)madt, header->length);
|
||||
}
|
||||
|
||||
static unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
return current;
|
||||
}
|
||||
|
||||
/* MCFG is defined in the PCI Firmware Specification 3.0. */
|
||||
void acpi_create_mcfg(acpi_mcfg_t *mcfg)
|
||||
{
|
||||
|
|
@ -284,7 +291,8 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg)
|
|||
header->length = sizeof(acpi_mcfg_t);
|
||||
header->revision = get_acpi_table_revision(MCFG);
|
||||
|
||||
current = acpi_fill_mcfg(current);
|
||||
if (CONFIG(MMCONF_SUPPORT))
|
||||
current = acpi_fill_mcfg(current);
|
||||
|
||||
/* (Re)calculate length and checksum. */
|
||||
header->length = current - (unsigned long)mcfg;
|
||||
|
|
|
|||
|
|
@ -1217,7 +1217,6 @@ unsigned long fw_cfg_acpi_tables(unsigned long start);
|
|||
/* These are implemented by the target port or north/southbridge. */
|
||||
unsigned long write_acpi_tables(unsigned long addr);
|
||||
unsigned long acpi_fill_madt(unsigned long current);
|
||||
unsigned long acpi_fill_mcfg(unsigned long current);
|
||||
unsigned long acpi_fill_ivrs_ioapic(acpi_ivrs_t *ivrs, unsigned long current);
|
||||
void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id);
|
||||
void acpi_write_bert(acpi_bert_t *bert, uintptr_t region, size_t length);
|
||||
|
|
|
|||
|
|
@ -12,11 +12,3 @@ void mainboard_fill_fadt(acpi_fadt_t *fadt)
|
|||
fadt->acpi_enable = 0;
|
||||
fadt->acpi_disable = 0;
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0,
|
||||
CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
return current;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,12 +9,6 @@
|
|||
|
||||
#include "e7505.h"
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
/* Just a dummy */
|
||||
return current;
|
||||
}
|
||||
|
||||
static void mch_domain_read_resources(struct device *dev)
|
||||
{
|
||||
int idx;
|
||||
|
|
|
|||
|
|
@ -11,14 +11,6 @@
|
|||
|
||||
#include "gm45.h"
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
||||
static unsigned long acpi_fill_dmar(unsigned long current)
|
||||
{
|
||||
const struct device *dev;
|
||||
|
|
|
|||
|
|
@ -9,14 +9,6 @@
|
|||
#include "haswell.h"
|
||||
#include <southbridge/intel/lynxpoint/pch.h>
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
||||
static unsigned long acpi_fill_dmar(unsigned long current)
|
||||
{
|
||||
struct device *const igfx_dev = pcidev_on_root(2, 0);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ bootblock-y += bootblock.c
|
|||
ramstage-y += memmap.c
|
||||
ramstage-y += northbridge.c
|
||||
ramstage-y += gma.c
|
||||
ramstage-y += acpi.c
|
||||
|
||||
romstage-y += romstage.c
|
||||
romstage-y += memmap.c
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <acpi/acpi.h>
|
||||
#include <acpi/acpigen.h>
|
||||
#include <device/device.h>
|
||||
#include "i945.h"
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
|
@ -9,8 +9,6 @@ ramstage-y += northbridge.c
|
|||
ramstage-y += smi.c
|
||||
ramstage-y += gma.c
|
||||
|
||||
ramstage-y += acpi.c
|
||||
|
||||
romstage-y += memmap.c
|
||||
romstage-y += raminit.c
|
||||
romstage-y += raminit_tables.c
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <acpi/acpi.h>
|
||||
#include "ironlake.h"
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
|
@ -8,7 +8,6 @@ bootblock-y += bootblock.c
|
|||
ramstage-y += memmap.c
|
||||
ramstage-y += northbridge.c
|
||||
ramstage-y += gma.c
|
||||
ramstage-y += acpi.c
|
||||
|
||||
romstage-y += romstage.c
|
||||
romstage-y += memmap.c
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <acpi/acpigen.h>
|
||||
#include <acpi/acpi.h>
|
||||
#include <device/device.h>
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
|
@ -9,14 +9,6 @@
|
|||
#include "sandybridge.h"
|
||||
#include <southbridge/intel/bd82x6x/pch.h>
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
||||
static unsigned long acpi_create_igfx_rmrr(const unsigned long current)
|
||||
{
|
||||
const u32 base_mask = ~(u32)(MiB - 1);
|
||||
|
|
|
|||
|
|
@ -6,14 +6,6 @@
|
|||
#include <device/device.h>
|
||||
#include "x4x.h"
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
||||
unsigned long northbridge_write_acpi_tables(const struct device *device,
|
||||
unsigned long start,
|
||||
struct acpi_rsdp *rsdp)
|
||||
|
|
|
|||
|
|
@ -17,18 +17,6 @@ unsigned long southbridge_write_acpi_tables(const struct device *device,
|
|||
return acpi_write_hpet(device, current, rsdp);
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS,
|
||||
0,
|
||||
0,
|
||||
CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_madt_irqoverride(unsigned long current)
|
||||
{
|
||||
const struct soc_amd_common_config *cfg = soc_get_common_config();
|
||||
|
|
|
|||
|
|
@ -86,13 +86,6 @@ int acpi_sci_irq(void)
|
|||
return sci_irq;
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
return current;
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_madt(unsigned long current)
|
||||
{
|
||||
/* Local APICs */
|
||||
|
|
|
|||
|
|
@ -108,13 +108,6 @@ int acpi_sci_irq(void)
|
|||
return sci_irq;
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
return current;
|
||||
}
|
||||
|
||||
static acpi_tstate_t soc_tss_table[] = {
|
||||
{ 100, 1000, 0, 0x00, 0 },
|
||||
{ 88, 875, 0, 0x1e, 0 },
|
||||
|
|
|
|||
|
|
@ -21,14 +21,6 @@
|
|||
#include <soc/systemagent.h>
|
||||
#include <soc/intel/broadwell/chip.h>
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0,
|
||||
CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
return current;
|
||||
}
|
||||
|
||||
static unsigned long acpi_fill_dmar(unsigned long current)
|
||||
{
|
||||
struct device *const igfx_dev = pcidev_path_on_root(SA_DEVFN_IGD);
|
||||
|
|
|
|||
|
|
@ -23,15 +23,6 @@
|
|||
|
||||
#define CPUID_6_EAX_ISST (1 << 7)
|
||||
|
||||
__attribute__((weak)) unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
/* PCI Segment Group 0, Start Bus Number 0, End Bus Number is 255 */
|
||||
current += acpi_create_mcfg_mmconfig((void *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0,
|
||||
CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
return current;
|
||||
}
|
||||
|
||||
static int acpi_sci_irq(void)
|
||||
{
|
||||
int sci_irq = 9;
|
||||
|
|
|
|||
|
|
@ -81,15 +81,6 @@ acpi_cstate_t *soc_get_cstate_map(size_t *entries)
|
|||
return cstate_map;
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
/* PCI Segment Group 0, Start Bus Number 0, End Bus Number is 255 */
|
||||
current += acpi_create_mcfg_mmconfig((void *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0,
|
||||
CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
return current;
|
||||
}
|
||||
|
||||
void soc_fill_fadt(acpi_fadt_t *fadt)
|
||||
{
|
||||
u16 pmbase = get_pmbase();
|
||||
|
|
|
|||
|
|
@ -10,11 +10,6 @@ unsigned long acpi_fill_madt(unsigned long current)
|
|||
return current;
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
return current;
|
||||
}
|
||||
|
||||
void acpi_fill_fadt(acpi_fadt_t *fadt)
|
||||
{
|
||||
struct device *dev = pcidev_on_root(PCI_DEVICE_NUMBER_QNC_LPC,
|
||||
|
|
|
|||
|
|
@ -318,14 +318,6 @@ static const char *lpc_acpi_name(const struct device *dev)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
||||
static void lpc_final(struct device *dev)
|
||||
{
|
||||
if (!acpi_is_wakeup_s3()) {
|
||||
|
|
|
|||
|
|
@ -121,14 +121,6 @@ static void lpc_init(struct device *dev)
|
|||
printk(BIOS_DEBUG, "SB800 - Late.c - %s - End.\n", __func__);
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS, 0, 0, CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
|
||||
return current;
|
||||
}
|
||||
|
||||
static const char *lpc_acpi_name(const struct device *dev)
|
||||
{
|
||||
if (dev->path.type != DEVICE_PATH_PCI)
|
||||
|
|
|
|||
|
|
@ -318,16 +318,6 @@ static void hudson_lpc_enable_resources(struct device *dev)
|
|||
hudson_lpc_enable_childrens_resources(dev);
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
|
||||
CONFIG_MMCONF_BASE_ADDRESS,
|
||||
0,
|
||||
0,
|
||||
CONFIG_MMCONF_BUS_NUMBER - 1);
|
||||
return current;
|
||||
}
|
||||
|
||||
static const char *lpc_acpi_name(const struct device *dev)
|
||||
{
|
||||
if (dev->path.type != DEVICE_PATH_PCI)
|
||||
|
|
|
|||
|
|
@ -38,9 +38,3 @@ void generate_cpu_entries(const struct device *device)
|
|||
}
|
||||
acpigen_pop_len();
|
||||
}
|
||||
|
||||
unsigned long acpi_fill_mcfg(unsigned long current)
|
||||
{
|
||||
/* chipset doesn't have mmconfig */
|
||||
return current;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue