Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If _ENABLED flag of ACPI_SRAT_TYPE_CPU_AFFINITY, ACPI_SRAT_TYPE_MEMORY_AFFINITY

Browse Source 
or ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY isn't set, don't use the table.
This commit is contained in:
msaitoh 2017-08-31 08:45:03 +00:00
parent 1209ffc3a2
commit 287fff2eb1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/acpi/acpi_srat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_srat.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $ */ /* $NetBSD: acpi_srat.c,v 1.4 2017/08/31 08:45:03 msaitoh Exp $ */
/* /*
* Copyright (c) 2009 The NetBSD Foundation, Inc. * Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_srat.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $"); __KERNEL_RCSID(0, "$NetBSD: acpi_srat.c,v 1.4 2017/08/31 08:45:03 msaitoh Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kmem.h> #include <sys/kmem.h>
@ -190,6 +190,8 @@ acpisrat_parse(void)
continue; continue;
srat_cpu = (ACPI_SRAT_CPU_AFFINITY *)subtable; srat_cpu = (ACPI_SRAT_CPU_AFFINITY *)subtable;
if ((srat_cpu->Flags & ACPI_SRAT_CPU_ENABLED) == 0)
break;
nodeid = (srat_cpu->ProximityDomainHi[2] << 24) | nodeid = (srat_cpu->ProximityDomainHi[2] << 24) |
(srat_cpu->ProximityDomainHi[1] << 16) | (srat_cpu->ProximityDomainHi[1] << 16) |
(srat_cpu->ProximityDomainHi[0] << 8) | (srat_cpu->ProximityDomainHi[0] << 8) |
@ -210,6 +212,8 @@ acpisrat_parse(void)
case ACPI_SRAT_TYPE_MEMORY_AFFINITY: case ACPI_SRAT_TYPE_MEMORY_AFFINITY:
srat_mem = (ACPI_SRAT_MEM_AFFINITY *)subtable; srat_mem = (ACPI_SRAT_MEM_AFFINITY *)subtable;
nodeid = srat_mem->ProximityDomain; nodeid = srat_mem->ProximityDomain;
if ((srat_mem->Flags & ACPI_SRAT_MEM_ENABLED) == 0)
break;
mementry = mem_alloc(); mementry = mem_alloc();
if (mementry == NULL) if (mementry == NULL)
@ -224,6 +228,8 @@ acpisrat_parse(void)
case ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY: case ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY:
srat_x2apic = (ACPI_SRAT_X2APIC_CPU_AFFINITY *)subtable; srat_x2apic = (ACPI_SRAT_X2APIC_CPU_AFFINITY *)subtable;
if ((srat_x2apic->Flags & ACPI_SRAT_CPU_ENABLED) == 0)
break;
nodeid = srat_x2apic->ProximityDomain; nodeid = srat_x2apic->ProximityDomain;
/* This table entry overrides /* This table entry overrides