I might squeeze in another pullreq before softfreeze, but the

queue was already big enough that I wanted to send this lot out now.

Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-06-24' into staging (2020-07-03 15:34:45 +0100)

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20200703

for you to fetch changes up to 0f10bf84a9d489259a5b11c6aa1b05c1175b76ea:

Deprecate TileGX port (2020-07-03 16:59:46 +0100)

* i.MX6UL EVK board: put PHYs in the correct places

* hw/arm/virt: Let the virtio-iommu bypass MSIs

* target/arm: kvm: Handle DABT with no valid ISS

* hw/arm/virt-acpi-build: Only expose flash on older machine types

* target/arm: Fix temp double-free in sve ldr/str

* hw/display/bcm2835_fb.c: Initialize all fields of struct

* hw/arm/spitz: Code cleanup to fix Coverity-detected memory leak

* Deprecate TileGX port

Andrew Jones (4):

tests/acpi: remove stale allowed tables

tests/acpi: virt: allow DSDT acpi table changes

hw/arm/virt-acpi-build: Only expose flash on older machine types

tests/acpi: virt: update golden masters for DSDT

Beata Michalska (2):

target/arm: kvm: Handle DABT with no valid ISS

target/arm: kvm: Handle misconfigured dabt injection

Eric Auger (5):

qdev: Introduce DEFINE_PROP_RESERVED_REGION

virtio-iommu: Implement RESV_MEM probe request

virtio-iommu: Handle reserved regions in the translation process

virtio-iommu-pci: Add array of Interval properties

hw/arm/virt: Let the virtio-iommu bypass MSIs

Jean-Christophe Dubois (3):

Add a phy-num property to the i.MX FEC emulator

Add the ability to select a different PHY for each i.MX6UL FEC interface

Select MDIO device 2 and 1 as PHY devices for i.MX6UL EVK board.

hw/display/bcm2835_fb.c: Initialize all fields of struct

hw/arm/spitz: Detabify

hw/arm/spitz: Create SpitzMachineClass abstract base class

hw/arm/spitz: Keep pointers to MPU and SSI devices in SpitzMachineState

hw/arm/spitz: Keep pointers to scp0, scp1 in SpitzMachineState

hw/arm/spitz: Implement inbound GPIO lines for bit5 and power signals

hw/misc/max111x: provide QOM properties for setting initial values

hw/misc/max111x: Don't use vmstate_register()

ssi: Add ssi_realize_and_unref()

hw/arm/spitz: Use max111x properties to set initial values

hw/misc/max111x: Use GPIO lines rather than max111x_set_input()

hw/misc/max111x: Create header file for documentation, TYPE_ macros

hw/arm/spitz: Encapsulate misc GPIO handling in a device

hw/gpio/zaurus.c: Use LOG_GUEST_ERROR for bad guest register accesses

hw/arm/spitz: Use LOG_GUEST_ERROR for bad guest register accesses

hw/arm/pxa2xx_pic: Use LOG_GUEST_ERROR for bad guest register accesses

hw/arm/spitz: Provide usual QOM macros for corgi-ssp and spitz-lcdtg

Replace uses of FROM_SSI_SLAVE() macro with QOM casts

Deprecate TileGX port

Richard Henderson (1):

target/arm: Fix temp double-free in sve ldr/str

docs/system/deprecated.rst | 11 +

include/exec/memory.h | 6 +

include/hw/arm/fsl-imx6ul.h | 2 +

include/hw/arm/pxa.h | 1 -

include/hw/arm/sharpsl.h | 3 -

include/hw/arm/virt.h | 8 +

include/hw/misc/max111x.h | 56 +++

include/hw/net/imx_fec.h | 1 +

include/hw/qdev-properties.h | 3 +

include/hw/ssi/ssi.h | 31 +-

include/hw/virtio/virtio-iommu.h | 2 +

include/qemu/typedefs.h | 1 +

target/arm/cpu.h | 2 +

target/arm/kvm_arm.h | 10 +

