[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.0 13/13] spapr: Implement interface to fix devi
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL for-2.0 13/13] spapr: Implement interface to fix device pathname |
Date: |
Thu, 20 Mar 2014 02:48:55 +0100 |
From: Alexey Kardashevskiy <address@hidden>
This extends the pseries machine type with the interface to fix firmware
pathnames for devices which have @bootindex property.
This fixes SCSI disks' device node names (which are wildcard nodes in
the device-tree), for spapr-vscsi, virtio-scsi and usb-storage.
This fixes PHB name from "pci" to "address@hidden" where XXXX is a BUID as
there is no bus on top of sPAPRPHBState where PHB firmware name could
be fixed using the BusClass::get_fw_dev_path() mechanism.
This stores the boot list in the /chosen/qemu,boot-list property of
the device tree. "\n" are replaced by spaces to support OF1275.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ppc/spapr.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 84 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 170e083..a11e121 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -26,6 +26,7 @@
*/
#include "sysemu/sysemu.h"
#include "hw/hw.h"
+#include "hw/fw-path-provider.h"
#include "elf.h"
#include "net/net.h"
#include "sysemu/blockdev.h"
@@ -45,6 +46,8 @@
#include "hw/pci/msi.h"
#include "hw/pci/pci.h"
+#include "hw/scsi/scsi.h"
+#include "hw/virtio/virtio-scsi.h"
#include "exec/address-spaces.h"
#include "hw/usb.h"
@@ -600,7 +603,9 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr,
hwaddr rtas_addr,
hwaddr rtas_size)
{
- int ret;
+ int ret, i;
+ size_t cb = 0;
+ char *bootlist;
void *fdt;
sPAPRPHBState *phb;
@@ -642,6 +647,21 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr,
fprintf(stderr, "Couldn't finalize CPU device tree properties\n");
}
+ bootlist = get_boot_devices_list(&cb, true);
+ if (cb && bootlist) {
+ int offset = fdt_path_offset(fdt, "/chosen");
+ if (offset < 0) {
+ exit(1);
+ }
+ for (i = 0; i < cb; i++) {
+ if (bootlist[i] == '\n') {
+ bootlist[i] = ' ';
+ }
+
+ }
+ ret = fdt_setprop_string(fdt, offset, "qemu,boot-list", bootlist);
+ }
+
if (!spapr->has_graphics) {
spapr_populate_chosen_stdout(fdt, spapr->vio_bus);
}
@@ -1412,11 +1432,70 @@ static QEMUMachine spapr_machine = {
.kvm_type = spapr_kvm_type,
};
+/*
+ * Implementation of an interface to adjust firmware patch
+ * for the bootindex property handling.
+ */
+static char *spapr_get_fw_dev_path(FWPathProvider *p, BusState *bus,
+ DeviceState *dev)
+{
+#define CAST(type, obj, name) \
+ ((type *)object_dynamic_cast(OBJECT(obj), (name)))
+ SCSIDevice *d = CAST(SCSIDevice, dev, TYPE_SCSI_DEVICE);
+ sPAPRPHBState *phb = CAST(sPAPRPHBState, dev, TYPE_SPAPR_PCI_HOST_BRIDGE);
+
+ if (d) {
+ void *spapr = CAST(void, bus->parent, "spapr-vscsi");
+ VirtIOSCSI *virtio = CAST(VirtIOSCSI, bus->parent, TYPE_VIRTIO_SCSI);
+ USBDevice *usb = CAST(USBDevice, bus->parent, TYPE_USB_DEVICE);
+
+ if (spapr) {
+ /*
+ * Replace "address@hidden/address@hidden,0" with "address@hidden":
+ * We use SRP luns of the form 8000 | (bus << 8) | (id << 5) | lun
+ * in the top 16 bits of the 64-bit LUN
+ */
+ unsigned id = 0x8000 | (d->id << 8) | d->lun;
+ return g_strdup_printf("address@hidden"PRIX64, qdev_fw_name(dev),
+ (uint64_t)id << 48);
+ } else if (virtio) {
+ /*
+ * We use SRP luns of the form 01000000 | (target << 8) | lun
+ * in the top 32 bits of the 64-bit LUN
+ * Note: the quote above is from SLOF and it is wrong,
+ * the actual binding is:
+ * swap 0100 or 10 << or 20 << ( target lun-id -- srplun )
+ */
+ unsigned id = 0x1000000 | (d->id << 16) | d->lun;
+ return g_strdup_printf("address@hidden"PRIX64, qdev_fw_name(dev),
+ (uint64_t)id << 32);
+ } else if (usb) {
+ /*
+ * We use SRP luns of the form 01000000 | (usb-port << 16) | lun
+ * in the top 32 bits of the 64-bit LUN
+ */
+ unsigned usb_port = atoi(usb->port->path);
+ unsigned id = 0x1000000 | (usb_port << 16) | d->lun;
+ return g_strdup_printf("address@hidden"PRIX64, qdev_fw_name(dev),
+ (uint64_t)id << 32);
+ }
+ }
+
+ if (phb) {
+ /* Replace "pci" with "address@hidden" */
+ return g_strdup_printf("address@hidden"PRIX64, phb->buid);
+ }
+
+ return NULL;
+}
+
static void spapr_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ FWPathProviderClass *fwc = FW_PATH_PROVIDER_CLASS(oc);
mc->qemu_machine = data;
+ fwc->get_dev_path = spapr_get_fw_dev_path;
}
static const TypeInfo spapr_machine_info = {
@@ -1424,6 +1503,10 @@ static const TypeInfo spapr_machine_info = {
.parent = TYPE_MACHINE,
.class_init = spapr_machine_class_init,
.class_data = &spapr_machine,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_FW_PATH_PROVIDER },
+ { }
+ },
};
static void spapr_machine_register_types(void)
--
1.8.4.5
- [Qemu-devel] [PULL for-2.0 07/13] spapr_hcall: Fix little-endian resource handling in H_SET_MODE, (continued)
- [Qemu-devel] [PULL for-2.0 07/13] spapr_hcall: Fix little-endian resource handling in H_SET_MODE, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 09/13] qdev: Introduce FWPathProvider interface, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 04/13] target-ppc: Fix overallocation of opcode tables, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 10/13] spapr_llan: Add to boot device list, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 08/13] vl.c: Extend get_boot_devices_list() to ignore suffixes, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 01/13] target-ppc: Add missing 'static' and 'const' attributes, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 05/13] target-ppc: Force CPU threads count to be a power of 2, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 02/13] spapr_hcall: Fix h_enter to loop correctly, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 11/13] spapr_vio: Fix firmware names, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 12/13] spapr: QOM'ify pseries machine, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 13/13] spapr: Implement interface to fix device pathname,
Andreas Färber <=
- Re: [Qemu-devel] [PULL for-2.0-rc1 00/13] PowerPC patch queue 2014-03-20 #2, Peter Maydell, 2014/03/20