Commit 3a87f8b6 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/afaerber/tags/ppc-for-2.0' into staging 



PowerPC queue for 2.0

* sPAPR loop fix
* SPR reset fix
* Reduce allocation size of indirect opcode tables
* Restrict number of CPU threads
* sPAPR H_SET_MODE fixes
* sPAPR firmware path fixes
* Static and constness cleanups

# gpg: Signature made Thu 20 Mar 2014 01:46:14 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/ppc-for-2.0:
  spapr: Implement interface to fix device pathname
  spapr: QOM'ify pseries machine
  spapr_vio: Fix firmware names
  spapr_llan: Add to boot device list
  qdev: Introduce FWPathProvider interface
  vl.c: Extend get_boot_devices_list() to ignore suffixes
  spapr_hcall: Fix little-endian resource handling in H_SET_MODE
  target-ppc: Introduce powerisa-207-server flag
  target-ppc: Force CPU threads count to be a power of 2
  target-ppc: Fix overallocation of opcode tables
  target-ppc: Reset SPRs on CPU reset
  spapr_hcall: Fix h_enter to loop correctly
  target-ppc: Add missing 'static' and 'const' attributes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 06c1bee8 71461b0f

hw/core/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
# core qdev-related obj files, also used by *-user:

common-obj-y += qdev.o qdev-properties.o

common-obj-y += fw-path-provider.o

# irq.o needed for qdev GPIO handling:

common-obj-y += irq.o

common-obj-y += hotplug.o

hw/core/fw-path-provider.c

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 *  Firmware patch provider class and helpers.

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; under version 2 of the License.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#include "hw/fw-path-provider.h"



char *fw_path_provider_get_dev_path(FWPathProvider *p, BusState *bus,

                                    DeviceState *dev)

{

    FWPathProviderClass *k = FW_PATH_PROVIDER_GET_CLASS(p);



    return k->get_dev_path(p, bus, dev);

}



char *fw_path_provider_try_get_dev_path(Object *o, BusState *bus,

                                        DeviceState *dev)

{

    FWPathProvider *p = (FWPathProvider *)

        object_dynamic_cast(o, TYPE_FW_PATH_PROVIDER);



    if (p) {

        return fw_path_provider_get_dev_path(p, bus, dev);

    }



    return NULL;

}



static const TypeInfo fw_path_provider_info = {

    .name          = TYPE_FW_PATH_PROVIDER,

    .parent        = TYPE_INTERFACE,

    .class_size    = sizeof(FWPathProviderClass),

};



static void fw_path_provider_register_types(void)

{

    type_register_static(&fw_path_provider_info);

}



type_init(fw_path_provider_register_types)

hw/core/qdev.c

+17 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
   this API directly.  */



#include "hw/qdev.h"

#include "hw/fw-path-provider.h"

#include "sysemu/sysemu.h"

#include "qapi/error.h"

#include "qapi/qmp/qerror.h"
@@ -570,6 +571,18 @@ static char *bus_get_fw_dev_path(BusState *bus, DeviceState *dev) 
    return NULL;

}



static char *qdev_get_fw_dev_path_from_handler(BusState *bus, DeviceState *dev)

{

    Object *obj = OBJECT(dev);

    char *d = NULL;



    while (!d && obj->parent) {

        obj = obj->parent;

        d = fw_path_provider_try_get_dev_path(obj, bus, dev);

    }

    return d;

}



static int qdev_get_fw_dev_path_helper(DeviceState *dev, char *p, int size)

{

    int l = 0;
@@ -577,7 +590,10 @@ static int qdev_get_fw_dev_path_helper(DeviceState *dev, char *p, int size) 
    if (dev && dev->parent_bus) {

        char *d;

        l = qdev_get_fw_dev_path_helper(dev->parent_bus->parent, p, size);

        d = qdev_get_fw_dev_path_from_handler(dev->parent_bus, dev);

        if (!d) {

            d = bus_get_fw_dev_path(dev->parent_bus, dev);

        }

        if (d) {

            l += snprintf(p + l, size - l, "%s", d);

            g_free(d);

hw/net/spapr_llan.c

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "hw/qdev.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/spapr_vio.h"

#include "sysemu/sysemu.h"



#include <libfdt.h>
@@ -213,6 +214,8 @@ static int spapr_vlan_init(VIOsPAPRDevice *sdev) 
                            object_get_typename(OBJECT(sdev)), sdev->qdev.id, dev);

    qemu_format_nic_info_str(qemu_get_queue(dev->nic), dev->nicconf.macaddr.a);



    add_boot_device_path(dev->nicconf.bootindex, DEVICE(dev), "");



    return 0;

}

hw/nvram/fw_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data) 
{

    size_t len;

    FWCfgState *s = container_of(n, FWCfgState, machine_ready);

    char *bootindex = get_boot_devices_list(&len);

    char *bootindex = get_boot_devices_list(&len, false);



    fw_cfg_add_file(s, "bootorder", (uint8_t*)bootindex, len);

}