target/arm/translate-a64.h | 1 +

tests/qtest/bios-tables-test-allowed-diff.h | 18 -

hw/arm/fsl-imx6ul.c | 10 +

hw/arm/mcimx6ul-evk.c | 2 +

hw/arm/pxa2xx_pic.c | 9 +-

hw/arm/spitz.c | 507 ++++++++++++++++------------

hw/arm/virt-acpi-build.c | 5 +-

hw/arm/virt.c | 33 ++

hw/arm/z2.c | 11 +-

hw/core/qdev-properties.c | 89 +++++

hw/display/ads7846.c | 9 +-

hw/display/bcm2835_fb.c | 4 +

hw/display/ssd0323.c | 10 +-

hw/gpio/zaurus.c | 12 +-

hw/misc/max111x.c | 86 +++--

hw/net/imx_fec.c | 24 +-

hw/sd/ssi-sd.c | 4 +-

hw/ssi/ssi.c | 7 +-

hw/virtio/virtio-iommu-pci.c | 11 +

hw/virtio/virtio-iommu.c | 114 ++++++-

target/arm/kvm.c | 80 +++++

target/arm/kvm32.c | 34 ++

target/arm/kvm64.c | 49 +++

target/arm/translate-a64.c | 6 +

target/arm/translate-sve.c | 8 +-

MAINTAINERS | 1 +

hw/net/trace-events | 4 +-

hw/virtio/trace-events | 1 +

tests/data/acpi/virt/DSDT | Bin 5307 -> 5205 bytes

tests/data/acpi/virt/DSDT.memhp | Bin 6668 -> 6566 bytes

tests/data/acpi/virt/DSDT.numamem | Bin 5307 -> 5205 bytes

45 files changed, 974 insertions(+), 312 deletions(-)

create mode 100644 include/hw/misc/max111x.h

From: Jean-Christophe Dubois <jcd@tribudubois.net>

We need a solution to use an Ethernet PHY that is not the first device

on the MDIO bus (device 0 on MDIO bus).

As an example with the i.MX6UL the NXP SOC has 2 Ethernet devices but

only one MDIO bus on which the 2 related PHY are connected but at unique

addresses.

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

Message-id: a1a5c0e139d1c763194b8020573dcb6025daeefa.1593296112.git.jcd@tribudubois.net

include/hw/net/imx_fec.h | 1 +

hw/net/imx_fec.c | 24 +++++++++++++++++-------

hw/net/trace-events | 4 ++--

3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h

--- a/include/hw/net/imx_fec.h

+++ b/include/hw/net/imx_fec.h

