From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex =?utf-8?Q?Benn=C3=A9e?= Subject: Re: [PATCH v10 6/7] hw/arm/sysbus-fdt: enable vfio-calxeda-xgmac dynamic instantiation Date: Tue, 17 Feb 2015 11:36:49 +0000 Message-ID: <87bnkszs4u.fsf@linaro.org> References: <1423799232-10816-1-git-send-email-eric.auger@linaro.org> <1423799232-10816-7-git-send-email-eric.auger@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 1B9A045D23 for ; Tue, 17 Feb 2015 06:31:28 -0500 (EST) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CZItZ5xkFeJ7 for ; Tue, 17 Feb 2015 06:31:27 -0500 (EST) Received: from socrates.bennee.com (static.88-198-71-155.clients.your-server.de [88.198.71.155]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id E405945D21 for ; Tue, 17 Feb 2015 06:31:26 -0500 (EST) In-reply-to: <1423799232-10816-7-git-send-email-eric.auger@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: Eric Auger Cc: eric.auger@st.com, patches@linaro.org, qemu-devel@nongnu.org, alex.williamson@redhat.com, pbonzini@redhat.com, feng.wu@intel.com, kvmarm@lists.cs.columbia.edu List-Id: kvmarm@lists.cs.columbia.edu CkVyaWMgQXVnZXIgPGVyaWMuYXVnZXJAbGluYXJvLm9yZz4gd3JpdGVzOgoKPiB2ZmlvLWNhbHhl ZGEteGdtYWMgbm93IGNhbiBiZSBpbnN0YW50aWF0ZWQgdXNpbmcgdGhlIC1kZXZpY2Ugb3B0aW9u Lgo+IFRoZSBub2RlIGNyZWF0aW9uIGZ1bmN0aW9uIGdlbmVyYXRlcyBhIHZlcnkgYmFzaWMgZHQg bm9kZSBjb21wb3NlZAo+IG9mIHRoZSBjb21wYXQsIHJlZyBhbmQgaW50ZXJydXB0cyBwcm9wZXJ0 aWVzCj4KPiBTaWduZWQtb2ZmLWJ5OiBFcmljIEF1Z2VyIDxlcmljLmF1Z2VyQGxpbmFyby5vcmc+ Cj4KPiAtLS0KPiB2OCAtPiB2OToKPiAtIHByb3Blcmx5IGZyZWUgcmVzb3VyY2VzIGluIGNhc2Ug b2YgZXJyb3JzIGluCj4gICBhZGRfY2FseGVkYV9taWR3YXlfeGdtYWNfZmR0X25vZGUKPgo+IHY3 IC0+IHY4Ogo+IC0gbW92ZSB0aGUgYWRkX2ZkdF9ub2RlX2Z1bmN0aW9ucyBhcnJheSBkZWNsYXJh dGlvbiBiZXR3ZWVuIHRoZSBkZXZpY2UKPiAgIHNwZWNpZmljIGNvZGUgYW5kIHRoZSBnZW5lcmlj IGNvZGUgdG8gYXZvaWQgZm9yd2FyZCBkZWNsYXJhdGlvbnMgb2YKPiAgIGRlY2ljZSBzcGVjaWZp YyBmdW5jdGlvbnMKPiAtIHJlbmFtZSBhZGRfYmFzaWNfdmZpb19mZHRfbm9kZSBpbnRvCj4gICBh ZGRfY2FseGVkYV9taWR3YXlfeGdtYWNfZmR0X25vZGUKPgo+IHY2IC0+IHY3Ogo+IC0gY29tcGF0 IHN0cmluZyByZS1mb3JtYXR0aW5nIHJlbW92ZWQgc2luY2UgY29tcGF0IHN0cmluZyBpcyBub3Qg ZXhwb3NlZAo+ICAgYW55bW9yZSBhcyBhIHVzZXIgb3B0aW9uCj4gLSBWRklPIElSUSBraWNrLW9m ZiByZW1vdmVkIGZyb20gc3lzYnVzLWZkdCBhbmQgbW92ZWQgdG8gVkZJTyBwbGF0Zm9ybQo+ICAg ZGV2aWNlCj4gLS0tCj4gIGh3L2FybS9zeXNidXMtZmR0LmMgfCA4MyArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+ICAxIGZpbGUgY2hhbmdlZCwg ODMgaW5zZXJ0aW9ucygrKQo+Cj4gZGlmZiAtLWdpdCBhL2h3L2FybS9zeXNidXMtZmR0LmMgYi9o dy9hcm0vc3lzYnVzLWZkdC5jCj4gaW5kZXggMzAzOGI5NC4uZDRmOTdmNSAxMDA2NDQKPiAtLS0g YS9ody9hcm0vc3lzYnVzLWZkdC5jCj4gKysrIGIvaHcvYXJtL3N5c2J1cy1mZHQuYwo+IEBAIC0y Niw2ICsyNiw4IEBACj4gICNpbmNsdWRlICJzeXNlbXUvZGV2aWNlX3RyZWUuaCIKPiAgI2luY2x1 ZGUgImh3L3BsYXRmb3JtLWJ1cy5oIgo+ICAjaW5jbHVkZSAic3lzZW11L3N5c2VtdS5oIgo+ICsj aW5jbHVkZSAiaHcvdmZpby92ZmlvLXBsYXRmb3JtLmgiCj4gKyNpbmNsdWRlICJody92ZmlvL3Zm aW8tY2FseGVkYS14Z21hYy5oIgo+ICAKPiAgLyoKPiAgICogaW50ZXJuYWwgc3RydWN0IHRoYXQg Y29udGFpbnMgdGhlIGluZm9ybWF0aW9uIHRvIGNyZWF0ZSBkeW5hbWljCj4gQEAgLTUzLDExICs1 NSw5MiBAQCB0eXBlZGVmIHN0cnVjdCBOb2RlQ3JlYXRpb25QYWlyIHsKPiAgICAgIGludCAoKmFk ZF9mZHRfbm9kZV9mbikoU3lzQnVzRGV2aWNlICpzYmRldiwgdm9pZCAqb3BhcXVlKTsKPiAgfSBO b2RlQ3JlYXRpb25QYWlyOwo+ICAKPiArLyogRGV2aWNlIFNwZWNpZmljIENvZGUgKi8KPiArCj4g Ky8qKgo+ICsgKiBhZGRfY2FseGVkYV9taWR3YXlfeGdtYWNfZmR0X25vZGUKPiArICoKPiArICog R2VuZXJhdGVzIGEgdmVyeSBzaW1wbGUgbm9kZSB3aXRoIGZvbGxvd2luZyBwcm9wZXJ0aWVzOgo+ ICsgKiBjb21wYXRpYmxlIHN0cmluZywgcmVncywgaW50ZXJydXB0cwo+ICsgKi8KPiArc3RhdGlj IGludCBhZGRfY2FseGVkYV9taWR3YXlfeGdtYWNfZmR0X25vZGUoU3lzQnVzRGV2aWNlICpzYmRl diwgdm9pZCAqb3BhcXVlKQo+ICt7Cj4gKyAgICBQbGF0Zm9ybUJ1c0ZEVERhdGEgKmRhdGEgPSBv cGFxdWU7Cj4gKyAgICBQbGF0Zm9ybUJ1c0RldmljZSAqcGJ1cyA9IGRhdGEtPnBidXM7Cj4gKyAg ICB2b2lkICpmZHQgPSBkYXRhLT5mZHQ7Cj4gKyAgICBjb25zdCBjaGFyICpwYXJlbnRfbm9kZSA9 IGRhdGEtPnBidXNfbm9kZV9uYW1lOwo+ICsgICAgaW50IGNvbXBhdF9zdHJfbGVuOwo+ICsgICAg Y2hhciAqbm9kZW5hbWU7Cj4gKyAgICBpbnQgaSwgcmV0ID0gLTE7Cj4gKyAgICB1aW50MzJfdCAq aXJxX2F0dHI7Cj4gKyAgICB1aW50NjRfdCAqcmVnX2F0dHI7Cj4gKyAgICB1aW50NjRfdCBtbWlv X2Jhc2U7Cj4gKyAgICB1aW50NjRfdCBpcnFfbnVtYmVyOwo+ICsgICAgVkZJT1BsYXRmb3JtRGV2 aWNlICp2ZGV2ID0gVkZJT19QTEFURk9STV9ERVZJQ0Uoc2JkZXYpOwo+ICsgICAgVkZJT0Rldmlj ZSAqdmJhc2VkZXYgPSAmdmRldi0+dmJhc2VkZXY7Cj4gKyAgICBPYmplY3QgKm9iaiA9IE9CSkVD VChzYmRldik7Cj4gKwo+ICsgICAgbW1pb19iYXNlID0gb2JqZWN0X3Byb3BlcnR5X2dldF9pbnQo b2JqLCAibW1pb1swXSIsIE5VTEwpOwo+ICsKPiArICAgIG5vZGVuYW1lID0gZ19zdHJkdXBfcHJp bnRmKCIlcy8lc0AlIiBQUkl4NjQsIHBhcmVudF9ub2RlLAo+ICsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdmJhc2VkZXYtPm5hbWUsCj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtbWlvX2Jhc2UpOwo+ICsKPiArICAgIHFlbXVfZmR0X2FkZF9zdWJub2RlKGZkdCwgbm9k ZW5hbWUpOwo+ICsKPiArICAgIGNvbXBhdF9zdHJfbGVuID0gc3RybGVuKHZkZXYtPmNvbXBhdCkg KyAxOwo+ICsgICAgcWVtdV9mZHRfc2V0cHJvcChmZHQsIG5vZGVuYW1lLCAiY29tcGF0aWJsZSIs Cj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgdmRldi0+Y29tcGF0LCBjb21wYXRfc3RyX2xl bik7Cj4gKwo+ICsgICAgcmVnX2F0dHIgPSBnX25ldyh1aW50NjRfdCwgdmJhc2VkZXYtPm51bV9y ZWdpb25zKjQpOwo+ICsKPiArICAgIGZvciAoaSA9IDA7IGkgPCB2YmFzZWRldi0+bnVtX3JlZ2lv bnM7IGkrKykgewo+ICsgICAgICAgIG1taW9fYmFzZSA9IHBsYXRmb3JtX2J1c19nZXRfbW1pb19h ZGRyKHBidXMsIHNiZGV2LCBpKTsKPiArICAgICAgICByZWdfYXR0cls0KmldID0gMTsKPiArICAg ICAgICByZWdfYXR0cls0KmkrMV0gPSBtbWlvX2Jhc2U7Cj4gKyAgICAgICAgcmVnX2F0dHJbNCpp KzJdID0gMTsKPiArICAgICAgICByZWdfYXR0cls0KmkrM10gPSBtZW1vcnlfcmVnaW9uX3NpemUo JnZkZXYtPnJlZ2lvbnNbaV0tPm1lbSk7Cj4gKyAgICB9Cj4gKwo+ICsgICAgcmV0ID0gcWVtdV9m ZHRfc2V0cHJvcF9zaXplZF9jZWxsc19mcm9tX2FycmF5KGZkdCwgbm9kZW5hbWUsICJyZWciLAo+ ICsgICAgICAgICAgICAgICAgICAgICB2YmFzZWRldi0+bnVtX3JlZ2lvbnMqMiwgcmVnX2F0dHIp OwoKQ291bGQgd2UgdXNlIHFlbXVfZmR0X3NldHByb3Bfc2l6ZWRfY2VsbHMoKSBsaWtlIGV2ZXJ5 b25lIGVsc2UgdG8gaGlkZQp0aGUgdWdseW5lc3Mgb2YgdGhlIF9mcm9tX2FycmF5PwoKPiArICAg IGlmIChyZXQpIHsKPiArICAgICAgICBlcnJvcl9yZXBvcnQoImNvdWxkIG5vdCBzZXQgcmVnIHBy b3BlcnR5IG9mIG5vZGUgJXMiLCBub2RlbmFtZSk7Cj4gKyAgICAgICAgZ290byBmYWlsX3JlZzsK PiArICAgIH0KPiArCj4gKyAgICBpcnFfYXR0ciA9IGdfbmV3KHVpbnQzMl90LCB2YmFzZWRldi0+ bnVtX2lycXMqMyk7Cj4gKwo+ICsgICAgZm9yIChpID0gMDsgaSA8IHZiYXNlZGV2LT5udW1faXJx czsgaSsrKSB7Cj4gKyAgICAgICAgaXJxX251bWJlciA9IHBsYXRmb3JtX2J1c19nZXRfaXJxbihw YnVzLCBzYmRldiAsIGkpCj4gKyAgICAgICAgICAgICAgICAgICAgICAgICArIGRhdGEtPmlycV9z dGFydDsKPiArICAgICAgICBpcnFfYXR0clszKmldID0gY3B1X3RvX2JlMzIoMCk7Cj4gKyAgICAg ICAgaXJxX2F0dHJbMyppKzFdID0gY3B1X3RvX2JlMzIoaXJxX251bWJlcik7Cj4gKyAgICAgICAg aXJxX2F0dHJbMyppKzJdID0gY3B1X3RvX2JlMzIoMHg0KTsKPiArICAgIH0KPiArCj4gKyAgIHJl dCA9IHFlbXVfZmR0X3NldHByb3AoZmR0LCBub2RlbmFtZSwgImludGVycnVwdHMiLAo+ICsgICAg ICAgICAgICAgICAgICAgICBpcnFfYXR0ciwKPiB2YmFzZWRldi0+bnVtX2lycXMqMypzaXplb2Yo dWludDMyX3QpKTsKCkRpdHRvLgoKPiArICAgIGlmIChyZXQpIHsKPiArICAgICAgICBlcnJvcl9y ZXBvcnQoImNvdWxkIG5vdCBzZXQgaW50ZXJydXB0cyBwcm9wZXJ0eSBvZiBub2RlICVzIiwKPiAr ICAgICAgICAgICAgICAgICAgICAgbm9kZW5hbWUpOwo+ICsgICAgfQo+ICsKPiArICAgIGdfZnJl ZShpcnFfYXR0cik7Cj4gK2ZhaWxfcmVnOgo+ICsgICAgZ19mcmVlKHJlZ19hdHRyKTsKPiArICAg IGdfZnJlZShub2RlbmFtZSk7Cj4gKyAgICByZXR1cm4gcmV0Owo+ICt9Cj4gKwo+ICAvKiBsaXN0 IG9mIHN1cHBvcnRlZCBkeW5hbWljIHN5c2J1cyBkZXZpY2VzICovCj4gIHN0YXRpYyBjb25zdCBO b2RlQ3JlYXRpb25QYWlyIGFkZF9mZHRfbm9kZV9mdW5jdGlvbnNbXSA9IHsKPiArICAgIHtUWVBF X1ZGSU9fQ0FMWEVEQV9YR01BQywgYWRkX2NhbHhlZGFfbWlkd2F5X3hnbWFjX2ZkdF9ub2RlfSwK PiAgICAgIHsiIiwgTlVMTH0sIC8qIGxhc3QgZWxlbWVudCAqLwo+ICB9Owo+ICAKPiArLyogR2Vu ZXJpYyBDb2RlICovCj4gKwo+ICAvKioKPiAgICogYWRkX2ZkdF9ub2RlIC0gYWRkIHRoZSBkZXZp Y2UgdHJlZSBub2RlIG9mIGEgZHluYW1pYyBzeXNidXMgZGV2aWNlCj4gICAqCgotLSAKQWxleCBC ZW5uw6llCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmt2 bWFybSBtYWlsaW5nIGxpc3QKa3ZtYXJtQGxpc3RzLmNzLmNvbHVtYmlhLmVkdQpodHRwczovL2xp c3RzLmNzLmNvbHVtYmlhLmVkdS9tYWlsbWFuL2xpc3RpbmZvL2t2bWFybQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNgSV-0005YQ-V3 for qemu-devel@nongnu.org; Tue, 17 Feb 2015 06:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNgSS-0007kh-KF for qemu-devel@nongnu.org; Tue, 17 Feb 2015 06:36:55 -0500 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:40878 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNgSS-0007ka-Au for qemu-devel@nongnu.org; Tue, 17 Feb 2015 06:36:52 -0500 References: <1423799232-10816-1-git-send-email-eric.auger@linaro.org> <1423799232-10816-7-git-send-email-eric.auger@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1423799232-10816-7-git-send-email-eric.auger@linaro.org> Date: Tue, 17 Feb 2015 11:36:49 +0000 Message-ID: <87bnkszs4u.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v10 6/7] hw/arm/sysbus-fdt: enable vfio-calxeda-xgmac dynamic instantiation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Auger Cc: peter.maydell@linaro.org, eric.auger@st.com, patches@linaro.org, qemu-devel@nongnu.org, agraf@suse.de, alex.williamson@redhat.com, pbonzini@redhat.com, b.reynal@virtualopensystems.com, feng.wu@intel.com, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org Eric Auger writes: > vfio-calxeda-xgmac now can be instantiated using the -device option. > The node creation function generates a very basic dt node composed > of the compat, reg and interrupts properties > > Signed-off-by: Eric Auger > > --- > v8 -> v9: > - properly free resources in case of errors in > add_calxeda_midway_xgmac_fdt_node > > v7 -> v8: > - move the add_fdt_node_functions array declaration between the device > specific code and the generic code to avoid forward declarations of > decice specific functions > - rename add_basic_vfio_fdt_node into > add_calxeda_midway_xgmac_fdt_node > > v6 -> v7: > - compat string re-formatting removed since compat string is not exposed > anymore as a user option > - VFIO IRQ kick-off removed from sysbus-fdt and moved to VFIO platform > device > --- > hw/arm/sysbus-fdt.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 83 insertions(+) > > diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c > index 3038b94..d4f97f5 100644 > --- a/hw/arm/sysbus-fdt.c > +++ b/hw/arm/sysbus-fdt.c > @@ -26,6 +26,8 @@ > #include "sysemu/device_tree.h" > #include "hw/platform-bus.h" > #include "sysemu/sysemu.h" > +#include "hw/vfio/vfio-platform.h" > +#include "hw/vfio/vfio-calxeda-xgmac.h" > > /* > * internal struct that contains the information to create dynamic > @@ -53,11 +55,92 @@ typedef struct NodeCreationPair { > int (*add_fdt_node_fn)(SysBusDevice *sbdev, void *opaque); > } NodeCreationPair; > > +/* Device Specific Code */ > + > +/** > + * add_calxeda_midway_xgmac_fdt_node > + * > + * Generates a very simple node with following properties: > + * compatible string, regs, interrupts > + */ > +static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) > +{ > + PlatformBusFDTData *data = opaque; > + PlatformBusDevice *pbus = data->pbus; > + void *fdt = data->fdt; > + const char *parent_node = data->pbus_node_name; > + int compat_str_len; > + char *nodename; > + int i, ret = -1; > + uint32_t *irq_attr; > + uint64_t *reg_attr; > + uint64_t mmio_base; > + uint64_t irq_number; > + VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(sbdev); > + VFIODevice *vbasedev = &vdev->vbasedev; > + Object *obj = OBJECT(sbdev); > + > + mmio_base = object_property_get_int(obj, "mmio[0]", NULL); > + > + nodename = g_strdup_printf("%s/%s@%" PRIx64, parent_node, > + vbasedev->name, > + mmio_base); > + > + qemu_fdt_add_subnode(fdt, nodename); > + > + compat_str_len = strlen(vdev->compat) + 1; > + qemu_fdt_setprop(fdt, nodename, "compatible", > + vdev->compat, compat_str_len); > + > + reg_attr = g_new(uint64_t, vbasedev->num_regions*4); > + > + for (i = 0; i < vbasedev->num_regions; i++) { > + mmio_base = platform_bus_get_mmio_addr(pbus, sbdev, i); > + reg_attr[4*i] = 1; > + reg_attr[4*i+1] = mmio_base; > + reg_attr[4*i+2] = 1; > + reg_attr[4*i+3] = memory_region_size(&vdev->regions[i]->mem); > + } > + > + ret = qemu_fdt_setprop_sized_cells_from_array(fdt, nodename, "reg", > + vbasedev->num_regions*2, reg_attr); Could we use qemu_fdt_setprop_sized_cells() like everyone else to hide the uglyness of the _from_array? > + if (ret) { > + error_report("could not set reg property of node %s", nodename); > + goto fail_reg; > + } > + > + irq_attr = g_new(uint32_t, vbasedev->num_irqs*3); > + > + for (i = 0; i < vbasedev->num_irqs; i++) { > + irq_number = platform_bus_get_irqn(pbus, sbdev , i) > + + data->irq_start; > + irq_attr[3*i] = cpu_to_be32(0); > + irq_attr[3*i+1] = cpu_to_be32(irq_number); > + irq_attr[3*i+2] = cpu_to_be32(0x4); > + } > + > + ret = qemu_fdt_setprop(fdt, nodename, "interrupts", > + irq_attr, > vbasedev->num_irqs*3*sizeof(uint32_t)); Ditto. > + if (ret) { > + error_report("could not set interrupts property of node %s", > + nodename); > + } > + > + g_free(irq_attr); > +fail_reg: > + g_free(reg_attr); > + g_free(nodename); > + return ret; > +} > + > /* list of supported dynamic sysbus devices */ > static const NodeCreationPair add_fdt_node_functions[] = { > + {TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node}, > {"", NULL}, /* last element */ > }; > > +/* Generic Code */ > + > /** > * add_fdt_node - add the device tree node of a dynamic sysbus device > * -- Alex Bennée