diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-10 09:02:06 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-10 09:19:44 -0500 |
| commit | 2ccd2bc8c3580e00c51094c5cc2b3e2ead8d35c3 (patch) | |
| tree | 4e7349b8831fee4b342a971025273d3cd042a2f9 /arch/x86/cpu/intel_common/acpi.c | |
| parent | 6662e5e406fdee26ba981dd4af3308f51f254f0a (diff) | |
| parent | f3078d4ea707931c2307a623ecf6e4d215b413d5 (diff) | |
Merge tag 'dm-pull-8feb22-take3' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
patman snake-case conversion
binman fit improvements
ACPI fixes and making MCFG available to ARM
[trini: Update scripts/pylint.base]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/x86/cpu/intel_common/acpi.c')
| -rw-r--r-- | arch/x86/cpu/intel_common/acpi.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/x86/cpu/intel_common/acpi.c b/arch/x86/cpu/intel_common/acpi.c index 15f19da2067..d94ec208f65 100644 --- a/arch/x86/cpu/intel_common/acpi.c +++ b/arch/x86/cpu/intel_common/acpi.c @@ -31,14 +31,17 @@ #include <linux/err.h> #include <power/acpi_pmc.h> -u32 acpi_fill_mcfg(u32 current) +int acpi_fill_mcfg(struct acpi_ctx *ctx) { + size_t size; + /* 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_SA_PCIEX_LENGTH >> 20) - - 1); - return current; + size = acpi_create_mcfg_mmconfig((void *)ctx->current, + CONFIG_MMCONF_BASE_ADDRESS, 0, 0, + (CONFIG_SA_PCIEX_LENGTH >> 20) - 1); + acpi_inc(ctx, size); + + return 0; } static int acpi_sci_irq(void) |