@@ -XXX,XX +XXX,XX @@ typedef struct IMXFECState {

uint32_t phy_advertise;

uint32_t phy_int;

uint32_t phy_int_mask;

+ uint32_t phy_num;

bool is_fec;

diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/imx_fec.c

+++ b/hw/net/imx_fec.c

@@ -XXX,XX +XXX,XX @@ static void imx_phy_reset(IMXFECState *s)

static uint32_t imx_phy_read(IMXFECState *s, int reg)

{

uint32_t val;

+ uint32_t phy = reg / 32;

- if (reg > 31) {

- /* we only advertise one phy */

+ if (phy != s->phy_num) {

+ qemu_log_mask(LOG_GUEST_ERROR, "[%s.phy]%s: Bad phy num %u\n",

+ TYPE_IMX_FEC, __func__, phy);

return 0;

}

+ reg %= 32;

+

switch (reg) {

case 0: /* Basic Control */

val = s->phy_control;

@@ -XXX,XX +XXX,XX @@ static uint32_t imx_phy_read(IMXFECState *s, int reg)

break;

}

- trace_imx_phy_read(val, reg);

+ trace_imx_phy_read(val, phy, reg);

return val;

}

static void imx_phy_write(IMXFECState *s, int reg, uint32_t val)

{

- trace_imx_phy_write(val, reg);

+ uint32_t phy = reg / 32;

- if (reg > 31) {

- /* we only advertise one phy */

+ if (phy != s->phy_num) {

+ qemu_log_mask(LOG_GUEST_ERROR, "[%s.phy]%s: Bad phy num %u\n",

+ TYPE_IMX_FEC, __func__, phy);

+ reg %= 32;

+

+ trace_imx_phy_write(val, phy, reg);

+

switch (reg) {

case 0: /* Basic Control */

if (val & 0x8000) {

@@ -XXX,XX +XXX,XX @@ static void imx_eth_write(void *opaque, hwaddr offset, uint64_t value,

extract32(value,

18, 10)));

} else {

- /* This a write operation */

+ /* This is a write operation */

imx_phy_write(s, extract32(value, 18, 10), extract32(value, 0, 16));

}

/* raise the interrupt as the PHY operation is done */

@@ -XXX,XX +XXX,XX @@ static void imx_eth_realize(DeviceState *dev, Error **errp)

static Property imx_eth_properties[] = {

DEFINE_NIC_PROPERTIES(IMXFECState, conf),

DEFINE_PROP_UINT32("tx-ring-num", IMXFECState, tx_ring_num, 1),

+ DEFINE_PROP_UINT32("phy-num", IMXFECState, phy_num, 0),

DEFINE_PROP_END_OF_LIST(),

};

diff --git a/hw/net/trace-events b/hw/net/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/trace-events

+++ b/hw/net/trace-events

@@ -XXX,XX +XXX,XX @@ i82596_set_multicast(uint16_t count) "Added %d multicast entries"

i82596_channel_attention(void *s) "%p: Received CHANNEL ATTENTION"

# imx_fec.c

-imx_phy_read(uint32_t val, int reg) "0x%04"PRIx32" <= reg[%d]"

-imx_phy_write(uint32_t val, int reg) "0x%04"PRIx32" => reg[%d]"

+imx_phy_read(uint32_t val, int phy, int reg) "0x%04"PRIx32" <= phy[%d].reg[%d]"

+imx_phy_write(uint32_t val, int phy, int reg) "0x%04"PRIx32" => phy[%d].reg[%d]"

imx_phy_update_link(const char *s) "%s"

imx_phy_reset(void) ""

imx_fec_read_bd(uint64_t addr, int flags, int len, int data) "tx_bd 0x%"PRIx64" flags 0x%04x len %d data 0x%08x"

2.20.1

From: Jean-Christophe Dubois <jcd@tribudubois.net>

Add properties to the i.MX6UL processor to be able to select a

particular PHY on the MDIO bus for each FEC device.

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

Message-id: ea1d604198b6b73ea6521676e45bacfc597aba53.1593296112.git.jcd@tribudubois.net

include/hw/arm/fsl-imx6ul.h | 2 ++

hw/arm/fsl-imx6ul.c | 10 ++++++++++

2 files changed, 12 insertions(+)

diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h

--- a/include/hw/arm/fsl-imx6ul.h

+++ b/include/hw/arm/fsl-imx6ul.h

@@ -XXX,XX +XXX,XX @@ typedef struct FslIMX6ULState {

MemoryRegion caam;

MemoryRegion ocram;

MemoryRegion ocram_alias;

+

+ uint32_t phy_num[FSL_IMX6UL_NUM_ETHS];

} FslIMX6ULState;

enum FslIMX6ULMemoryMap {

diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/fsl-imx6ul.c

+++ b/hw/arm/fsl-imx6ul.c

@@ -XXX,XX +XXX,XX @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)

FSL_IMX6UL_ENET2_TIMER_IRQ,

};

+ object_property_set_uint(OBJECT(&s->eth[i]),

+ s->phy_num[i],

+ "phy-num", &error_abort);

object_property_set_uint(OBJECT(&s->eth[i]),

FSL_IMX6UL_ETH_NUM_TX_RINGS,

"tx-ring-num", &error_abort);

@@ -XXX,XX +XXX,XX @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)

FSL_IMX6UL_OCRAM_ALIAS_ADDR, &s->ocram_alias);

}

+static Property fsl_imx6ul_properties[] = {

+ DEFINE_PROP_UINT32("fec1-phy-num", FslIMX6ULState, phy_num[0], 0),

+ DEFINE_PROP_UINT32("fec2-phy-num", FslIMX6ULState, phy_num[1], 1),

+ DEFINE_PROP_END_OF_LIST(),

+};

+

static void fsl_imx6ul_class_init(ObjectClass *oc, void *data)

{

DeviceClass *dc = DEVICE_CLASS(oc);

+ device_class_set_props(dc, fsl_imx6ul_properties);

dc->realize = fsl_imx6ul_realize;

dc->desc = "i.MX6UL SOC";

/* Reason: Uses serial_hds and nd_table in realize() directly */

2.20.1

From: Jean-Christophe Dubois <jcd@tribudubois.net>

The i.MX6UL EVK 14x14 board uses:

- PHY 2 for FEC 1

- PHY 1 for FEC 2

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

Message-id: fb41992126c091a71d76ab3d1898959091f60583.1593296112.git.jcd@tribudubois.net

hw/arm/mcimx6ul-evk.c | 2 ++

1 file changed, 2 insertions(+)

diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c

--- a/hw/arm/mcimx6ul-evk.c

+++ b/hw/arm/mcimx6ul-evk.c

@@ -XXX,XX +XXX,XX @@ static void mcimx6ul_evk_init(MachineState *machine)

s = FSL_IMX6UL(object_new(TYPE_FSL_IMX6UL));

object_property_add_child(OBJECT(machine), "soc", OBJECT(s));

+ object_property_set_uint(OBJECT(s), 2, "fec1-phy-num", &error_fatal);

+ object_property_set_uint(OBJECT(s), 1, "fec2-phy-num", &error_fatal);

qdev_realize(DEVICE(s), NULL, &error_fatal);

memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_MMDC_ADDR,

2.20.1

From: Eric Auger <eric.auger@redhat.com>

include/exec/memory.h | 6 +++

include/hw/qdev-properties.h | 3 ++

include/qemu/typedefs.h | 1 +

hw/core/qdev-properties.c | 89 ++++++++++++++++++++++++++++++++++++

4 files changed, 99 insertions(+)

diff --git a/include/exec/memory.h b/include/exec/memory.h

--- a/include/exec/memory.h

+++ b/include/exec/memory.h

@@ -XXX,XX +XXX,XX @@ extern bool global_dirty_log;

typedef struct MemoryRegionOps MemoryRegionOps;

+struct ReservedRegion {

+ hwaddr low;

+ hwaddr high;

+ unsigned type;

+};

+

typedef struct IOMMUTLBEntry IOMMUTLBEntry;

/* See address_space_translate: bit 0 is read, bit 1 is write. */

diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h

--- a/include/hw/qdev-properties.h

+++ b/include/hw/qdev-properties.h

@@ -XXX,XX +XXX,XX @@ extern const PropertyInfo qdev_prop_string;

extern const PropertyInfo qdev_prop_chr;

extern const PropertyInfo qdev_prop_tpm;

extern const PropertyInfo qdev_prop_macaddr;

+extern const PropertyInfo qdev_prop_reserved_region;

extern const PropertyInfo qdev_prop_on_off_auto;

extern const PropertyInfo qdev_prop_multifd_compression;

extern const PropertyInfo qdev_prop_losttickpolicy;

@@ -XXX,XX +XXX,XX @@ extern const PropertyInfo qdev_prop_pcie_link_width;

DEFINE_PROP(_n, _s, _f, qdev_prop_drive_iothread, BlockBackend *)

#define DEFINE_PROP_MACADDR(_n, _s, _f) \

DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, MACAddr)

+#define DEFINE_PROP_RESERVED_REGION(_n, _s, _f) \

+ DEFINE_PROP(_n, _s, _f, qdev_prop_reserved_region, ReservedRegion)

#define DEFINE_PROP_ON_OFF_AUTO(_n, _s, _f, _d) \

DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_on_off_auto, OnOffAuto)

