|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH RFC 06/20] acpi/hvmloader: Collect processor and NUMA info in hvmloader
No need for ACPI code to rely on hvm_info.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
---
tools/firmware/hvmloader/acpi/acpi2_0.h | 13 +++++++++
tools/firmware/hvmloader/acpi/build.c | 49 +++++++++++++++++----------------
tools/firmware/hvmloader/util.c | 11 ++++++++
3 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h
b/tools/firmware/hvmloader/acpi/acpi2_0.h
index 2617762..c52315a 100644
--- a/tools/firmware/hvmloader/acpi/acpi2_0.h
+++ b/tools/firmware/hvmloader/acpi/acpi2_0.h
@@ -20,6 +20,7 @@
#include <stdint.h>
#include <xen/xen.h>
#include <xen/hvm/ioreq.h>
+#include <xen/memory.h>
#define ASCII32(a,b,c,d) \
(((a) << 0) | ((b) << 8) | ((c) << 16) | ((d) << 24))
@@ -473,6 +474,14 @@ struct acpi_info {
uint64_t pci_hi_min, pci_hi_len; /* 24, 32 - PCI I/O hole boundaries */
};
+struct acpi_numa {
+ uint32_t nr_vmemranges;
+ uint32_t nr_vnodes;
+ unsigned int *vcpu_to_vnode;
+ unsigned int *vdistance;
+ xen_vmemrange_t *vmemrange;
+};
+
struct acpi_config {
unsigned char *dsdt_anycpu;
int dsdt_anycpu_len;
@@ -485,6 +494,10 @@ struct acpi_config {
unsigned long acpi_pt_addr;
uint32_t acpi_pt_length;
} pt;
+ uint32_t nr_vcpus;
+ uint8_t *vcpu_online;
+ int apic_mode;
+ struct acpi_numa numa;
};
void acpi_build_tables(struct acpi_config *config, unsigned int physical);
diff --git a/tools/firmware/hvmloader/acpi/build.c
b/tools/firmware/hvmloader/acpi/build.c
index 8a05c7c..1bccca3 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -56,7 +56,7 @@ static void set_checksum(
p[checksum_offset] = -sum;
}
-static struct acpi_20_madt *construct_madt(struct acpi_info *info)
+static struct acpi_20_madt *construct_madt(struct acpi_config *config)
{
struct acpi_20_madt *madt;
struct acpi_20_madt_intsrcovr *intsrcovr;
@@ -120,7 +120,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_info
*info)
io_apic->ioapic_addr = IOAPIC_BASE_ADDRESS;
lapic = (struct acpi_20_madt_lapic *)(io_apic + 1);
- info->madt_lapic0_addr = (uint32_t)lapic;
+ config->acpi_info.madt_lapic0_addr = (uint32_t)lapic;
for ( i = 0; i < nr_processor_objects; i++ )
{
memset(lapic, 0, sizeof(*lapic));
@@ -129,8 +129,8 @@ static struct acpi_20_madt *construct_madt(struct acpi_info
*info)
/* Processor ID must match processor-object IDs in the DSDT. */
lapic->acpi_processor_id = i;
lapic->apic_id = LAPIC_ID(i);
- lapic->flags = ((i < hvm_info->nr_vcpus) &&
- test_bit(i, hvm_info->vcpu_online)
+ lapic->flags = ((i < config->nr_vcpus) &&
+ test_bit(i, config->vcpu_online)
? ACPI_LOCAL_APIC_ENABLED : 0);
lapic++;
}
@@ -138,7 +138,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_info
*info)
madt->header.length = (unsigned char *)lapic - (unsigned char *)madt;
set_checksum(madt, offsetof(struct acpi_header, checksum),
madt->header.length);
- info->madt_csum_addr = (uint32_t)&madt->header.checksum;
+ config->acpi_info.madt_csum_addr = (uint32_t)&madt->header.checksum;
return madt;
}
@@ -181,7 +181,7 @@ static struct acpi_20_waet *construct_waet(void)
return waet;
}
-static struct acpi_20_srat *construct_srat(void)
+static struct acpi_20_srat *construct_srat(struct acpi_config *config)
{
struct acpi_20_srat *srat;
struct acpi_20_srat_processor *processor;
@@ -190,8 +190,8 @@ static struct acpi_20_srat *construct_srat(void)
void *p;
unsigned int i;
- size = sizeof(*srat) + sizeof(*processor) * hvm_info->nr_vcpus +
- sizeof(*memory) * nr_vmemranges;
+ size = sizeof(*srat) + sizeof(*processor) * config->nr_vcpus +
+ sizeof(*memory) * config->numa.nr_vmemranges;
p = mem_alloc(size, 16);
if ( !p )
@@ -208,25 +208,26 @@ static struct acpi_20_srat *construct_srat(void)
srat->table_revision = ACPI_SRAT_TABLE_REVISION;
processor = (struct acpi_20_srat_processor *)(srat + 1);
- for ( i = 0; i < hvm_info->nr_vcpus; i++ )
+ for ( i = 0; i < config->nr_vcpus; i++ )
{
processor->type = ACPI_PROCESSOR_AFFINITY;
processor->length = sizeof(*processor);
- processor->domain = vcpu_to_vnode[i];
+ processor->domain = config->numa.vcpu_to_vnode[i];
processor->apic_id = LAPIC_ID(i);
processor->flags = ACPI_LOCAL_APIC_AFFIN_ENABLED;
processor++;
}
memory = (struct acpi_20_srat_memory *)processor;
- for ( i = 0; i < nr_vmemranges; i++ )
+ for ( i = 0; i < config->numa.nr_vmemranges; i++ )
{
memory->type = ACPI_MEMORY_AFFINITY;
memory->length = sizeof(*memory);
- memory->domain = vmemrange[i].nid;
+ memory->domain = config->numa.vmemrange[i].nid;
memory->flags = ACPI_MEM_AFFIN_ENABLED;
- memory->base_address = vmemrange[i].start;
- memory->mem_length = vmemrange[i].end - vmemrange[i].start;
+ memory->base_address = config->numa.vmemrange[i].start;
+ memory->mem_length = config->numa.vmemrange[i].end -
+ config->numa.vmemrange[i].start;
memory++;
}
@@ -238,12 +239,12 @@ static struct acpi_20_srat *construct_srat(void)
return srat;
}
-static struct acpi_20_slit *construct_slit(void)
+static struct acpi_20_slit *construct_slit(struct acpi_config *config)
{
struct acpi_20_slit *slit;
unsigned int i, num, size;
- num = nr_vnodes * nr_vnodes;
+ num = config->numa.nr_vnodes * config->numa.nr_vnodes;
size = sizeof(*slit) + num * sizeof(uint8_t);
slit = mem_alloc(size, 16);
@@ -260,9 +261,9 @@ static struct acpi_20_slit *construct_slit(void)
slit->header.creator_revision = ACPI_CREATOR_REVISION;
for ( i = 0; i < num; i++ )
- slit->entry[i] = vdistance[i];
+ slit->entry[i] = config->numa.vdistance[i];
- slit->localities = nr_vnodes;
+ slit->localities = config->numa.nr_vnodes;
slit->header.length = size;
set_checksum(slit, offsetof(struct acpi_header, checksum), size);
@@ -322,9 +323,9 @@ static int construct_secondary_tables(unsigned long
*table_ptrs,
void *lasa;
/* MADT. */
- if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode )
+ if ( (config->nr_vcpus > 1) || config->apic_mode )
{
- madt = construct_madt(&config->acpi_info);
+ madt = construct_madt(config);
if (!madt) return -1;
table_ptrs[nr_tables++] = (unsigned long)madt;
}
@@ -406,10 +407,10 @@ static int construct_secondary_tables(unsigned long
*table_ptrs,
}
/* SRAT and SLIT */
- if ( nr_vnodes > 0 )
+ if ( config->numa.nr_vnodes > 0 )
{
- struct acpi_20_srat *srat = construct_srat();
- struct acpi_20_slit *slit = construct_slit();
+ struct acpi_20_srat *srat = construct_srat(config);
+ struct acpi_20_slit *slit = construct_slit(config);
if ( srat )
table_ptrs[nr_tables++] = (unsigned long)srat;
@@ -485,7 +486,7 @@ void acpi_build_tables(struct acpi_config *config, unsigned
int physical)
* The latter is required for Windows 2000, which experiences a BSOD of
* KMODE_EXCEPTION_NOT_HANDLED if it sees more than 15 processor objects.
*/
- if ( hvm_info->nr_vcpus <= 15 && config->dsdt_15cpu)
+ if ( config->nr_vcpus <= 15 && config->dsdt_15cpu)
{
dsdt = mem_alloc(config->dsdt_15cpu_len, 16);
if (!dsdt) goto oom;
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 230e14a..b56f4e6 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -21,6 +21,7 @@
#include "config.h"
#include "hypercall.h"
#include "ctype.h"
+#include "vnuma.h"
#include "acpi/acpi2_0.h"
#include <stdint.h>
#include <xen/xen.h>
@@ -910,6 +911,16 @@ void hvmloader_acpi_build_tables(struct acpi_config
*config,
if ( !strncmp(xenstore_read("platform/acpi_s4", "1"), "1", 1) )
config->table_flags |= ACPI_BUILD_SSDT_S4;
+ config->nr_vcpus = hvm_info->nr_vcpus;
+ config->vcpu_online = hvm_info->vcpu_online;
+ config->apic_mode = 1;
+
+ config->numa.nr_vmemranges = nr_vmemranges;
+ config->numa.nr_vnodes = nr_vnodes;
+ config->numa.vcpu_to_vnode = vcpu_to_vnode;
+ config->numa.vdistance = vdistance;
+ config->numa.vmemrange = vmemrange;
+
acpi_build_tables(config, physical);
hvm_param_set(HVM_PARAM_VM_GENERATION_ID_ADDR,
config->acpi_info.vm_gid_addr);
--
2.4.3
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |