mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rocker: allow user to specify rocker world by property

Browse Source 
Add property to specify rocker world. All ports will be assigned to this
world.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Jiri Pirko 2016-02-25 15:31:58 +01:00 committed by Jason Wang
parent 031143c8d5
commit 9fe7101f1d
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/net/rocker/rocker.c
View File

@ -43,6 +43,7 @@ struct rocker {
/* switch configuration */ /* switch configuration */
char *name; /* switch name */ char *name; /* switch name */
char *world_name; /* world name */
uint32_t fp_ports; /* front-panel port count */ uint32_t fp_ports; /* front-panel port count */
NICPeers *fp_ports_peers; NICPeers *fp_ports_peers;
MACAddr fp_start_macaddr; /* front-panel port 0 mac addr */ MACAddr fp_start_macaddr; /* front-panel port 0 mac addr */
@ -1286,6 +1287,18 @@ static void rocker_msix_uninit(Rocker *r)
rocker_msix_vectors_unuse(r, ROCKER_MSIX_VEC_COUNT(r->fp_ports)); rocker_msix_vectors_unuse(r, ROCKER_MSIX_VEC_COUNT(r->fp_ports));
} }
static World *rocker_world_type_by_name(Rocker *r, const char *name)
{
int i;
for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
if (strcmp(name, world_name(r->worlds[i])) == 0) {
return r->worlds[i];
}
}
return NULL;
}
static int pci_rocker_init(PCIDevice *dev) static int pci_rocker_init(PCIDevice *dev)
{ {
Rocker *r = to_rocker(dev); Rocker *r = to_rocker(dev);
@ -1297,7 +1310,6 @@ static int pci_rocker_init(PCIDevice *dev)
/* allocate worlds */ /* allocate worlds */
r->worlds[ROCKER_WORLD_TYPE_OF_DPA] = of_dpa_world_alloc(r); r->worlds[ROCKER_WORLD_TYPE_OF_DPA] = of_dpa_world_alloc(r);
r->world_dflt = r->worlds[ROCKER_WORLD_TYPE_OF_DPA];
for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) { for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
if (!r->worlds[i]) { if (!r->worlds[i]) {
@ -1306,6 +1318,19 @@ static int pci_rocker_init(PCIDevice *dev)
} }
} }
if (!r->world_name) {
r->world_name = g_strdup(world_name(r->worlds[ROCKER_WORLD_TYPE_OF_DPA]));
}
r->world_dflt = rocker_world_type_by_name(r, r->world_name);
if (!r->world_dflt) {
fprintf(stderr,
"rocker: requested world \"%s\" does not exist\n",
r->world_name);
err = -EINVAL;
goto err_world_type_by_name;
}
/* set up memory-mapped region at BAR0 */ /* set up memory-mapped region at BAR0 */
memory_region_init_io(&r->mmio, OBJECT(r), &rocker_mmio_ops, r, memory_region_init_io(&r->mmio, OBJECT(r), &rocker_mmio_ops, r,
@ -1439,6 +1464,7 @@ err_duplicate:
err_msix_init: err_msix_init:
object_unparent(OBJECT(&r->msix_bar)); object_unparent(OBJECT(&r->msix_bar));
object_unparent(OBJECT(&r->mmio)); object_unparent(OBJECT(&r->mmio));
err_world_type_by_name:
err_world_alloc: err_world_alloc:
for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) { for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
if (r->worlds[i]) { if (r->worlds[i]) {
@ -1510,6 +1536,7 @@ static void rocker_reset(DeviceState *dev)
static Property rocker_properties[] = { static Property rocker_properties[] = {
DEFINE_PROP_STRING("name", Rocker, name), DEFINE_PROP_STRING("name", Rocker, name),
DEFINE_PROP_STRING("world", Rocker, world_name),
DEFINE_PROP_MACADDR("fp_start_macaddr", Rocker, DEFINE_PROP_MACADDR("fp_start_macaddr", Rocker,
fp_start_macaddr), fp_start_macaddr),
DEFINE_PROP_UINT64("switch_id", Rocker, DEFINE_PROP_UINT64("switch_id", Rocker,