#define DEFINE_PROP_MULTIFD_COMPRESSION(_n, _s, _f, _d) \

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/typedefs.h

+++ b/include/qemu/typedefs.h

@@ -XXX,XX +XXX,XX @@ typedef struct ISABus ISABus;

typedef struct ISADevice ISADevice;

typedef struct IsaDma IsaDma;

typedef struct MACAddr MACAddr;

+typedef struct ReservedRegion ReservedRegion;

typedef struct MachineClass MachineClass;

typedef struct MachineState MachineState;

typedef struct MemoryListener MemoryListener;

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/core/qdev-properties.c

+++ b/hw/core/qdev-properties.c

#include "chardev/char.h"

#include "qemu/uuid.h"

#include "qemu/units.h"

+#include "qemu/cutils.h"

void qdev_prop_set_after_realize(DeviceState *dev, const char *name,

Error **errp)

@@ -XXX,XX +XXX,XX @@ const PropertyInfo qdev_prop_macaddr = {

.set = set_mac,

};

+/* --- Reserved Region --- */

+ * Accepted syntax:

+ * <low address>:<high address>:<type>

+ * where low/high addresses are uint64_t in hexadecimal

+ * and type is a non-negative decimal integer

+ rc = snprintf(buffer, sizeof(buffer), "0x%"PRIx64":0x%"PRIx64":%u",

+ rr->low, rr->high, rr->type);

