xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Traverse Local x2APIC structures to find all processors
All checks were successful
Builds / ExectOS (i686) (push) Successful in 34s
Details
Builds / ExectOS (amd64) (push) Successful in 36s
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2024-06-07 23:05:12 +02:00
parent f36b59c961
commit 2f16f4f613
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
2 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sdk/xtdk/hltypes.h
View File

@ -68,15 +68,34 @@
#define ACPI_FADT_TIMER_24BIT 0x00800000 #define ACPI_FADT_TIMER_24BIT 0x00800000
/* ACPI MADT subtable type definitions */ /* ACPI MADT subtable type definitions */
#define ACPI_MADT_LOCAL_APIC 0 #define ACPI_MADT_TYPE_LOCAL_APIC 0
#define ACPI_MADT_IOAPIC 1 #define ACPI_MADT_TYPE_IOAPIC 1
#define ACPI_MADT_INT_OVERRIDE 2 #define ACPI_MADT_TYPE_INT_OVERRIDE 2
#define ACPI_MADT_NMI_SOURCE 3 #define ACPI_MADT_TYPE_NMI_SOURCE 3
#define ACPI_MADT_LOCAL_NMI_SOURCE 4 #define ACPI_MADT_TYPE_LOCAL_APIC_NMI 4
#define ACPI_MADT_ADDRESS_EXTENSION 5 #define ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE 5
#define ACPI_MADT_IO_SAPIC 6 #define ACPI_MADT_TYPE_IO_SAPIC 6
#define ACPI_MADT_LOCAL_SAPIC 7 #define ACPI_MADT_TYPE_LOCAL_SAPIC 7
#define ACPI_MADT_PLATFORM_INTERRUPT_SOURCE 8 #define ACPI_MADT_TYPE_INTERRUPT_SOURCE 8
#define ACPI_MADT_TYPE_LOCAL_X2APIC 9
#define ACPI_MADT_TYPE_LOCAL_X2APIC_NMI 10
#define ACPI_MADT_TYPE_GENERIC_INTERRUPT 11
#define ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR 12
#define ACPI_MADT_TYPE_GENERIC_MSI_FRAME 13
#define ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR 14
#define ACPI_MADT_TYPE_GENERIC_TRANSLATOR 15
#define ACPI_MADT_TYPE_MULTIPROC_WAKEUP 16
#define ACPI_MADT_TYPE_CORE_PIC 17
#define ACPI_MADT_TYPE_LIO_PIC 18
#define ACPI_MADT_TYPE_HT_PIC 19
#define ACPI_MADT_TYPE_EIO_PIC 20
#define ACPI_MADT_TYPE_MSI_PIC 21
#define ACPI_MADT_TYPE_BIO_PIC 22
#define ACPI_MADT_TYPE_LPC_PIC 23
#define ACPI_MADT_TYPE_RINTC 24
#define ACPI_MADT_TYPE_IMSIC 25
#define ACPI_MADT_TYPE_APLIC 26
#define ACPI_MADT_TYPE_PLIC 27
/* ACPI MADT Processor Local APIC Flags */ /* ACPI MADT Processor Local APIC Flags */
#define ACPI_MADT_PLACE_ENABLED 0 /* Processor Local APIC CPU Enabled */ #define ACPI_MADT_PLACE_ENABLED 0 /* Processor Local APIC CPU Enabled */
@ -296,13 +315,23 @@ typedef struct _ACPI_MADT
} ACPI_MADT, *PACPI_MADT; } ACPI_MADT, *PACPI_MADT;
/* ACPI Local APIC MADT subtable structure */ /* ACPI Local APIC MADT subtable structure */
typedef struct _ACPI_MADT_TABLE_LOCAL_APIC typedef struct _ACPI_MADT_LOCAL_APIC
{ {
ACPI_SUBTABLE_HEADER Header; ACPI_SUBTABLE_HEADER Header;
UCHAR ProcessorId; UCHAR ProcessorId;
UCHAR Id; UCHAR Id;
ULONG LapicFlags; ULONG LapicFlags;
} ACPI_MADT_TABLE_LOCAL_APIC, *PACPI_MADT_TABLE_LOCAL_APIC; } ACPI_MADT_LOCAL_APIC, *PACPI_MADT_LOCAL_APIC;
/* ACPI Local X2APIC MADT subtable structure */
typedef struct _ACPI_MADT_LOCAL_X2APIC
{
ACPI_SUBTABLE_HEADER Header;
USHORT Reserved;
ULONG Id;
ULONG LapicFlags;
ULONG ProcessorId;
} ACPI_MADT_LOCAL_X2APIC, *PACPI_MADT_LOCAL_X2APIC;
/* ACPI System Information structure */ /* ACPI System Information structure */
typedef struct _ACPI_SYSTEM_INFO typedef struct _ACPI_SYSTEM_INFO

21
xtoskrnl/hl/acpi.c
View File

@ -289,18 +289,31 @@ HlpInitializeAcpiSystemInformation(VOID)
while(MadtTable <= ((PUCHAR)Madt + Madt->Header.Length)) while(MadtTable <= ((PUCHAR)Madt + Madt->Header.Length))
{ {
/* Check if this is a local APIC subtable */ /* Check if this is a local APIC subtable */
if((((PACPI_MADT_TABLE_LOCAL_APIC)MadtTable)->Header.Type == ACPI_MADT_LOCAL_APIC) && if((((PACPI_MADT_LOCAL_APIC)MadtTable)->Header.Type == ACPI_MADT_TYPE_LOCAL_APIC) &&
(((PACPI_MADT_TABLE_LOCAL_APIC)MadtTable)->Header.Length == sizeof(ACPI_MADT_TABLE_LOCAL_APIC))) (((PACPI_MADT_LOCAL_APIC)MadtTable)->Header.Length == sizeof(ACPI_MADT_LOCAL_APIC)))
{ {
/* Make sure, this CPU can be enabled */ /* Make sure, this CPU can be enabled */
if(((PACPI_MADT_TABLE_LOCAL_APIC)MadtTable)->LapicFlags & ACPI_MADT_PLAOC_ENABLED) if(((PACPI_MADT_LOCAL_APIC)MadtTable)->LapicFlags & ACPI_MADT_PLAOC_ENABLED)
{ {
/* Increment number of CPUs */ /* Increment number of CPUs */
CpuCount++; CpuCount++;
} }
/* Go to the next MADT table */ /* Go to the next MADT table */
MadtTable += ((PACPI_MADT_TABLE_LOCAL_APIC)MadtTable)->Header.Length; MadtTable += ((PACPI_MADT_LOCAL_APIC)MadtTable)->Header.Length;
}
else if((((PACPI_MADT_LOCAL_X2APIC)MadtTable)->Header.Type == ACPI_MADT_TYPE_LOCAL_X2APIC) &&
(((PACPI_MADT_LOCAL_X2APIC)MadtTable)->Header.Length == sizeof(ACPI_MADT_LOCAL_X2APIC)))
{
/* Make sure, this CPU can be enabled */
if(((PACPI_MADT_LOCAL_X2APIC)MadtTable)->LapicFlags & ACPI_MADT_PLAOC_ENABLED)
{
/* Increment number of CPUs */
CpuCount++;
}
/* Go to the next MADT table */
MadtTable += ((PACPI_MADT_LOCAL_X2APIC)MadtTable)->Header.Length;
} }
else else
{ {