ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-29 15:44:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/x86: keep cpu id after resume

Browse Source 
The CPUs are woken all at once and up to now the IDs are assigned depending
on the arrival order, which is unfortunate for the resume case. Keep track
of once assigned IDs for CPUs, so that on resume the very same CPU id is given.
The APIC id is guaranteed to be fixed per CPU on suspend, but unfortunately
not dense packed.

Issue #4669
This commit is contained in:
Alexander Boettcher 2022-12-09 15:19:44 +01:00 committed by Christian Helmuth
parent 32b1aa605a
commit faf54244c4
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
repos/base-hw/src/bootstrap/spec/x86_64/platform.cc
View File

@ -7,7 +7,7 @@
*/
/*
* Copyright (C) 2015-2018 Genode Labs GmbH
* Copyright (C) 2015-2022 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU Affero General Public License version 3.
@ -64,6 +64,31 @@ static Hw::Acpi_rsdp search_rsdp(addr_t area, addr_t area_size)
}
static Genode::uint8_t apic_id()
{
X86_64_CPUID_REGISTER(Cpuid_1_ebx, 1, ebx,
struct Apic_id : Bitfield<24, 8> { };
);
return uint8_t(Cpuid_1_ebx::Apic_id::get(Cpuid_1_ebx::read()));
}
unsigned apic_to_cpu_id(Genode::uint8_t apic_id, Genode::uint8_t dense_id)
{
static Genode::uint8_t cpu_id[256] { };
static bool valid [256] { };
/* if apic_id is valid, return stored cpu_id and ignore new dense_id */
if (!valid[apic_id]) {
cpu_id[apic_id] = dense_id;
valid [apic_id] = true;
}
return cpu_id[apic_id];
}
Bootstrap::Platform::Board::Board()
:
core_mmio(Memory_region { 0, 0x1000 },
@ -292,7 +317,10 @@ unsigned Bootstrap::Platform::enable_mmu()
addr_t const stack_base = reinterpret_cast<addr_t>(&bootstrap_stack);
addr_t const this_stack = reinterpret_cast<addr_t>(&stack_base);
addr_t const cpu_id = (this_stack - stack_base) / bootstrap_stack_size;
addr_t const stack_id = (this_stack - stack_base) / bootstrap_stack_size;
/* determine dense packed cpu_id based on apic_id */
auto const cpu_id = apic_to_cpu_id(apic_id(), uint8_t(stack_id));
/* we like to use local APIC */
Cpu::IA32_apic_base::access_t lapic_msr = Cpu::IA32_apic_base::read();