+ assert(rc < sizeof(buffer));

+ visit_type_str(v, name, &p, errp);

+static void set_reserved_region(Object *obj, Visitor *v, const char *name,

+ void *opaque, Error **errp)

+ DeviceState *dev = DEVICE(obj);

+ Property *prop = opaque;

+ ReservedRegion *rr = qdev_get_prop_ptr(dev, prop);

+ Error *local_err = NULL;

+ const char *endptr;

+ char *str;

+ int ret;

+ if (dev->realized) {

+ qdev_prop_set_after_realize(dev, name, errp);

+ visit_type_str(v, name, &str, &local_err);

+ if (local_err) {

+ error_propagate(errp, local_err);

+ ret = qemu_strtou64(str, &endptr, 16, &rr->low);

+ if (ret) {

+ error_setg(errp, "start address of '%s'"

+ " must be a hexadecimal integer", name);

+ goto out;

+ }

+ if (*endptr != ':') {

+ goto separator_error;

+ }

+ ret = qemu_strtou64(endptr + 1, &endptr, 16, &rr->high);

+ if (ret) {

+ error_setg(errp, "end address of '%s'"

+ " must be a hexadecimal integer", name);

+ goto out;

+ }

+ if (*endptr != ':') {

+ goto separator_error;

+ }

+

+ ret = qemu_strtoui(endptr + 1, &endptr, 10, &rr->type);

+ if (ret) {

+ error_setg(errp, "type of '%s'"

+ " must be a non-negative decimal integer", name);

+ }

+ goto out;

+

+separator_error:

+ error_setg(errp, "reserved region fields must be separated with ':'");

+out:

+ g_free(str);

+ return;

+const PropertyInfo qdev_prop_reserved_region = {

+ .name = "reserved_region",

+ .description = "Reserved Region, example: 0xFEE00000:0xFEEFFFFF:0",

+ .get = get_reserved_region,

+ .set = set_reserved_region,

/* --- on/off/auto --- */

const PropertyInfo qdev_prop_on_off_auto = {

2.20.1

From: Eric Auger <eric.auger@redhat.com>

This patch implements the PROBE request. At the moment,

only THE RESV_MEM property is handled. The first goal is

to report iommu wide reserved regions such as the MSI regions

set by the machine code. On x86 this will be the IOAPIC MSI

region, [0xFEE00000 - 0xFEEFFFFF], on ARM this may be the ITS

doorbell.

In the future we may introduce per device reserved regions.

This will be useful when protecting host assigned devices

which may expose their own reserved regions

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Message-id: 20200629070404.10969-3-eric.auger@redhat.com

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

include/hw/virtio/virtio-iommu.h | 2 +

hw/virtio/virtio-iommu.c | 94 ++++++++++++++++++++++++++++++--

hw/virtio/trace-events | 1 +

3 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/virtio/virtio-iommu.h

+++ b/include/hw/virtio/virtio-iommu.h

@@ -XXX,XX +XXX,XX @@ typedef struct VirtIOIOMMU {

GHashTable *as_by_busptr;

IOMMUPciBus *iommu_pcibus_by_bus_num[PCI_BUS_MAX];

PCIBus *primary_bus;

+ ReservedRegion *reserved_regions;

+ uint32_t nb_reserved_regions;

GTree *domains;

QemuMutex mutex;

GTree *endpoints;

diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/virtio-iommu.c

+++ b/hw/virtio/virtio-iommu.c

@@ -XXX,XX +XXX,XX @@

/* Max size */

#define VIOMMU_DEFAULT_QUEUE_SIZE 256

+#define VIOMMU_PROBE_SIZE 512

typedef struct VirtIOIOMMUDomain {

uint32_t id;

@@ -XXX,XX +XXX,XX @@ static int virtio_iommu_unmap(VirtIOIOMMU *s,

return ret;

}

+static ssize_t virtio_iommu_fill_resv_mem_prop(VirtIOIOMMU *s, uint32_t ep,

+ uint8_t *buf, size_t free)

+{

+ struct virtio_iommu_probe_resv_mem prop = {};

+ size_t size = sizeof(prop), length = size - sizeof(prop.head), total;

+ int i;

+

+ total = size * s->nb_reserved_regions;

+

+ if (total > free) {

+ return -ENOSPC;

+ }

+

+ for (i = 0; i < s->nb_reserved_regions; i++) {

+ unsigned subtype = s->reserved_regions[i].type;

+

+ assert(subtype == VIRTIO_IOMMU_RESV_MEM_T_RESERVED ||

+ subtype == VIRTIO_IOMMU_RESV_MEM_T_MSI);

+ prop.head.type = cpu_to_le16(VIRTIO_IOMMU_PROBE_T_RESV_MEM);

+ prop.head.length = cpu_to_le16(length);

+ prop.subtype = subtype;

+ prop.start = cpu_to_le64(s->reserved_regions[i].low);

+ prop.end = cpu_to_le64(s->reserved_regions[i].high);

+

+ memcpy(buf, &prop, size);

+

+ trace_virtio_iommu_fill_resv_property(ep, prop.subtype,

+ prop.start, prop.end);

+ buf += size;

+ }

+ return total;

+}

+

+/**

+ * virtio_iommu_probe - Fill the probe request buffer with

+ * the properties the device is able to return

+ */

+static int virtio_iommu_probe(VirtIOIOMMU *s,

+ struct virtio_iommu_req_probe *req,

+ uint8_t *buf)

+{

+ uint32_t ep_id = le32_to_cpu(req->endpoint);

+ size_t free = VIOMMU_PROBE_SIZE;

+ ssize_t count;

+

+ if (!virtio_iommu_mr(s, ep_id)) {

+ return VIRTIO_IOMMU_S_NOENT;

+ }

+

+ count = virtio_iommu_fill_resv_mem_prop(s, ep_id, buf, free);

+ if (count < 0) {

+ return VIRTIO_IOMMU_S_INVAL;

+ }

+ buf += count;

+ free -= count;

+

+ return VIRTIO_IOMMU_S_OK;

+}

+

static int virtio_iommu_iov_to_req(struct iovec *iov,

unsigned int iov_cnt,

void *req, size_t req_sz)

@@ -XXX,XX +XXX,XX @@ virtio_iommu_handle_req(detach)

virtio_iommu_handle_req(map)

virtio_iommu_handle_req(unmap)

+static int virtio_iommu_handle_probe(VirtIOIOMMU *s,

+ struct iovec *iov,

+ unsigned int iov_cnt,

+ uint8_t *buf)

+{

+ struct virtio_iommu_req_probe req;

+ int ret = virtio_iommu_iov_to_req(iov, iov_cnt, &req, sizeof(req));

+

+ return ret ? ret : virtio_iommu_probe(s, &req, buf);

+}

+

static void virtio_iommu_handle_command(VirtIODevice *vdev, VirtQueue *vq)

{

VirtIOIOMMU *s = VIRTIO_IOMMU(vdev);

struct virtio_iommu_req_head head;

struct virtio_iommu_req_tail tail = {};

+ size_t output_size = sizeof(tail), sz;

VirtQueueElement *elem;

unsigned int iov_cnt;

struct iovec *iov;

- size_t sz;

+ void *buf = NULL;

for (;;) {

elem = virtqueue_pop(vq, sizeof(VirtQueueElement));

@@ -XXX,XX +XXX,XX @@ static void virtio_iommu_handle_command(VirtIODevice *vdev, VirtQueue *vq)

case VIRTIO_IOMMU_T_UNMAP:

tail.status = virtio_iommu_handle_unmap(s, iov, iov_cnt);

break;

+ case VIRTIO_IOMMU_T_PROBE:

+ {

+ struct virtio_iommu_req_tail *ptail;

+

+ output_size = s->config.probe_size + sizeof(tail);

+ buf = g_malloc0(output_size);

+

+ ptail = (struct virtio_iommu_req_tail *)

+ (buf + s->config.probe_size);

+ ptail->status = virtio_iommu_handle_probe(s, iov, iov_cnt, buf);

+ }

default:

tail.status = VIRTIO_IOMMU_S_UNSUPP;

}

@@ -XXX,XX +XXX,XX @@ static void virtio_iommu_handle_command(VirtIODevice *vdev, VirtQueue *vq)

out:

sz = iov_from_buf(elem->in_sg, elem->in_num, 0,

- &tail, sizeof(tail));

- assert(sz == sizeof(tail));

+ buf ? buf : &tail, output_size);

+ assert(sz == output_size);

- virtqueue_push(vq, elem, sizeof(tail));

+ virtqueue_push(vq, elem, sz);

virtio_notify(vdev, vq);

g_free(elem);

+ g_free(buf);

}

}

@@ -XXX,XX +XXX,XX @@ static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)

s->config.page_size_mask = TARGET_PAGE_MASK;

s->config.input_range.end = -1UL;

s->config.domain_range.end = 32;

+ s->config.probe_size = VIOMMU_PROBE_SIZE;

virtio_add_feature(&s->features, VIRTIO_RING_F_EVENT_IDX);

virtio_add_feature(&s->features, VIRTIO_RING_F_INDIRECT_DESC);

@@ -XXX,XX +XXX,XX @@ static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)

virtio_add_feature(&s->features, VIRTIO_IOMMU_F_MAP_UNMAP);

virtio_add_feature(&s->features, VIRTIO_IOMMU_F_BYPASS);

virtio_add_feature(&s->features, VIRTIO_IOMMU_F_MMIO);

+ virtio_add_feature(&s->features, VIRTIO_IOMMU_F_PROBE);

qemu_mutex_init(&s->mutex);

diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/trace-events

+++ b/hw/virtio/trace-events

@@ -XXX,XX +XXX,XX @@ virtio_iommu_get_domain(uint32_t domain_id) "Alloc domain=%d"

virtio_iommu_put_domain(uint32_t domain_id) "Free domain=%d"

virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid) "0x%"PRIx64" -> 0x%"PRIx64 " for sid=%d"

virtio_iommu_report_fault(uint8_t reason, uint32_t flags, uint32_t endpoint, uint64_t addr) "FAULT reason=%d flags=%d endpoint=%d address =0x%"PRIx64

+virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t start, uint64_t end) "dev= %d, type=%d start=0x%"PRIx64" end=0x%"PRIx64

--

2.20.1