OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/pxb: add numa_node parameter

Browse Source 
The pxb can be attach to and existing numa node by specifying
numa_node option that equals the desired numa nodeid.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2015-06-02 14:23:10 +03:00 committed by Michael S. Tsirkin
parent 6a3042b23b
commit 0e79e51a7d
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/i386/acpi-build.c
View File

@ -902,6 +902,7 @@ build_ssdt(GArray *table_data, GArray *linker,
if (bus) { if (bus) {
QLIST_FOREACH(bus, &bus->child, sibling) { QLIST_FOREACH(bus, &bus->child, sibling) {
uint8_t bus_num = pci_bus_num(bus); uint8_t bus_num = pci_bus_num(bus);
uint8_t numa_node = pci_bus_numa_node(bus);
/* look only for expander root buses */ /* look only for expander root buses */
if (!pci_bus_is_root(bus)) { if (!pci_bus_is_root(bus)) {
@ -918,6 +919,11 @@ build_ssdt(GArray *table_data, GArray *linker,
aml_name_decl("_UID", aml_string("PC%.02X", bus_num))); aml_name_decl("_UID", aml_string("PC%.02X", bus_num)));
aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A03"))); aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A03")));
aml_append(dev, aml_name_decl("_BBN", aml_int(bus_num))); aml_append(dev, aml_name_decl("_BBN", aml_int(bus_num)));
if (numa_node != NUMA_NODE_UNASSIGNED) {
aml_append(dev, aml_name_decl("_PXM", aml_int(numa_node)));
}
aml_append(dev, build_prt()); aml_append(dev, build_prt());
crs = build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent), crs = build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent),
io_ranges, mem_ranges); io_ranges, mem_ranges);

17
hw/pci-bridge/pci_expander_bridge.c
View File

@ -17,6 +17,7 @@
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "qemu/range.h" #include "qemu/range.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "sysemu/numa.h"
#define TYPE_PXB_BUS "pxb-bus" #define TYPE_PXB_BUS "pxb-bus"
#define PXB_BUS(obj) OBJECT_CHECK(PXBBus, (obj), TYPE_PXB_BUS) #define PXB_BUS(obj) OBJECT_CHECK(PXBBus, (obj), TYPE_PXB_BUS)
@ -38,6 +39,7 @@ typedef struct PXBDev {
/*< public >*/ /*< public >*/
uint8_t bus_nr; uint8_t bus_nr;
uint16_t numa_node;
} PXBDev; } PXBDev;
#define TYPE_PXB_HOST "pxb-host" #define TYPE_PXB_HOST "pxb-host"
@ -54,12 +56,20 @@ static bool pxb_is_root(PCIBus *bus)
return true; /* by definition */ return true; /* by definition */
} }
static uint16_t pxb_bus_numa_node(PCIBus *bus)
{
PXBDev *pxb = PXB_DEV(bus->parent_dev);
return pxb->numa_node;
}
static void pxb_bus_class_init(ObjectClass *class, void *data) static void pxb_bus_class_init(ObjectClass *class, void *data)
{ {
PCIBusClass *pbc = PCI_BUS_CLASS(class); PCIBusClass *pbc = PCI_BUS_CLASS(class);
pbc->bus_num = pxb_bus_num; pbc->bus_num = pxb_bus_num;
pbc->is_root = pxb_is_root; pbc->is_root = pxb_is_root;
pbc->numa_node = pxb_bus_numa_node;
} }
static const TypeInfo pxb_bus_info = { static const TypeInfo pxb_bus_info = {
@ -145,6 +155,12 @@ static int pxb_dev_initfn(PCIDevice *dev)
PCIBus *bus; PCIBus *bus;
const char *dev_name = NULL; const char *dev_name = NULL;
if (pxb->numa_node != NUMA_NODE_UNASSIGNED &&
pxb->numa_node >= nb_numa_nodes) {
error_report("Illegal numa node %d.", pxb->numa_node);
return -EINVAL;
}
if (dev->qdev.id && *dev->qdev.id) { if (dev->qdev.id && *dev->qdev.id) {
dev_name = dev->qdev.id; dev_name = dev->qdev.id;
} }
@ -180,6 +196,7 @@ static int pxb_dev_initfn(PCIDevice *dev)
static Property pxb_dev_properties[] = { static Property pxb_dev_properties[] = {
/* Note: 0 is not a legal a PXB bus number. */ /* Note: 0 is not a legal a PXB bus number. */
DEFINE_PROP_UINT8("bus_nr", PXBDev, bus_nr, 0), DEFINE_PROP_UINT8("bus_nr", PXBDev, bus_nr, 0),
DEFINE_PROP_UINT16("numa_node", PXBDev, numa_node, NUMA_NODE_UNASSIGNED),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };