2009-12-05 14:44:27 +03:00
|
|
|
/*
|
|
|
|
* QEMU S390 virtio target
|
|
|
|
*
|
|
|
|
* Copyright (c) 2009 Alexander Graf <agraf@suse.de>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library 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
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2013-01-25 04:16:39 +04:00
|
|
|
#include "hw/hw.h"
|
2014-10-07 15:59:18 +04:00
|
|
|
#include "sysemu/block-backend.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-01-25 04:16:39 +04:00
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/loader.h"
|
2009-12-05 14:44:27 +03:00
|
|
|
#include "elf.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/virtio/virtio.h"
|
|
|
|
#include "hw/virtio/virtio-rng.h"
|
|
|
|
#include "hw/virtio/virtio-serial.h"
|
|
|
|
#include "hw/virtio/virtio-net.h"
|
2013-03-29 05:08:16 +04:00
|
|
|
#include "hw/virtio/vhost-scsi.h"
|
2009-12-05 14:44:27 +03:00
|
|
|
#include "hw/sysbus.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/kvm.h"
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2013-01-25 04:16:39 +04:00
|
|
|
#include "hw/s390x/s390-virtio-bus.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/virtio/virtio-bus.h"
|
2009-12-05 14:44:27 +03:00
|
|
|
|
|
|
|
/* #define DEBUG_S390 */
|
|
|
|
|
|
|
|
#ifdef DEBUG_S390
|
2013-07-29 16:16:37 +04:00
|
|
|
#define DPRINTF(fmt, ...) \
|
2009-12-05 14:44:27 +03:00
|
|
|
do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
|
|
|
|
#else
|
2013-07-29 16:16:37 +04:00
|
|
|
#define DPRINTF(fmt, ...) \
|
2009-12-05 14:44:27 +03:00
|
|
|
do { } while (0)
|
|
|
|
#endif
|
|
|
|
|
2015-05-29 09:15:29 +03:00
|
|
|
#define VIRTIO_S390_QUEUE_MAX 64
|
|
|
|
|
2013-08-23 22:25:57 +04:00
|
|
|
static void virtio_s390_bus_new(VirtioBusState *bus, size_t bus_size,
|
|
|
|
VirtIOS390Device *dev);
|
2013-04-24 12:21:18 +04:00
|
|
|
|
2012-05-02 11:00:20 +04:00
|
|
|
static const TypeInfo s390_virtio_bus_info = {
|
|
|
|
.name = TYPE_S390_VIRTIO_BUS,
|
|
|
|
.parent = TYPE_BUS,
|
|
|
|
.instance_size = sizeof(VirtIOS390Bus),
|
2009-12-05 14:44:27 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static ram_addr_t s390_virtio_device_num_vq(VirtIOS390Device *dev);
|
|
|
|
|
2011-04-13 12:55:11 +04:00
|
|
|
/* length of VirtIO device pages */
|
2012-10-23 14:30:10 +04:00
|
|
|
const hwaddr virtio_size = S390_DEVICE_PAGES * TARGET_PAGE_SIZE;
|
2011-04-13 12:55:11 +04:00
|
|
|
|
2012-04-23 03:52:21 +04:00
|
|
|
static void s390_virtio_bus_reset(void *opaque)
|
|
|
|
{
|
|
|
|
VirtIOS390Bus *bus = opaque;
|
|
|
|
bus->next_ring = bus->dev_page + TARGET_PAGE_SIZE;
|
|
|
|
}
|
|
|
|
|
2012-04-26 13:03:36 +04:00
|
|
|
void s390_virtio_reset_idx(VirtIOS390Device *dev)
|
|
|
|
{
|
|
|
|
int i;
|
2012-10-23 14:30:10 +04:00
|
|
|
hwaddr idx_addr;
|
2012-04-26 13:03:36 +04:00
|
|
|
uint8_t num_vq;
|
|
|
|
|
|
|
|
num_vq = s390_virtio_device_num_vq(dev);
|
|
|
|
for (i = 0; i < num_vq; i++) {
|
|
|
|
idx_addr = virtio_queue_get_avail_addr(dev->vdev, i) +
|
|
|
|
VIRTIO_VRING_AVAIL_IDX_OFFS;
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
address_space_stw(&address_space_memory, idx_addr, 0,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL);
|
2015-05-04 16:27:25 +03:00
|
|
|
idx_addr = virtio_queue_get_avail_addr(dev->vdev, i) +
|
|
|
|
virtio_queue_get_avail_size(dev->vdev, i);
|
|
|
|
address_space_stw(&address_space_memory, idx_addr, 0,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL);
|
2012-04-26 13:03:36 +04:00
|
|
|
idx_addr = virtio_queue_get_used_addr(dev->vdev, i) +
|
|
|
|
VIRTIO_VRING_USED_IDX_OFFS;
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
address_space_stw(&address_space_memory, idx_addr, 0,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL);
|
2015-05-04 16:27:25 +03:00
|
|
|
idx_addr = virtio_queue_get_used_addr(dev->vdev, i) +
|
|
|
|
virtio_queue_get_used_size(dev->vdev, i);
|
|
|
|
address_space_stw(&address_space_memory, idx_addr, 0,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL);
|
2012-04-26 13:03:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-05 14:44:27 +03:00
|
|
|
VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size)
|
|
|
|
{
|
|
|
|
VirtIOS390Bus *bus;
|
|
|
|
BusState *_bus;
|
|
|
|
DeviceState *dev;
|
|
|
|
|
|
|
|
/* Create bridge device */
|
|
|
|
dev = qdev_create(NULL, "s390-virtio-bridge");
|
|
|
|
qdev_init_nofail(dev);
|
|
|
|
|
|
|
|
/* Create bus on bridge device */
|
|
|
|
|
2012-05-02 11:00:20 +04:00
|
|
|
_bus = qbus_create(TYPE_S390_VIRTIO_BUS, dev, "s390-virtio");
|
2009-12-05 14:44:27 +03:00
|
|
|
bus = DO_UPCAST(VirtIOS390Bus, bus, _bus);
|
|
|
|
|
|
|
|
bus->dev_page = *ram_size;
|
|
|
|
bus->dev_offs = bus->dev_page;
|
|
|
|
bus->next_ring = bus->dev_page + TARGET_PAGE_SIZE;
|
|
|
|
|
2010-08-23 20:58:34 +04:00
|
|
|
/* Enable hotplugging */
|
2014-09-26 16:37:30 +04:00
|
|
|
qbus_set_hotplug_handler(_bus, dev, &error_abort);
|
2010-08-23 20:58:34 +04:00
|
|
|
|
2009-12-05 14:44:27 +03:00
|
|
|
/* Allocate RAM for VirtIO device pages (descriptors, queues, rings) */
|
|
|
|
*ram_size += S390_DEVICE_PAGES * TARGET_PAGE_SIZE;
|
|
|
|
|
2012-04-23 03:52:21 +04:00
|
|
|
qemu_register_reset(s390_virtio_bus_reset, bus);
|
2009-12-05 14:44:27 +03:00
|
|
|
return bus;
|
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:36 +03:00
|
|
|
static void s390_virtio_device_init(VirtIOS390Device *dev,
|
|
|
|
VirtIODevice *vdev)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
|
|
|
VirtIOS390Bus *bus;
|
|
|
|
int dev_len;
|
|
|
|
|
|
|
|
bus = DO_UPCAST(VirtIOS390Bus, bus, dev->qdev.parent_bus);
|
|
|
|
dev->vdev = vdev;
|
|
|
|
dev->dev_offs = bus->dev_offs;
|
|
|
|
dev->feat_len = sizeof(uint32_t); /* always keep 32 bits features */
|
|
|
|
|
|
|
|
dev_len = VIRTIO_DEV_OFFS_CONFIG;
|
|
|
|
dev_len += s390_virtio_device_num_vq(dev) * VIRTIO_VQCONFIG_LEN;
|
|
|
|
dev_len += dev->feat_len * 2;
|
2013-04-24 12:21:20 +04:00
|
|
|
dev_len += virtio_bus_get_vdev_config_len(&dev->bus);
|
2009-12-05 14:44:27 +03:00
|
|
|
|
|
|
|
bus->dev_offs += dev_len;
|
|
|
|
|
|
|
|
s390_virtio_device_sync(dev);
|
2012-04-26 13:03:36 +04:00
|
|
|
s390_virtio_reset_idx(dev);
|
2010-08-23 20:58:34 +04:00
|
|
|
if (dev->qdev.hotplugged) {
|
2014-03-11 16:19:43 +04:00
|
|
|
s390_virtio_irq(VIRTIO_PARAM_DEV_ADD, dev->dev_offs);
|
2010-08-23 20:58:34 +04:00
|
|
|
}
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
static void s390_virtio_net_realize(VirtIOS390Device *s390_dev, Error **errp)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
2013-05-15 16:12:50 +04:00
|
|
|
DeviceState *qdev = DEVICE(s390_dev);
|
2013-04-11 18:29:59 +04:00
|
|
|
VirtIONetS390 *dev = VIRTIO_NET_S390(s390_dev);
|
|
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
2015-02-27 16:55:37 +03:00
|
|
|
Error *err = NULL;
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2013-05-15 16:12:50 +04:00
|
|
|
virtio_net_set_netclient_name(&dev->vdev, qdev->id,
|
|
|
|
object_get_typename(OBJECT(qdev)));
|
2013-04-11 18:29:59 +04:00
|
|
|
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
2015-02-27 16:55:37 +03:00
|
|
|
object_property_set_bool(OBJECT(vdev), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:36 +03:00
|
|
|
s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));
|
2013-04-11 18:29:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void s390_virtio_net_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VirtIONetS390 *dev = VIRTIO_NET_S390(obj);
|
2014-09-30 10:10:38 +04:00
|
|
|
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
|
|
TYPE_VIRTIO_NET);
|
2014-10-07 12:00:22 +04:00
|
|
|
object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
|
|
|
|
"bootindex", &error_abort);
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
static void s390_virtio_blk_realize(VirtIOS390Device *s390_dev, Error **errp)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
2013-03-18 20:37:24 +04:00
|
|
|
VirtIOBlkS390 *dev = VIRTIO_BLK_S390(s390_dev);
|
|
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
2015-02-27 16:55:37 +03:00
|
|
|
Error *err = NULL;
|
|
|
|
|
2013-03-18 20:37:24 +04:00
|
|
|
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
2015-02-27 16:55:37 +03:00
|
|
|
object_property_set_bool(OBJECT(vdev), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
2015-02-27 16:55:36 +03:00
|
|
|
s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));
|
2013-03-18 20:37:24 +04:00
|
|
|
}
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2013-03-18 20:37:24 +04:00
|
|
|
static void s390_virtio_blk_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VirtIOBlkS390 *dev = VIRTIO_BLK_S390(obj);
|
2014-09-30 10:10:38 +04:00
|
|
|
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
|
|
TYPE_VIRTIO_BLK);
|
2014-06-10 11:03:20 +04:00
|
|
|
object_property_add_alias(obj, "iothread", OBJECT(&dev->vdev),"iothread",
|
|
|
|
&error_abort);
|
2014-10-07 12:00:32 +04:00
|
|
|
object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
|
|
|
|
"bootindex", &error_abort);
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
static void s390_virtio_serial_realize(VirtIOS390Device *s390_dev, Error **errp)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
2013-04-09 16:53:32 +04:00
|
|
|
VirtIOSerialS390 *dev = VIRTIO_SERIAL_S390(s390_dev);
|
|
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
|
|
|
DeviceState *qdev = DEVICE(s390_dev);
|
2015-02-27 16:55:37 +03:00
|
|
|
Error *err = NULL;
|
2009-12-05 14:44:27 +03:00
|
|
|
VirtIOS390Bus *bus;
|
2013-04-30 18:08:50 +04:00
|
|
|
char *bus_name;
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2013-04-09 16:53:32 +04:00
|
|
|
bus = DO_UPCAST(VirtIOS390Bus, bus, qdev->parent_bus);
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2013-04-30 18:08:50 +04:00
|
|
|
/*
|
|
|
|
* For command line compatibility, this sets the virtio-serial-device bus
|
|
|
|
* name as before.
|
|
|
|
*/
|
|
|
|
if (qdev->id) {
|
|
|
|
bus_name = g_strdup_printf("%s.0", qdev->id);
|
|
|
|
virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name);
|
|
|
|
g_free(bus_name);
|
|
|
|
}
|
|
|
|
|
2013-04-09 16:53:32 +04:00
|
|
|
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
2015-02-27 16:55:37 +03:00
|
|
|
object_property_set_bool(OBJECT(vdev), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:36 +03:00
|
|
|
s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));
|
|
|
|
bus->console = s390_dev;
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2013-04-09 16:53:32 +04:00
|
|
|
static void s390_virtio_serial_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VirtIOSerialS390 *dev = VIRTIO_SERIAL_S390(obj);
|
2014-09-30 10:10:38 +04:00
|
|
|
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
|
|
TYPE_VIRTIO_SERIAL);
|
2013-04-09 16:53:32 +04:00
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
static void s390_virtio_scsi_realize(VirtIOS390Device *s390_dev, Error **errp)
|
2011-02-11 11:40:59 +03:00
|
|
|
{
|
2013-03-21 18:15:16 +04:00
|
|
|
VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(s390_dev);
|
|
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
2013-04-30 18:08:51 +04:00
|
|
|
DeviceState *qdev = DEVICE(s390_dev);
|
2015-02-27 16:55:37 +03:00
|
|
|
Error *err = NULL;
|
2013-04-30 18:08:51 +04:00
|
|
|
char *bus_name;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For command line compatibility, this sets the virtio-scsi-device bus
|
|
|
|
* name as before.
|
|
|
|
*/
|
|
|
|
if (qdev->id) {
|
|
|
|
bus_name = g_strdup_printf("%s.0", qdev->id);
|
|
|
|
virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name);
|
|
|
|
g_free(bus_name);
|
|
|
|
}
|
2011-02-11 11:40:59 +03:00
|
|
|
|
2013-03-21 18:15:16 +04:00
|
|
|
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
2015-02-27 16:55:37 +03:00
|
|
|
object_property_set_bool(OBJECT(vdev), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
2011-02-11 11:40:59 +03:00
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:36 +03:00
|
|
|
s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));
|
2013-03-21 18:15:16 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void s390_virtio_scsi_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(obj);
|
2014-09-30 10:10:38 +04:00
|
|
|
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
|
|
TYPE_VIRTIO_SCSI);
|
2011-02-11 11:40:59 +03:00
|
|
|
}
|
|
|
|
|
2013-03-29 05:08:16 +04:00
|
|
|
#ifdef CONFIG_VHOST_SCSI
|
2015-02-27 16:55:37 +03:00
|
|
|
static void s390_vhost_scsi_realize(VirtIOS390Device *s390_dev, Error **errp)
|
2013-03-29 05:08:16 +04:00
|
|
|
{
|
|
|
|
VHostSCSIS390 *dev = VHOST_SCSI_S390(s390_dev);
|
|
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
2015-02-27 16:55:37 +03:00
|
|
|
Error *err = NULL;
|
2013-03-29 05:08:16 +04:00
|
|
|
|
|
|
|
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
2015-02-27 16:55:37 +03:00
|
|
|
object_property_set_bool(OBJECT(vdev), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
2013-03-29 05:08:16 +04:00
|
|
|
}
|
|
|
|
|
2015-02-27 16:55:36 +03:00
|
|
|
s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));
|
2013-03-29 05:08:16 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void s390_vhost_scsi_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VHostSCSIS390 *dev = VHOST_SCSI_S390(obj);
|
2014-09-30 10:10:38 +04:00
|
|
|
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
|
|
TYPE_VHOST_SCSI);
|
2013-03-29 05:08:16 +04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-04-24 12:07:57 +04:00
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
static void s390_virtio_rng_realize(VirtIOS390Device *s390_dev, Error **errp)
|
2012-06-20 10:59:32 +04:00
|
|
|
{
|
2013-04-24 12:07:57 +04:00
|
|
|
VirtIORNGS390 *dev = VIRTIO_RNG_S390(s390_dev);
|
|
|
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
2015-02-27 16:55:37 +03:00
|
|
|
Error *err = NULL;
|
2012-06-20 10:59:32 +04:00
|
|
|
|
2013-04-24 12:07:57 +04:00
|
|
|
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
2015-02-27 16:55:37 +03:00
|
|
|
object_property_set_bool(OBJECT(vdev), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
2012-06-20 10:59:32 +04:00
|
|
|
}
|
|
|
|
|
2013-04-24 12:07:57 +04:00
|
|
|
object_property_set_link(OBJECT(dev),
|
2013-05-31 22:12:48 +04:00
|
|
|
OBJECT(dev->vdev.conf.rng), "rng",
|
2013-04-24 12:07:57 +04:00
|
|
|
NULL);
|
|
|
|
|
2015-02-27 16:55:36 +03:00
|
|
|
s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev));
|
2013-04-24 12:07:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void s390_virtio_rng_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
VirtIORNGS390 *dev = VIRTIO_RNG_S390(obj);
|
2014-09-30 10:10:38 +04:00
|
|
|
|
|
|
|
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
|
|
|
|
TYPE_VIRTIO_RNG);
|
2014-10-29 13:17:19 +03:00
|
|
|
object_property_add_alias(obj, "rng", OBJECT(&dev->vdev),
|
|
|
|
"rng", &error_abort);
|
2012-06-20 10:59:32 +04:00
|
|
|
}
|
|
|
|
|
2009-12-05 14:44:27 +03:00
|
|
|
static uint64_t s390_virtio_device_vq_token(VirtIOS390Device *dev, int vq)
|
|
|
|
{
|
|
|
|
ram_addr_t token_off;
|
|
|
|
|
|
|
|
token_off = (dev->dev_offs + VIRTIO_DEV_OFFS_CONFIG) +
|
|
|
|
(vq * VIRTIO_VQCONFIG_LEN) +
|
|
|
|
VIRTIO_VQCONFIG_OFFS_TOKEN;
|
|
|
|
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
return address_space_ldq_be(&address_space_memory, token_off,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL);
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static ram_addr_t s390_virtio_device_num_vq(VirtIOS390Device *dev)
|
|
|
|
{
|
|
|
|
VirtIODevice *vdev = dev->vdev;
|
|
|
|
int num_vq;
|
|
|
|
|
2015-05-29 09:15:29 +03:00
|
|
|
for (num_vq = 0; num_vq < VIRTIO_S390_QUEUE_MAX; num_vq++) {
|
2009-12-05 14:44:27 +03:00
|
|
|
if (!virtio_queue_get_num(vdev, num_vq)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return num_vq;
|
|
|
|
}
|
|
|
|
|
|
|
|
static ram_addr_t s390_virtio_next_ring(VirtIOS390Bus *bus)
|
|
|
|
{
|
|
|
|
ram_addr_t r = bus->next_ring;
|
|
|
|
|
|
|
|
bus->next_ring += VIRTIO_RING_LEN;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2010-04-01 20:42:40 +04:00
|
|
|
void s390_virtio_device_sync(VirtIOS390Device *dev)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
|
|
|
VirtIOS390Bus *bus = DO_UPCAST(VirtIOS390Bus, bus, dev->qdev.parent_bus);
|
|
|
|
ram_addr_t cur_offs;
|
|
|
|
uint8_t num_vq;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
virtio_reset(dev->vdev);
|
|
|
|
|
|
|
|
/* Sync dev space */
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
address_space_stb(&address_space_memory,
|
|
|
|
dev->dev_offs + VIRTIO_DEV_OFFS_TYPE,
|
|
|
|
dev->vdev->device_id,
|
|
|
|
MEMTXATTRS_UNSPECIFIED,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
address_space_stb(&address_space_memory,
|
|
|
|
dev->dev_offs + VIRTIO_DEV_OFFS_NUM_VQ,
|
|
|
|
s390_virtio_device_num_vq(dev),
|
|
|
|
MEMTXATTRS_UNSPECIFIED,
|
|
|
|
NULL);
|
|
|
|
address_space_stb(&address_space_memory,
|
|
|
|
dev->dev_offs + VIRTIO_DEV_OFFS_FEATURE_LEN,
|
|
|
|
dev->feat_len,
|
|
|
|
MEMTXATTRS_UNSPECIFIED,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
address_space_stb(&address_space_memory,
|
|
|
|
dev->dev_offs + VIRTIO_DEV_OFFS_CONFIG_LEN,
|
|
|
|
dev->vdev->config_len,
|
|
|
|
MEMTXATTRS_UNSPECIFIED,
|
|
|
|
NULL);
|
2009-12-05 14:44:27 +03:00
|
|
|
|
|
|
|
num_vq = s390_virtio_device_num_vq(dev);
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
address_space_stb(&address_space_memory,
|
|
|
|
dev->dev_offs + VIRTIO_DEV_OFFS_NUM_VQ, num_vq,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL);
|
2009-12-05 14:44:27 +03:00
|
|
|
|
|
|
|
/* Sync virtqueues */
|
|
|
|
for (i = 0; i < num_vq; i++) {
|
|
|
|
ram_addr_t vq = (dev->dev_offs + VIRTIO_DEV_OFFS_CONFIG) +
|
|
|
|
(i * VIRTIO_VQCONFIG_LEN);
|
|
|
|
ram_addr_t vring;
|
|
|
|
|
|
|
|
vring = s390_virtio_next_ring(bus);
|
|
|
|
virtio_queue_set_addr(dev->vdev, i, vring);
|
|
|
|
virtio_queue_set_vector(dev->vdev, i, i);
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
address_space_stq_be(&address_space_memory,
|
|
|
|
vq + VIRTIO_VQCONFIG_OFFS_ADDRESS, vring,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL);
|
|
|
|
address_space_stw_be(&address_space_memory,
|
|
|
|
vq + VIRTIO_VQCONFIG_OFFS_NUM,
|
|
|
|
virtio_queue_get_num(dev->vdev, i),
|
|
|
|
MEMTXATTRS_UNSPECIFIED,
|
|
|
|
NULL);
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
cur_offs = dev->dev_offs;
|
|
|
|
cur_offs += VIRTIO_DEV_OFFS_CONFIG;
|
|
|
|
cur_offs += num_vq * VIRTIO_VQCONFIG_LEN;
|
|
|
|
|
|
|
|
/* Sync feature bitmap */
|
2015-05-26 17:34:47 +03:00
|
|
|
address_space_stl_le(&address_space_memory, cur_offs,
|
|
|
|
dev->vdev->host_features,
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL);
|
2009-12-05 14:44:27 +03:00
|
|
|
|
|
|
|
dev->feat_offs = cur_offs + dev->feat_len;
|
|
|
|
cur_offs += dev->feat_len * 2;
|
|
|
|
|
|
|
|
/* Sync config space */
|
2013-04-24 12:21:20 +04:00
|
|
|
virtio_bus_get_vdev_config(&dev->bus, dev->vdev->config);
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2011-04-10 20:23:39 +04:00
|
|
|
cpu_physical_memory_write(cur_offs,
|
|
|
|
dev->vdev->config, dev->vdev->config_len);
|
2009-12-05 14:44:27 +03:00
|
|
|
cur_offs += dev->vdev->config_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
void s390_virtio_device_update_status(VirtIOS390Device *dev)
|
|
|
|
{
|
|
|
|
VirtIODevice *vdev = dev->vdev;
|
|
|
|
uint32_t features;
|
|
|
|
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
virtio_set_status(vdev,
|
|
|
|
address_space_ldub(&address_space_memory,
|
|
|
|
dev->dev_offs + VIRTIO_DEV_OFFS_STATUS,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL));
|
2009-12-05 14:44:27 +03:00
|
|
|
|
|
|
|
/* Update guest supported feature bitmap */
|
|
|
|
|
Switch non-CPU callers from ld/st*_phys to address_space_ld/st*
Switch all the uses of ld/st*_phys to address_space_ld/st*,
except for those cases where the address space is the CPU's
(ie cs->as). This was done with the following script which
generates a Coccinelle patch.
A few over-80-columns lines in the result were rewrapped by
hand where Coccinelle failed to do the wrapping automatically,
as well as one location where it didn't put a line-continuation
'\' when wrapping lines on a change made to a match inside
a macro definition.
===begin===
#!/bin/sh -e
# Usage:
# ./ldst-phys.spatch.sh > ldst-phys.spatch
# spatch -sp_file ldst-phys.spatch -dir . | sed -e '/^+/s/\t/ /g' > out.patch
# patch -p1 < out.patch
for FN in ub uw_le uw_be l_le l_be q_le q_be uw l q; do
cat <<EOF
@ cpu_matches_ld_${FN} @
expression E1,E2;
identifier as;
@@
ld${FN}_phys(E1->as,E2)
@ other_matches_ld_${FN} depends on !cpu_matches_ld_${FN} @
expression E1,E2;
@@
-ld${FN}_phys(E1,E2)
+address_space_ld${FN}(E1,E2, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
for FN in b w_le w_be l_le l_be q_le q_be w l q; do
cat <<EOF
@ cpu_matches_st_${FN} @
expression E1,E2,E3;
identifier as;
@@
st${FN}_phys(E1->as,E2,E3)
@ other_matches_st_${FN} depends on !cpu_matches_st_${FN} @
expression E1,E2,E3;
@@
-st${FN}_phys(E1,E2,E3)
+address_space_st${FN}(E1,E2,E3, MEMTXATTRS_UNSPECIFIED, NULL)
EOF
done
===endit===
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
2015-04-26 18:49:24 +03:00
|
|
|
features = bswap32(address_space_ldl_be(&address_space_memory,
|
|
|
|
dev->feat_offs,
|
|
|
|
MEMTXATTRS_UNSPECIFIED, NULL));
|
2011-11-24 16:28:52 +04:00
|
|
|
virtio_set_features(vdev, features);
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Find a device by vring address */
|
|
|
|
VirtIOS390Device *s390_virtio_bus_find_vring(VirtIOS390Bus *bus,
|
|
|
|
ram_addr_t mem,
|
|
|
|
int *vq_num)
|
|
|
|
{
|
2011-12-24 01:34:39 +04:00
|
|
|
BusChild *kid;
|
2009-12-05 14:44:27 +03:00
|
|
|
int i;
|
|
|
|
|
2011-12-24 01:34:39 +04:00
|
|
|
QTAILQ_FOREACH(kid, &bus->bus.children, sibling) {
|
|
|
|
VirtIOS390Device *dev = (VirtIOS390Device *)kid->child;
|
|
|
|
|
2015-05-29 09:15:29 +03:00
|
|
|
for (i = 0; i < VIRTIO_S390_QUEUE_MAX; i++) {
|
2011-12-24 01:34:39 +04:00
|
|
|
if (!virtio_queue_get_addr(dev->vdev, i))
|
2009-12-05 14:44:27 +03:00
|
|
|
break;
|
2011-12-24 01:34:39 +04:00
|
|
|
if (virtio_queue_get_addr(dev->vdev, i) == mem) {
|
2009-12-05 14:44:27 +03:00
|
|
|
if (vq_num) {
|
|
|
|
*vq_num = i;
|
|
|
|
}
|
2011-12-24 01:34:39 +04:00
|
|
|
return dev;
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find a device by device descriptor location */
|
|
|
|
VirtIOS390Device *s390_virtio_bus_find_mem(VirtIOS390Bus *bus, ram_addr_t mem)
|
|
|
|
{
|
2011-12-24 01:34:39 +04:00
|
|
|
BusChild *kid;
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2011-12-24 01:34:39 +04:00
|
|
|
QTAILQ_FOREACH(kid, &bus->bus.children, sibling) {
|
|
|
|
VirtIOS390Device *dev = (VirtIOS390Device *)kid->child;
|
|
|
|
if (dev->dev_offs == mem) {
|
|
|
|
return dev;
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-12-17 15:01:07 +04:00
|
|
|
/* DeviceState to VirtIOS390Device. Note: used on datapath,
|
|
|
|
* be careful and test performance if you change this.
|
|
|
|
*/
|
|
|
|
static inline VirtIOS390Device *to_virtio_s390_device_fast(DeviceState *d)
|
|
|
|
{
|
|
|
|
return container_of(d, VirtIOS390Device, qdev);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* DeviceState to VirtIOS390Device. TODO: use QOM. */
|
|
|
|
static inline VirtIOS390Device *to_virtio_s390_device(DeviceState *d)
|
|
|
|
{
|
|
|
|
return container_of(d, VirtIOS390Device, qdev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void virtio_s390_notify(DeviceState *d, uint16_t vector)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
2012-12-17 15:01:07 +04:00
|
|
|
VirtIOS390Device *dev = to_virtio_s390_device_fast(d);
|
2009-12-05 14:44:27 +03:00
|
|
|
uint64_t token = s390_virtio_device_vq_token(dev, vector);
|
|
|
|
|
2014-03-11 16:19:43 +04:00
|
|
|
s390_virtio_irq(0, token);
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2015-05-29 09:15:30 +03:00
|
|
|
static void virtio_s390_device_plugged(DeviceState *d, Error **errp)
|
|
|
|
{
|
|
|
|
VirtIOS390Device *dev = to_virtio_s390_device(d);
|
|
|
|
VirtIODevice *vdev = virtio_bus_get_device(&dev->bus);
|
|
|
|
int n = virtio_get_num_queues(vdev);
|
|
|
|
|
|
|
|
if (n > VIRTIO_S390_QUEUE_MAX) {
|
|
|
|
error_setg(errp, "The nubmer of virtqueues %d "
|
|
|
|
"exceeds s390 limit %d", n,
|
|
|
|
VIRTIO_S390_QUEUE_MAX);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-05 14:44:27 +03:00
|
|
|
/**************** S390 Virtio Bus Device Descriptions *******************/
|
|
|
|
|
2011-12-22 06:57:49 +04:00
|
|
|
static void s390_virtio_net_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 07:34:16 +04:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
|
2011-12-22 06:57:49 +04:00
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
k->realize = s390_virtio_net_realize;
|
2015-03-17 15:43:26 +03:00
|
|
|
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
|
2011-12-22 06:57:49 +04:00
|
|
|
}
|
|
|
|
|
2013-01-10 19:19:07 +04:00
|
|
|
static const TypeInfo s390_virtio_net = {
|
2013-04-11 18:29:59 +04:00
|
|
|
.name = TYPE_VIRTIO_NET_S390,
|
2011-12-08 07:34:16 +04:00
|
|
|
.parent = TYPE_VIRTIO_S390_DEVICE,
|
2013-04-11 18:29:59 +04:00
|
|
|
.instance_size = sizeof(VirtIONetS390),
|
|
|
|
.instance_init = s390_virtio_net_instance_init,
|
2011-12-08 07:34:16 +04:00
|
|
|
.class_init = s390_virtio_net_class_init,
|
|
|
|
};
|
|
|
|
|
2011-12-22 06:57:49 +04:00
|
|
|
static void s390_virtio_blk_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 07:34:16 +04:00
|
|
|
VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
|
2015-03-17 15:43:26 +03:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2011-12-22 06:57:49 +04:00
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
k->realize = s390_virtio_blk_realize;
|
2015-03-17 15:43:26 +03:00
|
|
|
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
2011-12-22 06:57:49 +04:00
|
|
|
}
|
|
|
|
|
2013-01-10 19:19:07 +04:00
|
|
|
static const TypeInfo s390_virtio_blk = {
|
2011-12-08 07:34:16 +04:00
|
|
|
.name = "virtio-blk-s390",
|
|
|
|
.parent = TYPE_VIRTIO_S390_DEVICE,
|
2013-03-18 20:37:24 +04:00
|
|
|
.instance_size = sizeof(VirtIOBlkS390),
|
|
|
|
.instance_init = s390_virtio_blk_instance_init,
|
2011-12-08 07:34:16 +04:00
|
|
|
.class_init = s390_virtio_blk_class_init,
|
|
|
|
};
|
|
|
|
|
2011-12-22 06:57:49 +04:00
|
|
|
static void s390_virtio_serial_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 07:34:16 +04:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
|
2011-12-22 06:57:49 +04:00
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
k->realize = s390_virtio_serial_realize;
|
2015-03-17 15:43:26 +03:00
|
|
|
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
2011-12-22 06:57:49 +04:00
|
|
|
}
|
|
|
|
|
2013-01-10 19:19:07 +04:00
|
|
|
static const TypeInfo s390_virtio_serial = {
|
2013-04-09 16:53:32 +04:00
|
|
|
.name = TYPE_VIRTIO_SERIAL_S390,
|
2011-12-08 07:34:16 +04:00
|
|
|
.parent = TYPE_VIRTIO_S390_DEVICE,
|
2013-04-09 16:53:32 +04:00
|
|
|
.instance_size = sizeof(VirtIOSerialS390),
|
|
|
|
.instance_init = s390_virtio_serial_instance_init,
|
2011-12-08 07:34:16 +04:00
|
|
|
.class_init = s390_virtio_serial_class_init,
|
2009-12-05 14:44:27 +03:00
|
|
|
};
|
|
|
|
|
2012-06-20 10:59:32 +04:00
|
|
|
static void s390_virtio_rng_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2013-04-14 07:14:49 +04:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2012-06-20 10:59:32 +04:00
|
|
|
VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
|
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
k->realize = s390_virtio_rng_realize;
|
2015-03-17 15:43:26 +03:00
|
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
2012-06-20 10:59:32 +04:00
|
|
|
}
|
|
|
|
|
2013-01-10 19:19:07 +04:00
|
|
|
static const TypeInfo s390_virtio_rng = {
|
2013-04-24 12:07:57 +04:00
|
|
|
.name = TYPE_VIRTIO_RNG_S390,
|
2012-06-20 10:59:32 +04:00
|
|
|
.parent = TYPE_VIRTIO_S390_DEVICE,
|
2013-04-24 12:07:57 +04:00
|
|
|
.instance_size = sizeof(VirtIORNGS390),
|
|
|
|
.instance_init = s390_virtio_rng_instance_init,
|
2012-06-20 10:59:32 +04:00
|
|
|
.class_init = s390_virtio_rng_class_init,
|
|
|
|
};
|
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
static void s390_virtio_busdev_realize(DeviceState *dev, Error **errp)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
|
|
|
VirtIOS390Device *_dev = (VirtIOS390Device *)dev;
|
2011-12-22 06:57:49 +04:00
|
|
|
VirtIOS390DeviceClass *_info = VIRTIO_S390_DEVICE_GET_CLASS(dev);
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2013-08-23 22:25:57 +04:00
|
|
|
virtio_s390_bus_new(&_dev->bus, sizeof(_dev->bus), _dev);
|
2013-01-15 03:08:06 +04:00
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
_info->realize(_dev, errp);
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2013-01-10 08:40:25 +04:00
|
|
|
static void s390_virtio_busdev_reset(DeviceState *dev)
|
|
|
|
{
|
|
|
|
VirtIOS390Device *_dev = (VirtIOS390Device *)dev;
|
|
|
|
|
|
|
|
virtio_reset(_dev->vdev);
|
|
|
|
}
|
|
|
|
|
2011-12-08 07:34:16 +04:00
|
|
|
static void virtio_s390_device_class_init(ObjectClass *klass, void *data)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
2011-12-08 07:34:16 +04:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
dc->realize = s390_virtio_busdev_realize;
|
2012-05-02 11:00:20 +04:00
|
|
|
dc->bus_type = TYPE_S390_VIRTIO_BUS;
|
2013-01-10 08:40:25 +04:00
|
|
|
dc->reset = s390_virtio_busdev_reset;
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2013-01-10 19:19:07 +04:00
|
|
|
static const TypeInfo virtio_s390_device_info = {
|
2011-12-22 06:57:49 +04:00
|
|
|
.name = TYPE_VIRTIO_S390_DEVICE,
|
|
|
|
.parent = TYPE_DEVICE,
|
|
|
|
.instance_size = sizeof(VirtIOS390Device),
|
2011-12-08 07:34:16 +04:00
|
|
|
.class_init = virtio_s390_device_class_init,
|
2012-02-06 21:07:18 +04:00
|
|
|
.class_size = sizeof(VirtIOS390DeviceClass),
|
2011-12-22 06:57:49 +04:00
|
|
|
.abstract = true,
|
|
|
|
};
|
|
|
|
|
2011-02-11 11:40:59 +03:00
|
|
|
static void s390_virtio_scsi_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
|
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
k->realize = s390_virtio_scsi_realize;
|
2015-03-17 15:43:26 +03:00
|
|
|
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
2011-02-11 11:40:59 +03:00
|
|
|
}
|
|
|
|
|
2013-01-10 19:19:07 +04:00
|
|
|
static const TypeInfo s390_virtio_scsi = {
|
2013-03-21 18:15:16 +04:00
|
|
|
.name = TYPE_VIRTIO_SCSI_S390,
|
2011-02-11 11:40:59 +03:00
|
|
|
.parent = TYPE_VIRTIO_S390_DEVICE,
|
2013-03-21 18:15:16 +04:00
|
|
|
.instance_size = sizeof(VirtIOSCSIS390),
|
|
|
|
.instance_init = s390_virtio_scsi_instance_init,
|
2011-02-11 11:40:59 +03:00
|
|
|
.class_init = s390_virtio_scsi_class_init,
|
|
|
|
};
|
2009-12-05 14:44:27 +03:00
|
|
|
|
2013-03-29 05:08:16 +04:00
|
|
|
#ifdef CONFIG_VHOST_SCSI
|
|
|
|
static void s390_vhost_scsi_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
VirtIOS390DeviceClass *k = VIRTIO_S390_DEVICE_CLASS(klass);
|
|
|
|
|
2015-02-27 16:55:37 +03:00
|
|
|
k->realize = s390_vhost_scsi_realize;
|
2015-03-17 15:43:26 +03:00
|
|
|
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
2013-03-29 05:08:16 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo s390_vhost_scsi = {
|
|
|
|
.name = TYPE_VHOST_SCSI_S390,
|
|
|
|
.parent = TYPE_VIRTIO_S390_DEVICE,
|
|
|
|
.instance_size = sizeof(VHostSCSIS390),
|
|
|
|
.instance_init = s390_vhost_scsi_instance_init,
|
|
|
|
.class_init = s390_vhost_scsi_class_init,
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2009-12-05 14:44:27 +03:00
|
|
|
/***************** S390 Virtio Bus Bridge Device *******************/
|
|
|
|
/* Only required to have the virtio bus as child in the system bus */
|
|
|
|
|
|
|
|
static int s390_virtio_bridge_init(SysBusDevice *dev)
|
|
|
|
{
|
|
|
|
/* nothing */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-01-24 23:12:29 +04:00
|
|
|
static void s390_virtio_bridge_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
|
2015-03-17 15:43:26 +03:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2012-01-24 23:12:29 +04:00
|
|
|
|
|
|
|
k->init = s390_virtio_bridge_init;
|
2015-03-17 15:43:26 +03:00
|
|
|
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
|
2012-01-24 23:12:29 +04:00
|
|
|
}
|
|
|
|
|
2013-01-10 19:19:07 +04:00
|
|
|
static const TypeInfo s390_virtio_bridge_info = {
|
2011-12-08 07:34:16 +04:00
|
|
|
.name = "s390-virtio-bridge",
|
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(SysBusDevice),
|
|
|
|
.class_init = s390_virtio_bridge_class_init,
|
2014-09-26 16:37:30 +04:00
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ TYPE_HOTPLUG_HANDLER },
|
|
|
|
{ }
|
|
|
|
}
|
2009-12-05 14:44:27 +03:00
|
|
|
};
|
|
|
|
|
2013-01-15 03:08:05 +04:00
|
|
|
/* virtio-s390-bus */
|
|
|
|
|
2013-08-23 22:25:57 +04:00
|
|
|
static void virtio_s390_bus_new(VirtioBusState *bus, size_t bus_size,
|
|
|
|
VirtIOS390Device *dev)
|
2013-01-15 03:08:05 +04:00
|
|
|
{
|
|
|
|
DeviceState *qdev = DEVICE(dev);
|
2013-04-30 18:08:47 +04:00
|
|
|
char virtio_bus_name[] = "virtio-bus";
|
|
|
|
|
2013-08-24 02:02:27 +04:00
|
|
|
qbus_create_inplace(bus, bus_size, TYPE_VIRTIO_S390_BUS,
|
|
|
|
qdev, virtio_bus_name);
|
2013-01-15 03:08:05 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void virtio_s390_bus_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
VirtioBusClass *k = VIRTIO_BUS_CLASS(klass);
|
|
|
|
BusClass *bus_class = BUS_CLASS(klass);
|
|
|
|
bus_class->max_dev = 1;
|
|
|
|
k->notify = virtio_s390_notify;
|
2015-05-29 09:15:30 +03:00
|
|
|
k->device_plugged = virtio_s390_device_plugged;
|
2013-01-15 03:08:05 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo virtio_s390_bus_info = {
|
|
|
|
.name = TYPE_VIRTIO_S390_BUS,
|
|
|
|
.parent = TYPE_VIRTIO_BUS,
|
|
|
|
.instance_size = sizeof(VirtioS390BusState),
|
|
|
|
.class_init = virtio_s390_bus_class_init,
|
|
|
|
};
|
|
|
|
|
2012-02-09 18:20:55 +04:00
|
|
|
static void s390_virtio_register_types(void)
|
2009-12-05 14:44:27 +03:00
|
|
|
{
|
2013-01-15 03:08:05 +04:00
|
|
|
type_register_static(&virtio_s390_bus_info);
|
2012-05-02 11:00:20 +04:00
|
|
|
type_register_static(&s390_virtio_bus_info);
|
2012-02-09 18:20:55 +04:00
|
|
|
type_register_static(&virtio_s390_device_info);
|
|
|
|
type_register_static(&s390_virtio_serial);
|
|
|
|
type_register_static(&s390_virtio_blk);
|
|
|
|
type_register_static(&s390_virtio_net);
|
2011-02-11 11:40:59 +03:00
|
|
|
type_register_static(&s390_virtio_scsi);
|
2013-04-25 21:38:28 +04:00
|
|
|
#ifdef CONFIG_VHOST_SCSI
|
2013-03-29 05:08:16 +04:00
|
|
|
type_register_static(&s390_vhost_scsi);
|
2013-04-25 21:38:28 +04:00
|
|
|
#endif
|
2012-06-20 10:59:32 +04:00
|
|
|
type_register_static(&s390_virtio_rng);
|
2011-12-08 07:34:16 +04:00
|
|
|
type_register_static(&s390_virtio_bridge_info);
|
2009-12-05 14:44:27 +03:00
|
|
|
}
|
|
|
|
|
2012-02-09 18:20:55 +04:00
|
|
|
type_init(s390_virtio_register_types)
|