acpi: x2apic entry with uid < 255 could use processor statement

According to Intel x2apic spec page 46

" The hand-off to
OSPM will have processor IDs in the range of 0 to 254 for xAPIC/x2APIC and 0 to 255 for SAPIC declared as either Processor() or Device() objects, but not both. Processor IDs outside these ranges must be declared as Device() objects."

So only check if Device is used when acpi_id >=255.

that will help system with less 255 cpus, but some cpus apic id > 255, still can use Processor statement instead of Device() objects.

Signed-off-by Yinghai Lu <[email protected]>

---
 drivers/acpi/processor_core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/drivers/acpi/processor_core.c
===================================================================

drivers/acpi/processor_core.c +1 -1

@@ -69,7 +69,7 @@ static int map_x2apic_id(struct acpi_sub
 	if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
 		return 0;
 
-	if (device_declaration && (apic->uid == acpi_id)) {
+	if ((device_declaration || (acpi_id < 255)) && (apic->uid == acpi_id)) {
 		*apic_id = apic->local_apic_id;
 		return 1;
 	}

Quoted 11 lines · Yinghai Lu

According to Intel x2apic spec page 46

" The hand-off to
OSPM will have processor IDs in the range of 0 to 254 for xAPIC/x2APIC and 0 to 255 for SAPIC declared as either Processor() or Device() objects, but not both. Processor IDs outside these ranges must be declared as Device() objects."

So only check if Device is used when acpi_id >=255.

that will help system with less 255 cpus, but some cpus apic id > 255, still can use Processor statement instead of Device() objects.

But the entries with apic_id < 255 are supposed to use local APIC structure and not local x2apic structure. So entries with apic id < 255 must be processed using map_lapic_id() which doesn't have any device_declaration checks.

Only for apic ids > 255, we use map_x2apic_id() which needs device declaration. So this patch is not needed. or Am I missing something?

Quoted 13 lines · Suresh Siddha

Quoted 11 lines · Yinghai Lu

According to Intel x2apic spec page 46

" The hand-off to
OSPM will have processor IDs in the range of 0 to 254 for xAPIC/x2APIC and 0 to 255 for SAPIC declared as either Processor() or Device() objects, but not both. Processor IDs outside these ranges must be declared as Device() objects."

So only check if Device is used when acpi_id >=255.

that will help system with less 255 cpus, but some cpus apic id > 255, still can use Processor statement instead of Device() objects.

Quoted 7 lines

But the entries with apic_id < 255 are supposed to use local APIC structure and not local x2apic structure. So entries with apic id < 255 must be processed using map_lapic_id() which doesn't have any device_declaration checks.

Only for apic ids > 255, we use map_x2apic_id() which needs device declaration. So this patch is not needed. or Am I missing something?

it is acpi_id aka Processor id.

the system has less than 255 cpus, but some cpus apic_id > 255. BIOS have apic entries for apic_id < 255, and some x2apic entries for apic_id > 255.

but BIOS still use Processor statement for all cpus.

Quoted 23 lines · Yinghai Lu

Quoted 13 lines · Suresh Siddha

Quoted 11 lines · Yinghai Lu

According to Intel x2apic spec page 46

" The hand-off to
OSPM will have processor IDs in the range of 0 to 254 for xAPIC/x2APIC and 0 to 255 for SAPIC declared as either Processor() or Device() objects, but not both. Processor IDs outside these ranges must be declared as Device() objects."

So only check if Device is used when acpi_id >=255.

that will help system with less 255 cpus, but some cpus apic id > 255, still can use Processor statement instead of Device() objects.

Quoted 7 lines

But the entries with apic_id < 255 are supposed to use local APIC structure and not local x2apic structure. So entries with apic id < 255 must be processed using map_lapic_id() which doesn't have any device_declaration checks.

Only for apic ids > 255, we use map_x2apic_id() which needs device declaration. So this patch is not needed. or Am I missing something?

Quoted 7 lines

it is acpi_id aka Processor id.

the system has less than 255 cpus, but some cpus apic_id > 255. BIOS have apic entries for apic_id < 255, and some x2apic entries for apic_id > 255.

but BIOS still use Processor statement for all cpus.

Ok. I think there might be some confusion or mis-interpretation of the words here. You referred to x2apic spec page 46, perhaps this is an older version. Newer x2apic version leaves all the ACPI definitions to the ACPI 4.0 spec.

And here is what ACPI 4.0 spec says:

In Table5-33 for processor local x2apic structure:

ACPI Processor UID
4
12
OSPM associates the X2APIC Structure with a processor object declared in the namespace using the Device statement, when the _UID child object of the processor device evaluates to a numeric value, by matching the numeric value with this field

And in page 312:

<snip>
The platform may declare processors with IDs in the range of 0-254 for APIC/x2APIC implementations and 0-255 for SAPIC implementations using either the ASL Processor statement or the ASL Device statement but not both. Processors with IDs outside these ranges must be declared using the ASL Device statement.
</snip>

And in the above paragraph "processors with IDs" are APIC id's and not ACPI Id's.

So I think your bios need to implement ACPI device objects for the x2apic entries.