Virtio toolstack support for I2C and GPIO on Arm
PATCH v3 3/6 libxl: arm: Create alloc_virtio_mmio_params()
In reply to Viresh KumarCreate a separate routine to allocate base and irq for a device as the same code will be required for each device type.
--- tools/libs/light/libxl_arm.c | 38 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-)
tools/libs/light/libxl_arm.c +25 -13
@@ -48,6 +48,24 @@ static uint32_t alloc_virtio_mmio_irq(libxl__gc *gc, uint32_t *virtio_mmio_irq)return irq; } +static int alloc_virtio_mmio_params (libxl__gc *gc,uint64_t *base, +uint32_t *irq,uint64_t *virtio_mmio_base, +uint32_t *virtio_mmio_irq) +{ + *base =alloc_virtio_mmio_base (gc, virtio_mmio_base); +if (!*base) +return ERROR_FAIL ; + + *irq =alloc_virtio_mmio_irq (gc, virtio_mmio_irq); +if (!*irq) +return ERROR_FAIL ; + +LOG (DEBUG ,"Allocate Virtio MMIO params: IRQ %u BASE 0x%" PRIx64, *irq, + *base); + +return 0 ; +} +static const char *gicv_to_string (libxl_gic_version gic_version) {switch (gic_version) {
@@ -85,20 +103,12 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,libxl_device_disk *disk = &d_config->disks[i];if (disk->specification ==LIBXL_DISK_SPECIFICATION_VIRTIO ) { - disk->base =alloc_virtio_mmio_base (gc, &virtio_mmio_base); -if (!disk->base) -return ERROR_FAIL ; +int rc =alloc_virtio_mmio_params (gc, &disk->base, &disk->irq, + &virtio_mmio_base, &virtio_mmio_irq); +if (rc) +return rc; - disk->irq =alloc_virtio_mmio_irq (gc, &virtio_mmio_irq); -if (!disk->irq) -return ERROR_FAIL ; - -if (virtio_irq < disk->irq) - virtio_irq = disk->irq; virtio_enabled = true; - -LOG (DEBUG ,"Allocate Virtio MMIO params for Vdev %s: IRQ %u BASE 0x%" PRIx64, - disk->vdev, disk->irq, disk->base); } }
@@ -107,8 +117,10 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,* present, make sure that we allocate enough SPIs for them. * The resulting "nr_spis" needs to cover the highest possible SPI. */ -if (virtio_enabled) +if (virtio_mmio_irq !=GUEST_VIRTIO_MMIO_SPI_FIRST ) { + virtio_irq = virtio_mmio_irq -1 ; nr_spis =max (nr_spis, virtio_irq -32 +1 ); + }for (i =0 ; i < d_config->b_info.num_irqs; i++) {uint32_t irq = d_config->b_info.irqs[i];
Signature · 1 line
2.31.1.272.g89b43f80a514
v3 cover Virtio toolstack support for I2C and GPIO on Arm
Hello,
This patchset adds toolstack support for I2C and GPIO virtio devices. This is inspired from the work done by Oleksandr for the Disk device.
This is developed as part of Linaro's Project Stratos, where we are working towards Hypervisor agnostic Rust based backend [1].
This is based of origin/staging (commit 01ca29f0b17a ("sched: dom0_vcpus_pin should only affect dom0")) which already has Oleksandr's patches applied.
V2->V3:
- Rebased over latest tree and made changes according to changes in Oleksandr's patches from sometime back.
- Minor cleanups.
V1->V2:
- Patches 3/6 and 4/6 are new.
- Patches 5/6 and 6/6 updated based on the above two patches.
- Added link to the bindings for I2C and GPIO.
- Rebased over latest master branch.
Thanks.
--
Viresh
[1] https://lore.kernel.org/xen-devel/20220414092358.kepxbmnrtycz7mhe@vireshk-i7/
Viresh Kumar (6):
libxl: Add support for Virtio I2C device
libxl: Add support for Virtio GPIO device
libxl: arm: Create alloc_virtio_mmio_params()
libxl: arm: Split make_virtio_mmio_node()
libxl: Allocate MMIO params for I2c device and update DT
libxl: Allocate MMIO params for GPIO device and update DT
tools/golang/xenlight/helpers.gen.go | 212 ++++++++++++++++++++ tools/golang/xenlight/types.gen.go | 54 ++++++ tools/include/libxl.h | 64 ++++++ tools/include/libxl_utils.h | 6 + tools/libs/light/Makefile | 2 + tools/libs/light/libxl_arm.c | 138 +++++++++++-- tools/libs/light/libxl_create.c | 26 +++ tools/libs/light/libxl_dm.c | 34 +++- tools/libs/light/libxl_gpio.c | 226 ++++++++++++++++++++++ tools/libs/light/libxl_i2c.c | 226 ++++++++++++++++++++++ tools/libs/light/libxl_internal.h | 2 + tools/libs/light/libxl_types.idl | 48 +++++ tools/libs/light/libxl_types_internal.idl | 2 + tools/ocaml/libs/xl/genwrap.py | 2 + tools/ocaml/libs/xl/xenlight_stubs.c | 2 + tools/xl/Makefile | 2 +- tools/xl/xl.h | 6 + tools/xl/xl_cmdtable.c | 30 +++ tools/xl/xl_gpio.c | 142 ++++++++++++++ tools/xl/xl_i2c.c | 142 ++++++++++++++ tools/xl/xl_parse.c | 160 +++++++++++++++ tools/xl/xl_parse.h | 2 + tools/xl/xl_sxp.c | 4 + 23 files changed, 1509 insertions(+), 23 deletions(-) create mode 100644 tools/libs/light/libxl_gpio.c create mode 100644 tools/libs/light/libxl_i2c.c create mode 100644 tools/xl/xl_gpio.c create mode 100644 tools/xl/xl_i2c.c
Signature · 1 line
2.31.1.272.g89b43f80a514
PATCH v3 1/6 libxl: Add support for Virtio I2C device
This patch adds basic support for configuring and assisting virtio-mmio based virtio-i2c backend (emualator) which is intended to run out of Qemu and could be run in any domain.
An example of domain configuration for Virtio I2c:
i2c = [ "" ]
Please note, this patch is not enough for virtio-i2c to work on Xen (Arm), as for every Virtio device we need to allocate Virtio MMIO params (IRQ and memory region) and pass them to the backend, also update Guest device-tree. A subsequent patch will add these missing bits. For the current patch, the default "irq" and "base" are just written to the Xenstore.
--- tools/golang/xenlight/helpers.gen.go | 108 +++++++++++ tools/golang/xenlight/types.gen.go | 27 +++ tools/include/libxl.h | 32 +++ tools/include/libxl_utils.h | 3 + tools/libs/light/Makefile | 1 + tools/libs/light/libxl_create.c | 13 ++ tools/libs/light/libxl_dm.c | 19 +- tools/libs/light/libxl_i2c.c | 226 ++++++++++++++++++++++ tools/libs/light/libxl_internal.h | 1 + tools/libs/light/libxl_types.idl | 24 +++ tools/libs/light/libxl_types_internal.idl | 1 + tools/ocaml/libs/xl/genwrap.py | 1 + tools/ocaml/libs/xl/xenlight_stubs.c | 1 + tools/xl/Makefile | 2 +- tools/xl/xl.h | 3 + tools/xl/xl_cmdtable.c | 15 ++ tools/xl/xl_i2c.c | 142 ++++++++++++++ tools/xl/xl_parse.c | 80 ++++++++ tools/xl/xl_parse.h | 1 + tools/xl/xl_sxp.c | 2 + 20 files changed, 699 insertions(+), 3 deletions(-) create mode 100644 tools/libs/light/libxl_i2c.c create mode 100644 tools/xl/xl_i2c.c
tools/golang/xenlight/helpers.gen.go +108 -0
@@ -1221,6 +1221,9 @@ x.Usbdevice = C.GoString(tmp.usbdevice) if err := x.VkbDevice.fromC(&tmp.vkb_device);err != nil { return fmt.Errorf("converting field VkbDevice: %v", err) } +if err := x.I2cDevice.fromC(&tmp.i2c_device);err != nil { +return fmt.Errorf("converting field I2cDevice: %v", err) +} x.Soundhw = C.GoString(tmp.soundhw) if err := x.XenPlatformPci.fromC(&tmp.xen_platform_pci);err != nil { return fmt.Errorf("converting field XenPlatformPci: %v", err)
@@ -1538,6 +1541,9 @@ hvm.usbdevice = C.CString(tmp.Usbdevice)} if err := tmp.VkbDevice.toC(&hvm.vkb_device); err != nil { return fmt.Errorf("converting field VkbDevice: %v", err) } +if err := tmp.I2cDevice.toC(&hvm.i2c_device); err != nil { +return fmt.Errorf("converting field I2cDevice: %v", err) +} if tmp.Soundhw != "" { hvm.soundhw = C.CString(tmp.Soundhw)} if err := tmp.XenPlatformPci.toC(&hvm.xen_platform_pci); err != nil {
@@ -1734,6 +1740,46 @@ xc.multi_touch_num_contacts = C.uint32_t(x.MultiTouchNumContacts) return nil } +// NewDeviceI2c returns an instance of DeviceI2c initialized with defaults. +func NewDeviceI2c() (*DeviceI2c, error) { +var ( +x DeviceI2c +xc C.libxl_device_i2c) + +C.libxl_device_i2c_init(&xc) +defer C.libxl_device_i2c_dispose(&xc) + +if err := x.fromC(&xc); err != nil { +return nil, err } + +return &x, nil} + +func (x *DeviceI2c) fromC(xc *C.libxl_device_i2c) error { + x.BackendDomid = Domid(xc.backend_domid) +x.BackendDomname = C.GoString(xc.backend_domname) +x.Devid = Devid(xc.devid) +x.BackendType = I2cBackend(xc.backend_type) +x.Irq = uint32(xc.irq) +x.Base = uint64(xc.base) + + return nil} + +func (x *DeviceI2c) toC(xc *C.libxl_device_i2c) (err error){defer func(){ +if err != nil{ +C.libxl_device_i2c_dispose(xc)} +}() + +xc.backend_domid = C.libxl_domid(x.BackendDomid) +if x.BackendDomname != "" { +xc.backend_domname = C.CString(x.BackendDomname)} +xc.devid = C.libxl_devid(x.Devid) +xc.backend_type = C.libxl_i2c_backend(x.BackendType) +xc.irq = C.uint32_t(x.Irq) +xc.base = C.uint64_t(x.Base) + + return nil + } + // NewDeviceDisk returns an instance of DeviceDisk initialized with defaults. func NewDeviceDisk() (*DeviceDisk, error) { var (
@@ -2867,6 +2913,15 @@ if err := x.Vkbs[i].fromC(&v); err != nil { return fmt.Errorf("converting field Vkbs: %v", err) } } } +x.I2cs = nil +if n := int(xc.num_i2cs); n > 0 { +cI2cs := (*[1<<28]C.libxl_device_i2c)(unsafe.Pointer(xc.i2cs))[:n:n] +x.I2cs = make([]DeviceI2c, n) +for i, v := range cI2cs { +if err := x.I2cs[i].fromC(&v); err != nil { +return fmt.Errorf("converting field I2cs: %v", err) } +} +} x.Vtpms = nil if n := int(xc.num_vtpms); n > 0 { cVtpms := (*[1<<28]C.libxl_device_vtpm)(unsafe.Pointer(xc.vtpms))[:n:n]
@@ -3028,6 +3083,16 @@ return fmt.Errorf("converting field Vkbs: %v", err) } } } +if numI2cs := len(x.I2cs); numI2cs > 0 { +xc.i2cs = (*C.libxl_device_i2c)(C.malloc(C.ulong(numI2cs)*C.sizeof_libxl_device_i2c)) +xc.num_i2cs = C.int(numI2cs) +cI2cs := (*[1<<28]C.libxl_device_i2c)(unsafe.Pointer(xc.i2cs))[:numI2cs:numI2cs] +for i,v := range x.I2cs { +if err := v.toC(&cI2cs[i]); err != nil { +return fmt.Errorf("converting field I2cs: %v", err) +} +} +} if numVtpms := len(x.Vtpms); numVtpms > 0 { xc.vtpms = (*C.libxl_device_vtpm)(C.malloc(C.ulong(numVtpms)*C.sizeof_libxl_device_vtpm)) xc.num_vtpms = C.int(numVtpms)
@@ -3733,6 +3798,49 @@ xc.rref = C.int(x.Rref) return nil } +// NewI2cinfo returns an instance of I2cinfo initialized with defaults. +func NewI2cinfo() (*I2cinfo, error) { +var ( +x I2cinfo +xc C.libxl_i2cinfo) + +C.libxl_i2cinfo_init(&xc) +defer C.libxl_i2cinfo_dispose(&xc) + +if err := x.fromC(&xc); err != nil { +return nil, err } + +return &x, nil} + +func (x *I2cinfo) fromC(xc *C.libxl_i2cinfo) error { + x.Backend = C.GoString(xc.backend) +x.BackendId = uint32(xc.backend_id) +x.Frontend = C.GoString(xc.frontend) +x.FrontendId = uint32(xc.frontend_id) +x.Devid = Devid(xc.devid) +x.State = int(xc.state) +x.Evtch = int(xc.evtch) +x.Rref = int(xc.rref) + + return nil} + +func (x *I2cinfo) toC(xc *C.libxl_i2cinfo) (err error){defer func(){ +if err != nil{ +C.libxl_i2cinfo_dispose(xc)} +}() + +if x.Backend != "" { +xc.backend = C.CString(x.Backend)} +xc.backend_id = C.uint32_t(x.BackendId) +if x.Frontend != "" { +xc.frontend = C.CString(x.Frontend)} +xc.frontend_id = C.uint32_t(x.FrontendId) +xc.devid = C.libxl_devid(x.Devid) +xc.state = C.int(x.State) + + return nil + } + // NewNumainfo returns an instance of Numainfo initialized with defaults. func NewNumainfo() (*Numainfo, error) { var (
tools/golang/xenlight/types.gen.go +27 -0
@@ -255,6 +255,11 @@ VkbBackendQemu VkbBackend = 1 VkbBackendLinux VkbBackend = 2 ) +type I2cBackend int +const( +I2cBackendVirtio I2cBackend = 0 +) + type Passthrough int const( PassthroughDefault Passthrough = 0
@@ -584,6 +589,7 @@ Usb Defbool Usbversion int Usbdevice string VkbDevice Defbool +I2cDevice Defbool Soundhw string XenPlatformPci Defbool UsbdeviceList StringList
@@ -646,6 +652,15 @@ MultiTouchHeight uint32 MultiTouchNumContacts uint32 } +type DeviceI2c struct { +BackendDomid Domid +BackendDomname string +Devid Devid +BackendType I2cBackend +Irq uint32 +Base uint64 +} + type DeviceDisk struct { BackendDomid Domid BackendDomname string
@@ -935,6 +950,7 @@ Rdms []DeviceRdm Dtdevs []DeviceDtdev Vfbs []DeviceVfb Vkbs []DeviceVkb +I2cs []DeviceI2c Vtpms []DeviceVtpm P9S []DeviceP9 Pvcallsifs []DevicePvcallsif
@@ -1091,6 +1107,17 @@ Evtch int Rref int } +type I2cinfo struct { +Backend string +BackendId uint32 +Frontend string +FrontendId uint32 +Devid Devid +State int +Evtch int +Rref int +} + type Numainfo struct { Size uint64 Free uint64
tools/include/libxl.h +32 -0
@@ -829,6 +829,15 @@ typedef struct libxl__ctx libxl_ctx;*/ #define LIBXL_HAVE_BUILDINFO_VKB_DEVICE 1 +/* +* LIBXL_HAVE_BUILDINFO_I2C_DEVICE +* +* If this is defined, then the libxl_domain_build_info structure will +* contain a boolean hvm.i2c_device which instructs libxl whether to include +* a i2c at build time or not. +*/ +#define LIBXL_HAVE_BUILDINFO_I2C_DEVICE 1 +/* * LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST *
@@ -2397,6 +2406,29 @@ int libxl_device_vkb_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_vkbinfo *vkbinfo)LIBXL_EXTERNAL_CALLERS_ONLY ; +/* I2C */ +int libxl_device_i2c_add(libxl_ctx *ctx, uint32_t domid, libxl_device_i2c *i2c, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_i2c_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_i2c *i2c, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_i2c_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_i2c *i2c, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +libxl_device_i2c *libxl_device_i2c_list (libxl_ctx *ctx, +uint32_t domid,int *num) +LIBXL_EXTERNAL_CALLERS_ONLY ; +void libxl_device_i2c_list_free(libxl_device_i2c* list, int num) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_i2c_getinfo(libxl_ctx *ctx, uint32_t domid, + const libxl_device_i2c *i2c, + libxl_i2cinfo *i2cinfo) + LIBXL_EXTERNAL_CALLERS_ONLY; +/* Framebuffer */ int libxl_device_vfb_add (libxl_ctx *ctx,uint32_t domid,libxl_device_vfb *vfb,const libxl_asyncop_how *ao_how)
tools/include/libxl_utils.h +3 -0
@@ -83,6 +83,9 @@ int libxl_devid_to_device_usbctrl(libxl_ctx *ctx, uint32_t domid,int libxl_devid_to_device_vkb (libxl_ctx *ctx,uint32_t domid,int devid,libxl_device_vkb *vkb); +int libxl_devid_to_device_i2c (libxl_ctx *ctx,uint32_t domid, +int devid,libxl_device_i2c *i2c); +int libxl_devid_to_device_vdispl (libxl_ctx *ctx,uint32_t domid,int devid,libxl_device_vdispl *vdispl);
tools/libs/light/Makefile +1 -0
@@ -112,6 +112,7 @@ OBJS-y += libxl_vdispl.o OBJS-y += libxl_pvcalls.o OBJS-y += libxl_vsnd.o OBJS-y += libxl_vkb.o +OBJS-y += libxl_i2c.o OBJS-y += libxl_genid.o OBJS-y += _libxl_types.o OBJS-y += libxl_flask.o
tools/libs/light/libxl_create.c +13 -0
@@ -375,6 +375,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,libxl_defbool_setdefault (&b_info->u.hvm.altp2m, false);libxl_defbool_setdefault (&b_info->u.hvm.usb, false);libxl_defbool_setdefault (&b_info->u.hvm.vkb_device, true); +libxl_defbool_setdefault (&b_info->u.hvm.i2c_device, true);libxl_defbool_setdefault (&b_info->u.hvm.xen_platform_pci, true);libxl_defbool_setdefault (&b_info->u.hvm.spice.enable, false);
@@ -1753,6 +1754,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,libxl__device_console console;libxl__device device;libxl_device_vkb vkb; +libxl_device_i2c i2c;init_console_info (gc, &console,0 ); console.backend_domid = state->console_domid;
@@ -1765,6 +1767,12 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,libxl_device_vkb_dispose (&vkb); } +if (libxl_defbool_val (d_config->b_info.u.hvm.i2c_device)) { +libxl_device_i2c_init (&i2c); +libxl__device_add (gc, domid, &libxl__i2c_devtype, &i2c); +libxl_device_i2c_dispose (&i2c); + } + dcs->sdss.dm.guest_domid = domid;if (libxl_defbool_val (d_config->b_info.device_model_stubdomain))libxl__spawn_stub_dm (egc, &dcs->sdss);
@@ -1797,6 +1805,11 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, &d_config->vkbs[i]); } +for (i =0 ; i < d_config->num_i2cs; i++) { +libxl__device_add (gc, domid, &libxl__i2c_devtype, + &d_config->i2cs[i]); + } +if (d_config->b_info.arch_arm.vuart ==LIBXL_VUART_TYPE_SBSA_UART ) {init_console_info (gc, &vuart,0 ); vuart.backend_domid = state->console_domid;
tools/libs/light/libxl_dm.c +17 -2
@@ -2095,7 +2095,8 @@ static void libxl__dm_vifs_from_hvm_guest_config(libxl__gc *gc,static int libxl__vfb_and_vkb_from_hvm_guest_config (libxl__gc *gc,const libxl_domain_config *guest_config,libxl_device_vfb *vfb, -libxl_device_vkb *vkb) +libxl_device_vkb *vkb, +libxl_device_i2c *i2c) {const libxl_domain_build_info *b_info = &guest_config->b_info;
@@ -2104,6 +2105,7 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc,libxl_device_vfb_init (vfb);libxl_device_vkb_init (vkb); +libxl_device_i2c_init (i2c); vfb->backend_domid =0 ; vfb->devid =0 ;
@@ -2114,6 +2116,9 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, vkb->backend_domid =0 ; vkb->devid =0 ; + i2c->backend_domid =0 ; + i2c->devid =0 ; +return 0 ; }
@@ -2276,6 +2281,7 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss)int ret;libxl_device_vfb *vfb;libxl_device_vkb *vkb; +libxl_device_i2c *i2c;char **args;struct xs_permissions perm[2 ];xs_transaction_t t;
@@ -2348,11 +2354,14 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) || libxl_defbool_val(guest_config->b_info.u.hvm.sdl.enable)) {GCNEW (vfb);GCNEW (vkb); -libxl__vfb_and_vkb_from_hvm_guest_config (gc, guest_config, vfb, vkb); +GCNEW (i2c); +libxl__vfb_and_vkb_from_hvm_guest_config (gc, guest_config, vfb, vkb, i2c); dm_config->vfbs = vfb; dm_config->num_vfbs =1 ; dm_config->vkbs = vkb; dm_config->num_vkbs =1 ; + dm_config->i2cs = i2c; + dm_config->num_i2cs =1 ; } if (guest_config->b_info.stubdomain_kernel &&
@@ -2494,6 +2503,12 @@ static void spawn_stub_launch_dm(libxl__egc *egc,if (ret) goto out; } +if (dm_config->num_i2cs) { + ret =libxl__device_add (gc, dm_domid, &libxl__i2c_devtype, + &dm_config->i2cs[0 ]); +if (ret) goto out; + } +if (guest_config->b_info.u.hvm.serial) { num_console++; }else if (guest_config->b_info.u.hvm.serial_list) {
tools/libs/light/libxl_i2c.c new file +226 -0
226 lines not on this page · raw message
tools/libs/light/libxl_internal.h +1 -0
@@ -4003,6 +4003,7 @@ static inline int *libxl__device_type_get_num(extern const libxl__device_type libxl__vfb_devtype;extern const libxl__device_type libxl__vkb_devtype; +extern const libxl__device_type libxl__i2c_devtype;extern const libxl__device_type libxl__disk_devtype;extern const libxl__device_type libxl__nic_devtype;extern const libxl__device_type libxl__vtpm_devtype;
tools/libs/light/libxl_types.idl +24 -0
@@ -278,6 +278,10 @@ libxl_vkb_backend = Enumeration("vkb_backend", [ (2, "LINUX") ]) +libxl_i2c_backend = Enumeration("i2c_backend", [ + (0, "VIRTIO") + ]) + libxl_passthrough = Enumeration("passthrough", [ (0, "default"), (1, "disabled"),
@@ -626,6 +630,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ # - "mouse" for PS/2 protocol relative mouse ("usbdevice", string), ("vkb_device", libxl_defbool), + ("i2c_device", libxl_defbool), ("soundhw", string), ("xen_platform_pci", libxl_defbool), ("usbdevice_list", libxl_string_list),
@@ -705,6 +710,15 @@ libxl_device_vkb = Struct("device_vkb", [ ("multi_touch_num_contacts", uint32) ]) +libxl_device_i2c = Struct("device_i2c", [ + ("backend_domid", libxl_domid), + ("backend_domname", string), + ("devid", libxl_devid), + ("backend_type", libxl_i2c_backend), + ("irq", uint32), + ("base", uint64) + ]) + libxl_device_disk = Struct("device_disk", [ ("backend_domid", libxl_domid), ("backend_domname", string),
@@ -982,6 +996,7 @@ libxl_domain_config = Struct("domain_config", [ ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), ("vfbs", Array(libxl_device_vfb, "num_vfbs")), ("vkbs", Array(libxl_device_vkb, "num_vkbs")), + ("i2cs", Array(libxl_device_i2c, "num_i2cs")), ("vtpms", Array(libxl_device_vtpm, "num_vtpms")), ("p9s", Array(libxl_device_p9, "num_p9s")), ("pvcallsifs", Array(libxl_device_pvcallsif, "num_pvcallsifs")),
@@ -1145,6 +1160,15 @@ libxl_vkbinfo = Struct("vkbinfo", [ ("rref", integer) ], dir=DIR_OUT) +libxl_i2cinfo = Struct("i2cinfo", [ + ("backend", string), + ("backend_id", uint32), + ("frontend", string), + ("frontend_id", uint32), + ("devid", libxl_devid), + ("state", integer), + ], dir=DIR_OUT) + # NUMA node characteristics: size and free are how much memory it has, and how # much of it is free, respectively. dists is an array of distances from this # node to each other node.
tools/libs/light/libxl_types_internal.idl +1 -0
@@ -33,6 +33,7 @@ libxl__device_kind = Enumeration("device_kind", [ (15, "VSND"), (16, "VINPUT"), (17, "VIRTIO_DISK"), + (18, "I2C"), ]) libxl__console_backend = Enumeration("console_backend", [
tools/ocaml/libs/xl/genwrap.py +1 -0
@@ -36,6 +36,7 @@ DEVICE_LIST = [ ("list", ["ctx", "domid", "t list"]), functions = { # ( name , [type1,type2,....] ) "device_vfb": DEVICE_FUNCTIONS, "device_vkb": DEVICE_FUNCTIONS, + "device_i2c": DEVICE_FUNCTIONS, "device_disk": DEVICE_FUNCTIONS + DEVICE_LIST + [ ("insert", ["ctx", "t", "domid", "?async:'a", "unit", "unit"]), ("of_vdev", ["ctx", "domid", "string", "t"]),
tools/ocaml/libs/xl/xenlight_stubs.c +1 -0
@@ -707,6 +707,7 @@ DEVICE_ADDREMOVE(disk) DEVICE_ADDREMOVE(nic) DEVICE_ADDREMOVE(vfb) DEVICE_ADDREMOVE(vkb) +DEVICE_ADDREMOVE(i2c) DEVICE_ADDREMOVE(pci) _DEVICE_ADDREMOVE(disk, cdrom, insert)
tools/xl/Makefile +1 -1
@@ -23,7 +23,7 @@ XL_OBJS += xl_vtpm.o xl_block.o xl_nic.o xl_usb.o XL_OBJS += xl_sched.o xl_pci.o xl_vcpu.o xl_cdrom.o xl_mem.o XL_OBJS += xl_info.o xl_console.o xl_misc.o XL_OBJS += xl_vmcontrol.o xl_saverestore.o xl_migrate.o -XL_OBJS += xl_vdispl.o xl_vsnd.o xl_vkb.o +XL_OBJS += xl_vdispl.o xl_vsnd.o xl_vkb.o xl_i2c.o $(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL)
tools/xl/xl.h +3 -0
@@ -176,6 +176,9 @@ int main_vsnddetach(int argc, char **argv);int main_vkbattach (int argc,char **argv);int main_vkblist (int argc,char **argv);int main_vkbdetach (int argc,char **argv); +int main_i2cattach (int argc,char **argv); +int main_i2clist (int argc,char **argv); +int main_i2cdetach (int argc,char **argv);int main_usbctrl_attach (int argc,char **argv);int main_usbctrl_detach (int argc,char **argv);int main_usbdev_attach (int argc,char **argv);
tools/xl/xl_cmdtable.c +15 -0
@@ -406,6 +406,21 @@ const struct cmd_spec cmd_table[] = {"Destroy a domain's virtual keyboard device" ,"<Domain> <DevId>" , }, + { "i2c-attach", + &main_i2cattach,1 ,1 , +"Create a new virtual i2c device" , +"<Domain> <i2c-spec-component(s)>..." , + }, + { "i2c-list", + &main_i2clist,0 ,0 , +"List virtual i2c devices for a domain" , +"<Domain(s)>" , + }, + { "i2c-detach", + &main_i2cdetach,0 ,1 , +"Destroy a domain's virtual i2c device" , +"<Domain> <DevId>" , + }, { "vdispl-attach", &main_vdisplattach,1 ,1 , "Create a new virtual display device",
tools/xl/xl_i2c.c new file +142 -0
142 lines not on this page · raw message
tools/xl/xl_parse.c +80 -0
129 lines not on this page · raw message
tools/xl/xl_parse.h +1 -0
@@ -36,6 +36,7 @@ int parse_nic_config(libxl_device_nic *nic, XLU_Config **config, char *token);int parse_vdispl_config (libxl_device_vdispl *vdispl,char *token);int parse_vsnd_item (libxl_device_vsnd *vsnd,const char *spec);int parse_vkb_config (libxl_device_vkb *vkb,char *token); +int parse_i2c_config (libxl_device_i2c *i2c,char *token);int match_option_size (const char *prefix,size_t len,char *arg,char **argopt);
tools/xl/xl_sxp.c +2 -0
@@ -140,6 +140,8 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh)fprintf (fh,"\t\t\t(usbdevice %s)\n" , b_info->u.hvm.usbdevice);fprintf (fh,"\t\t\t(vkb_device %s)\n" ,libxl_defbool_to_string (b_info->u.hvm.vkb_device)); +fprintf (fh,"\t\t\t(i2c_device %s)\n" , +libxl_defbool_to_string (b_info->u.hvm.i2c_device));fprintf (fh,"\t\t)\n" );break ;case LIBXL_DOMAIN_TYPE_PV :
Signature · 1 line
2.31.1.272.g89b43f80a514
PATCH v3 2/6 libxl: Add support for Virtio GPIO device
In reply to Viresh KumarThis patch adds basic support for configuring and assisting virtio-mmio based virtio-gpio backend (emualator) which is intended to run out of Qemu and could be run in any domain.
An example of domain configuration for Virtio Gpio:
gpio = [ "" ]
Please note, this patch is not enough for virtio-gpio to work on Xen (Arm), as for every Virtio device we need to allocate Virtio MMIO params (IRQ and memory region) and pass them to the backend, also update Guest device-tree. A subsequent patch will add these missing bits. For the current patch, the default "irq" and "base" are just written to the Xenstore.
--- tools/golang/xenlight/helpers.gen.go | 108 ++++++++++- tools/golang/xenlight/types.gen.go | 27 +++ tools/include/libxl.h | 32 +++ tools/include/libxl_utils.h | 3 + tools/libs/light/Makefile | 1 + tools/libs/light/libxl_create.c | 13 ++ tools/libs/light/libxl_dm.c | 17 +- tools/libs/light/libxl_gpio.c | 226 ++++++++++++++++++++++ tools/libs/light/libxl_internal.h | 1 + tools/libs/light/libxl_types.idl | 24 +++ tools/libs/light/libxl_types_internal.idl | 1 + tools/ocaml/libs/xl/genwrap.py | 1 + tools/ocaml/libs/xl/xenlight_stubs.c | 1 + tools/xl/Makefile | 2 +- tools/xl/xl.h | 3 + tools/xl/xl_cmdtable.c | 15 ++ tools/xl/xl_gpio.c | 142 ++++++++++++++ tools/xl/xl_parse.c | 80 ++++++++ tools/xl/xl_parse.h | 1 + tools/xl/xl_sxp.c | 2 + 20 files changed, 696 insertions(+), 4 deletions(-) create mode 100644 tools/libs/light/libxl_gpio.c create mode 100644 tools/xl/xl_gpio.c
tools/golang/xenlight/helpers.gen.go +106 -2
@@ -1221,6 +1221,9 @@ x.Usbdevice = C.GoString(tmp.usbdevice) if err := x.VkbDevice.fromC(&tmp.vkb_device);err != nil { return fmt.Errorf("converting field VkbDevice: %v", err) } +if err := x.GpioDevice.fromC(&tmp.gpio_device);err != nil { +return fmt.Errorf("converting field GpioDevice: %v", err) +} if err := x.I2cDevice.fromC(&tmp.i2c_device);err != nil { return fmt.Errorf("converting field I2cDevice: %v", err) }
@@ -1541,6 +1544,9 @@ hvm.usbdevice = C.CString(tmp.Usbdevice)} if err := tmp.VkbDevice.toC(&hvm.vkb_device); err != nil { return fmt.Errorf("converting field VkbDevice: %v", err) } +if err := tmp.GpioDevice.toC(&hvm.gpio_device); err != nil { +return fmt.Errorf("converting field GpioDevice: %v", err) +} if err := tmp.I2cDevice.toC(&hvm.i2c_device); err != nil { return fmt.Errorf("converting field I2cDevice: %v", err) }
@@ -1740,6 +1746,46 @@ xc.multi_touch_num_contacts = C.uint32_t(x.MultiTouchNumContacts) return nil } +// NewDeviceGpio returns an instance of DeviceGpio initialized with defaults. +func NewDeviceGpio() (*DeviceGpio, error) { +var ( +x DeviceGpio +xc C.libxl_device_gpio) + +C.libxl_device_gpio_init(&xc) +defer C.libxl_device_gpio_dispose(&xc) + +if err := x.fromC(&xc); err != nil { +return nil, err } + +return &x, nil} + +func (x *DeviceGpio) fromC(xc *C.libxl_device_gpio) error { + x.BackendDomid = Domid(xc.backend_domid) +x.BackendDomname = C.GoString(xc.backend_domname) +x.Devid = Devid(xc.devid) +x.BackendType = GpioBackend(xc.backend_type) +x.Irq = uint32(xc.irq) +x.Base = uint64(xc.base) + + return nil} + +func (x *DeviceGpio) toC(xc *C.libxl_device_gpio) (err error){defer func(){ +if err != nil{ +C.libxl_device_gpio_dispose(xc)} +}() + +xc.backend_domid = C.libxl_domid(x.BackendDomid) +if x.BackendDomname != "" { +xc.backend_domname = C.CString(x.BackendDomname)} +xc.devid = C.libxl_devid(x.Devid) +xc.backend_type = C.libxl_gpio_backend(x.BackendType) +xc.irq = C.uint32_t(x.Irq) +xc.base = C.uint64_t(x.Base) + + return nil + } + // NewDeviceI2c returns an instance of DeviceI2c initialized with defaults. func NewDeviceI2c() (*DeviceI2c, error) { var (
@@ -2913,6 +2959,15 @@ if err := x.Vkbs[i].fromC(&v); err != nil { return fmt.Errorf("converting field Vkbs: %v", err) } } } +x.Gpios = nil +if n := int(xc.num_gpios); n > 0 { +cGpios := (*[1<<28]C.libxl_device_gpio)(unsafe.Pointer(xc.gpios))[:n:n] +x.Gpios = make([]DeviceGpio, n) +for i, v := range cGpios { +if err := x.Gpios[i].fromC(&v); err != nil { +return fmt.Errorf("converting field Gpios: %v", err) } +} +} x.I2cs = nil if n := int(xc.num_i2cs); n > 0 { cI2cs := (*[1<<28]C.libxl_device_i2c)(unsafe.Pointer(xc.i2cs))[:n:n]
@@ -3083,6 +3138,16 @@ return fmt.Errorf("converting field Vkbs: %v", err) } } } +if numGpios := len(x.Gpios); numGpios > 0 { +xc.gpios = (*C.libxl_device_gpio)(C.malloc(C.ulong(numGpios)*C.sizeof_libxl_device_gpio)) +xc.num_gpios = C.int(numGpios) +cGpios := (*[1<<28]C.libxl_device_gpio)(unsafe.Pointer(xc.gpios))[:numGpios:numGpios] +for i,v := range x.Gpios { +if err := v.toC(&cGpios[i]); err != nil { +return fmt.Errorf("converting field Gpios: %v", err) +} +} +} if numI2cs := len(x.I2cs); numI2cs > 0 { xc.i2cs = (*C.libxl_device_i2c)(C.malloc(C.ulong(numI2cs)*C.sizeof_libxl_device_i2c)) xc.num_i2cs = C.int(numI2cs)
@@ -3798,6 +3863,47 @@ xc.rref = C.int(x.Rref) return nil } +// NewGpioinfo returns an instance of Gpioinfo initialized with defaults. +func NewGpioinfo() (*Gpioinfo, error) { +var ( +x Gpioinfo +xc C.libxl_gpioinfo) + +C.libxl_gpioinfo_init(&xc) +defer C.libxl_gpioinfo_dispose(&xc) + +if err := x.fromC(&xc); err != nil { +return nil, err } + +return &x, nil} + +func (x *Gpioinfo) fromC(xc *C.libxl_gpioinfo) error { + x.Backend = C.GoString(xc.backend) +x.BackendId = uint32(xc.backend_id) +x.Frontend = C.GoString(xc.frontend) +x.FrontendId = uint32(xc.frontend_id) +x.Devid = Devid(xc.devid) +x.State = int(xc.state) + + return nil} + +func (x *Gpioinfo) toC(xc *C.libxl_gpioinfo) (err error){defer func(){ +if err != nil{ +C.libxl_gpioinfo_dispose(xc)} +}() + +if x.Backend != "" { +xc.backend = C.CString(x.Backend)} +xc.backend_id = C.uint32_t(x.BackendId) +if x.Frontend != "" { +xc.frontend = C.CString(x.Frontend)} +xc.frontend_id = C.uint32_t(x.FrontendId) +xc.devid = C.libxl_devid(x.Devid) +xc.state = C.int(x.State) + + return nil + } + // NewI2cinfo returns an instance of I2cinfo initialized with defaults. func NewI2cinfo() (*I2cinfo, error) { var (
@@ -3819,8 +3925,6 @@ x.Frontend = C.GoString(xc.frontend) x.FrontendId = uint32(xc.frontend_id) x.Devid = Devid(xc.devid) x.State = int(xc.state) -x.Evtch = int(xc.evtch) -x.Rref = int(xc.rref) return nil}
tools/golang/xenlight/types.gen.go +27 -0
@@ -255,6 +255,11 @@ VkbBackendQemu VkbBackend = 1 VkbBackendLinux VkbBackend = 2 ) +type GpioBackend int +const( +GpioBackendVirtio GpioBackend = 0 +) + type I2cBackend int const( I2cBackendVirtio I2cBackend = 0
@@ -589,6 +594,7 @@ Usb Defbool Usbversion int Usbdevice string VkbDevice Defbool +GpioDevice Defbool I2cDevice Defbool Soundhw string XenPlatformPci Defbool
@@ -652,6 +658,15 @@ MultiTouchHeight uint32 MultiTouchNumContacts uint32 } +type DeviceGpio struct { +BackendDomid Domid +BackendDomname string +Devid Devid +BackendType GpioBackend +Irq uint32 +Base uint64 +} + type DeviceI2c struct { BackendDomid Domid BackendDomname string
@@ -950,6 +965,7 @@ Rdms []DeviceRdm Dtdevs []DeviceDtdev Vfbs []DeviceVfb Vkbs []DeviceVkb +Gpios []DeviceGpio I2cs []DeviceI2c Vtpms []DeviceVtpm P9S []DeviceP9
@@ -1107,6 +1123,17 @@ Evtch int Rref int } +type Gpioinfo struct { +Backend string +BackendId uint32 +Frontend string +FrontendId uint32 +Devid Devid +State int +Evtch int +Rref int +} + type I2cinfo struct { Backend string BackendId uint32
tools/include/libxl.h +32 -0
@@ -829,6 +829,15 @@ typedef struct libxl__ctx libxl_ctx;*/ #define LIBXL_HAVE_BUILDINFO_VKB_DEVICE 1 +/* +* LIBXL_HAVE_BUILDINFO_GPIO_DEVICE +* +* If this is defined, then the libxl_domain_build_info structure will +* contain a boolean hvm.gpio_device which instructs libxl whether to include +* a gpio at build time or not. +*/ +#define LIBXL_HAVE_BUILDINFO_GPIO_DEVICE 1 +/* * LIBXL_HAVE_BUILDINFO_I2C_DEVICE *
@@ -2406,6 +2415,29 @@ int libxl_device_vkb_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_vkbinfo *vkbinfo)LIBXL_EXTERNAL_CALLERS_ONLY ; +/* GPIO */ +int libxl_device_gpio_add(libxl_ctx *ctx, uint32_t domid, libxl_device_gpio *gpio, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_gpio_remove(libxl_ctx *ctx, uint32_t domid, + libxl_device_gpio *gpio, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_gpio_destroy(libxl_ctx *ctx, uint32_t domid, + libxl_device_gpio *gpio, + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +libxl_device_gpio *libxl_device_gpio_list (libxl_ctx *ctx, +uint32_t domid,int *num) +LIBXL_EXTERNAL_CALLERS_ONLY ; +void libxl_device_gpio_list_free(libxl_device_gpio* list, int num) + LIBXL_EXTERNAL_CALLERS_ONLY; +int libxl_device_gpio_getinfo(libxl_ctx *ctx, uint32_t domid, + const libxl_device_gpio *gpio, + libxl_gpioinfo *gpioinfo) + LIBXL_EXTERNAL_CALLERS_ONLY; +/* I2C */ int libxl_device_i2c_add (libxl_ctx *ctx,uint32_t domid,libxl_device_i2c *i2c,const libxl_asyncop_how *ao_how)
tools/include/libxl_utils.h +3 -0
@@ -83,6 +83,9 @@ int libxl_devid_to_device_usbctrl(libxl_ctx *ctx, uint32_t domid,int libxl_devid_to_device_vkb (libxl_ctx *ctx,uint32_t domid,int devid,libxl_device_vkb *vkb); +int libxl_devid_to_device_gpio (libxl_ctx *ctx,uint32_t domid, +int devid,libxl_device_gpio *gpio); +int libxl_devid_to_device_i2c (libxl_ctx *ctx,uint32_t domid,int devid,libxl_device_i2c *i2c);
tools/libs/light/Makefile +1 -0
@@ -113,6 +113,7 @@ OBJS-y += libxl_pvcalls.o OBJS-y += libxl_vsnd.o OBJS-y += libxl_vkb.o OBJS-y += libxl_i2c.o +OBJS-y += libxl_gpio.o OBJS-y += libxl_genid.o OBJS-y += _libxl_types.o OBJS-y += libxl_flask.o
tools/libs/light/libxl_create.c +13 -0
@@ -375,6 +375,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,libxl_defbool_setdefault (&b_info->u.hvm.altp2m, false);libxl_defbool_setdefault (&b_info->u.hvm.usb, false);libxl_defbool_setdefault (&b_info->u.hvm.vkb_device, true); +libxl_defbool_setdefault (&b_info->u.hvm.gpio_device, true);libxl_defbool_setdefault (&b_info->u.hvm.i2c_device, true);libxl_defbool_setdefault (&b_info->u.hvm.xen_platform_pci, true);
@@ -1754,6 +1755,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,libxl__device_console console;libxl__device device;libxl_device_vkb vkb; +libxl_device_gpio gpio;libxl_device_i2c i2c;init_console_info (gc, &console,0 );
@@ -1767,6 +1769,12 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,libxl_device_vkb_dispose (&vkb); } +if (libxl_defbool_val (d_config->b_info.u.hvm.gpio_device)) { +libxl_device_gpio_init (&gpio); +libxl__device_add (gc, domid, &libxl__gpio_devtype, &gpio); +libxl_device_gpio_dispose (&gpio); + } +if (libxl_defbool_val (d_config->b_info.u.hvm.i2c_device)) {libxl_device_i2c_init (&i2c);libxl__device_add (gc, domid, &libxl__i2c_devtype, &i2c);
@@ -1805,6 +1813,11 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, &d_config->vkbs[i]); } +for (i =0 ; i < d_config->num_gpios; i++) { +libxl__device_add (gc, domid, &libxl__gpio_devtype, + &d_config->gpios[i]); + } +for (i =0 ; i < d_config->num_i2cs; i++) {libxl__device_add (gc, domid, &libxl__i2c_devtype, &d_config->i2cs[i]);
tools/libs/light/libxl_dm.c +16 -1
@@ -2096,6 +2096,7 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc,const libxl_domain_config *guest_config, libxl_device_vfb *vfb, libxl_device_vkb *vkb, + libxl_device_gpio *gpio, libxl_device_i2c *i2c) { const libxl_domain_build_info *b_info = &guest_config->b_info;
@@ -2105,6 +2106,7 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc,libxl_device_vfb_init (vfb);libxl_device_vkb_init (vkb); +libxl_device_gpio_init (gpio);libxl_device_i2c_init (i2c); vfb->backend_domid =0 ;
@@ -2116,6 +2118,9 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, vkb->backend_domid =0 ; vkb->devid =0 ; + gpio->backend_domid =0 ; + gpio->devid =0 ; + i2c->backend_domid =0 ; i2c->devid =0 ;
@@ -2281,6 +2286,7 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss)int ret;libxl_device_vfb *vfb;libxl_device_vkb *vkb; +libxl_device_gpio *gpio;libxl_device_i2c *i2c;char **args;struct xs_permissions perm[2 ];
@@ -2354,12 +2360,15 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) || libxl_defbool_val(guest_config->b_info.u.hvm.sdl.enable)) {GCNEW (vfb);GCNEW (vkb); +GCNEW (gpio);GCNEW (i2c); -libxl__vfb_and_vkb_from_hvm_guest_config (gc, guest_config, vfb, vkb, i2c); +libxl__vfb_and_vkb_from_hvm_guest_config (gc, guest_config, vfb, vkb, gpio, i2c); dm_config->vfbs = vfb; dm_config->num_vfbs =1 ; dm_config->vkbs = vkb; dm_config->num_vkbs =1 ; + dm_config->gpios = gpio; + dm_config->num_gpios =1 ; dm_config->i2cs = i2c; dm_config->num_i2cs =1 ; }
@@ -2503,6 +2512,12 @@ static void spawn_stub_launch_dm(libxl__egc *egc,if (ret) goto out; } +if (dm_config->num_gpios) { + ret =libxl__device_add (gc, dm_domid, &libxl__gpio_devtype, + &dm_config->gpios[0 ]); +if (ret) goto out; + } +if (dm_config->num_i2cs) { ret =libxl__device_add (gc, dm_domid, &libxl__i2c_devtype, &dm_config->i2cs[0 ]);
tools/libs/light/libxl_gpio.c new file +226 -0
226 lines not on this page · raw message
tools/libs/light/libxl_internal.h +1 -0
@@ -4003,6 +4003,7 @@ static inline int *libxl__device_type_get_num(extern const libxl__device_type libxl__vfb_devtype;extern const libxl__device_type libxl__vkb_devtype; +extern const libxl__device_type libxl__gpio_devtype;extern const libxl__device_type libxl__i2c_devtype;extern const libxl__device_type libxl__disk_devtype;extern const libxl__device_type libxl__nic_devtype;
tools/libs/light/libxl_types.idl +24 -0
@@ -278,6 +278,10 @@ libxl_vkb_backend = Enumeration("vkb_backend", [ (2, "LINUX") ]) +libxl_gpio_backend = Enumeration("gpio_backend", [ + (0, "VIRTIO") + ]) + libxl_i2c_backend = Enumeration("i2c_backend", [ (0, "VIRTIO") ])
@@ -630,6 +634,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ # - "mouse" for PS/2 protocol relative mouse ("usbdevice", string), ("vkb_device", libxl_defbool), + ("gpio_device", libxl_defbool), ("i2c_device", libxl_defbool), ("soundhw", string), ("xen_platform_pci", libxl_defbool),
@@ -710,6 +715,15 @@ libxl_device_vkb = Struct("device_vkb", [ ("multi_touch_num_contacts", uint32) ]) +libxl_device_gpio = Struct("device_gpio", [ + ("backend_domid", libxl_domid), + ("backend_domname", string), + ("devid", libxl_devid), + ("backend_type", libxl_gpio_backend), + ("irq", uint32), + ("base", uint64) + ]) + libxl_device_i2c = Struct("device_i2c", [ ("backend_domid", libxl_domid), ("backend_domname", string),
@@ -996,6 +1010,7 @@ libxl_domain_config = Struct("domain_config", [ ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), ("vfbs", Array(libxl_device_vfb, "num_vfbs")), ("vkbs", Array(libxl_device_vkb, "num_vkbs")), + ("gpios", Array(libxl_device_gpio, "num_gpios")), ("i2cs", Array(libxl_device_i2c, "num_i2cs")), ("vtpms", Array(libxl_device_vtpm, "num_vtpms")), ("p9s", Array(libxl_device_p9, "num_p9s")),
@@ -1160,6 +1175,15 @@ libxl_vkbinfo = Struct("vkbinfo", [ ("rref", integer) ], dir=DIR_OUT) +libxl_gpioinfo = Struct("gpioinfo", [ + ("backend", string), + ("backend_id", uint32), + ("frontend", string), + ("frontend_id", uint32), + ("devid", libxl_devid), + ("state", integer), + ], dir=DIR_OUT) + libxl_i2cinfo = Struct("i2cinfo", [ ("backend", string), ("backend_id", uint32),
tools/libs/light/libxl_types_internal.idl +1 -0
@@ -34,6 +34,7 @@ libxl__device_kind = Enumeration("device_kind", [ (16, "VINPUT"), (17, "VIRTIO_DISK"), (18, "I2C"), + (19, "GPIO"), ]) libxl__console_backend = Enumeration("console_backend", [
tools/ocaml/libs/xl/genwrap.py +1 -0
@@ -36,6 +36,7 @@ DEVICE_LIST = [ ("list", ["ctx", "domid", "t list"]), functions = { # ( name , [type1,type2,....] ) "device_vfb": DEVICE_FUNCTIONS, "device_vkb": DEVICE_FUNCTIONS, + "device_gpio": DEVICE_FUNCTIONS, "device_i2c": DEVICE_FUNCTIONS, "device_disk": DEVICE_FUNCTIONS + DEVICE_LIST + [ ("insert", ["ctx", "t", "domid", "?async:'a", "unit", "unit"]),
tools/ocaml/libs/xl/xenlight_stubs.c +1 -0
@@ -707,6 +707,7 @@ DEVICE_ADDREMOVE(disk) DEVICE_ADDREMOVE(nic) DEVICE_ADDREMOVE(vfb) DEVICE_ADDREMOVE(vkb) +DEVICE_ADDREMOVE(gpio) DEVICE_ADDREMOVE(i2c) DEVICE_ADDREMOVE(pci) _DEVICE_ADDREMOVE(disk, cdrom, insert)
tools/xl/Makefile +1 -1
@@ -23,7 +23,7 @@ XL_OBJS += xl_vtpm.o xl_block.o xl_nic.o xl_usb.o XL_OBJS += xl_sched.o xl_pci.o xl_vcpu.o xl_cdrom.o xl_mem.o XL_OBJS += xl_info.o xl_console.o xl_misc.o XL_OBJS += xl_vmcontrol.o xl_saverestore.o xl_migrate.o -XL_OBJS += xl_vdispl.o xl_vsnd.o xl_vkb.o xl_i2c.o +XL_OBJS += xl_vdispl.o xl_vsnd.o xl_vkb.o xl_gpio.o xl_i2c.o $(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL)
tools/xl/xl.h +3 -0
@@ -176,6 +176,9 @@ int main_vsnddetach(int argc, char **argv);int main_vkbattach (int argc,char **argv);int main_vkblist (int argc,char **argv);int main_vkbdetach (int argc,char **argv); +int main_gpioattach (int argc,char **argv); +int main_gpiolist (int argc,char **argv); +int main_gpiodetach (int argc,char **argv);int main_i2cattach (int argc,char **argv);int main_i2clist (int argc,char **argv);int main_i2cdetach (int argc,char **argv);
tools/xl/xl_cmdtable.c +15 -0
@@ -406,6 +406,21 @@ const struct cmd_spec cmd_table[] = {"Destroy a domain's virtual keyboard device" ,"<Domain> <DevId>" , }, + { "gpio-attach", + &main_gpioattach,1 ,1 , +"Create a new virtual gpio device" , +"<Domain> <gpio-spec-component(s)>..." , + }, + { "gpio-list", + &main_gpiolist,0 ,0 , +"List virtual gpio devices for a domain" , +"<Domain(s)>" , + }, + { "gpio-detach", + &main_gpiodetach,0 ,1 , +"Destroy a domain's virtual gpio device" , +"<Domain> <DevId>" , + }, { "i2c-attach", &main_i2cattach,1 ,1 , "Create a new virtual i2c device",
tools/xl/xl_gpio.c new file +142 -0
142 lines not on this page · raw message
tools/xl/xl_parse.c +80 -0
131 lines not on this page · raw message
tools/xl/xl_parse.h +1 -0
@@ -36,6 +36,7 @@ int parse_nic_config(libxl_device_nic *nic, XLU_Config **config, char *token);int parse_vdispl_config (libxl_device_vdispl *vdispl,char *token);int parse_vsnd_item (libxl_device_vsnd *vsnd,const char *spec);int parse_vkb_config (libxl_device_vkb *vkb,char *token); +int parse_gpio_config (libxl_device_gpio *gpio,char *token);int parse_i2c_config (libxl_device_i2c *i2c,char *token); int match_option_size(const char *prefix, size_t len,
tools/xl/xl_sxp.c +2 -0
@@ -140,6 +140,8 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh)fprintf (fh,"\t\t\t(usbdevice %s)\n" , b_info->u.hvm.usbdevice);fprintf (fh,"\t\t\t(vkb_device %s)\n" ,libxl_defbool_to_string (b_info->u.hvm.vkb_device)); +fprintf (fh,"\t\t\t(gpio_device %s)\n" , +libxl_defbool_to_string (b_info->u.hvm.gpio_device));fprintf (fh,"\t\t\t(i2c_device %s)\n" ,libxl_defbool_to_string (b_info->u.hvm.i2c_device));fprintf (fh,"\t\t)\n" );
Signature · 1 line
2.31.1.272.g89b43f80a514
PATCH v3 4/6 libxl: arm: Split make_virtio_mmio_node()
In reply to Viresh Kumarmake_virtio_mmio_node() creates the DT node for simple MMIO devices currently, i.e. the ones that don't require any additional properties.
In order to allow using it for other complex device types, split the functionality into two, one where the fdt node isn't closed and the other one to create a simple DT node.
--- tools/libs/light/libxl_arm.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
tools/libs/light/libxl_arm.c +14 -10
@@ -900,9 +900,8 @@ static int make_xen_iommu_node(libxl__gc *gc, void *fdt)return 0 ; } -static int make_virtio_mmio_node (libxl__gc *gc,void *fdt, -uint64_t base,uint32_t irq, -uint32_t backend_domid) +static int make_virtio_mmio_node_common (libxl__gc *gc,void *fdt,uint64_t base, +uint32_t irq) {int res;gic_interrupt intr;
@@ -922,7 +921,15 @@ static int make_virtio_mmio_node(libxl__gc *gc, void *fdt, res =fdt_property_interrupts (gc, fdt, &intr,1 );if (res)return res; - res =fdt_property (fdt,"dma-coherent" ,NULL ,0 ); +return fdt_property (fdt,"dma-coherent" ,NULL ,0 ); +} + +static int make_virtio_mmio_node_simple (libxl__gc *gc,void *fdt,uint64_t base, +uint32_t irq,uint32_t backend_domid) +{ +int res; + + res =make_virtio_mmio_node_common (gc, fdt, base, irq);if (res)return res;if (backend_domid !=LIBXL_TOOLSTACK_DOMID ) {
@@ -935,10 +942,7 @@ static int make_virtio_mmio_node(libxl__gc *gc, void *fdt,if (res)return res; } - res =fdt_end_node (fdt); -if (res)return res; - -return 0 ; +return fdt_end_node (fdt); } static const struct arch_info *get_arch_info(libxl__gc *gc,
@@ -1261,8 +1265,8 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, iommu_created = true; } -FDT (make_virtio_mmio_node (gc, fdt, disk->base, disk->irq, - disk->backend_domid) ); +FDT (make_virtio_mmio_node_simple (gc, fdt, disk->base, + disk->irq, disk->backend_domid) ); } }
Signature · 1 line
2.31.1.272.g89b43f80a514
PATCH v3 5/6 libxl: Allocate MMIO params for I2c device and update DT
In reply to Viresh KumarThis patch allocates Virtio MMIO params (IRQ and memory region) and pass them to the backend, also update Guest device-tree based on Virtio I2C DT bindings [1].
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
--- tools/libs/light/libxl_arm.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
tools/libs/light/libxl_arm.c +35 -0
@@ -112,6 +112,15 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, } } +for (i =0 ; i < d_config->num_i2cs; i++) { +libxl_device_i2c *i2c = &d_config->i2cs[i]; + +int rc =alloc_virtio_mmio_params (gc, &i2c->base, &i2c->irq, + &virtio_mmio_base, &virtio_mmio_irq); +if (rc) +return rc; + } +/* * Every virtio-mmio device uses one emulated SPI. If Virtio devices are * present, make sure that we allocate enough SPIs for them.
@@ -945,6 +954,26 @@ static int make_virtio_mmio_node_simple(libxl__gc *gc, void *fdt, uint64_t base,return fdt_end_node (fdt); } +static int make_virtio_mmio_node_i2c (libxl__gc *gc,void *fdt,uint64_t base, +uint32_t irq) +{ +int res; + + res =make_virtio_mmio_node_common (gc, fdt, base, irq); +if (res)return res; + + res =fdt_begin_node (fdt,"i2c" ); +if (res)return res; + + res =fdt_property_compat (gc, fdt,1 ,"virtio,device22" ); +if (res)return res; + + res =fdt_end_node (fdt); +if (res)return res; + +return fdt_end_node (fdt); +} +static const struct arch_info *get_arch_info (libxl__gc *gc,const struct xc_dom_image *dom) {
@@ -1270,6 +1299,12 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, } } +for (i =0 ; i < d_config->num_i2cs; i++) { +libxl_device_i2c *i2c = &d_config->i2cs[i]; + +FDT (make_virtio_mmio_node_i2c (gc, fdt, i2c->base, i2c->irq) ); + } +if (pfdt)FDT (copy_partial_fdt (gc, fdt, pfdt) );
Signature · 1 line
2.31.1.272.g89b43f80a514
PATCH v3 6/6 libxl: Allocate MMIO params for GPIO device and update DT
In reply to Viresh KumarThis patch allocates Virtio MMIO params (IRQ and memory region) and pass them to the backend, also update Guest device-tree based on Virtio GPIO DT bindings [1].
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
--- tools/libs/light/libxl_arm.c | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
tools/libs/light/libxl_arm.c +47 -0
@@ -121,6 +121,15 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,return rc; } +for (i =0 ; i < d_config->num_gpios; i++) { +libxl_device_gpio *gpio = &d_config->gpios[i]; + +int rc =alloc_virtio_mmio_params (gc, &gpio->base, &gpio->irq, + &virtio_mmio_base, &virtio_mmio_irq); +if (rc) +return rc; + } +/* * Every virtio-mmio device uses one emulated SPI. If Virtio devices are * present, make sure that we allocate enough SPIs for them.
@@ -974,6 +983,38 @@ static int make_virtio_mmio_node_i2c(libxl__gc *gc, void *fdt, uint64_t base,return fdt_end_node (fdt); } +static int make_virtio_mmio_node_gpio (libxl__gc *gc,void *fdt,uint64_t base, +uint32_t irq) +{ +int res; + + res =make_virtio_mmio_node_common (gc, fdt, base, irq); +if (res)return res; + + res =fdt_begin_node (fdt,"gpio" ); +if (res)return res; + + res =fdt_property_compat (gc, fdt,1 ,"virtio,device29" ); +if (res)return res; + + res =fdt_property (fdt,"gpio-controller" ,NULL ,0 ); +if (res)return res; + + res =fdt_property_cell (fdt,"#gpio-cells" ,2 ); +if (res)return res; + + res =fdt_property (fdt,"interrupt-controller" ,NULL ,0 ); +if (res)return res; + + res =fdt_property_cell (fdt,"#interrupt-cells" ,2 ); +if (res)return res; + + res =fdt_end_node (fdt); +if (res)return res; + +return fdt_end_node (fdt); +} +static const struct arch_info *get_arch_info (libxl__gc *gc,const struct xc_dom_image *dom) {
@@ -1305,6 +1346,12 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config,FDT (make_virtio_mmio_node_i2c (gc, fdt, i2c->base, i2c->irq) ); } +for (i =0 ; i < d_config->num_gpios; i++) { +libxl_device_gpio *gpio = &d_config->gpios[i]; + +FDT (make_virtio_mmio_node_gpio (gc, fdt, gpio->base, gpio->irq) ); + } +if (pfdt)FDT (copy_partial_fdt (gc, fdt, pfdt) );
Signature · 1 line
2.31.1.272.g89b43f80a514
Re: [PATCH V3 3/6] libxl: arm: Create alloc_virtio_mmio_params()
In reply to Viresh KumarOn 04.08.22 10:01, Viresh Kumar wrote:
Hello Viresh
Quoted 47 lines
Create a separate routine to allocate base and irq for a device as the same code will be required for each device type.
Suggested-by Oleksandr Tyshchenko <[email protected]>Signed-off-by Viresh Kumar <[email protected]>--- tools/libs/light/libxl_arm.c | 38 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-)tools/libs/light/libxl_arm.c +20
-3@@ -48,6 +48,24 @@ static uint32_t alloc_virtio_mmio_irq(libxl__gc *gc, uint32_t *virtio_mmio_irq)return irq; } +static int alloc_virtio_mmio_params (libxl__gc *gc,uint64_t *base, +uint32_t *irq,uint64_t *virtio_mmio_base, +uint32_t *virtio_mmio_irq) +{ + *base =alloc_virtio_mmio_base (gc, virtio_mmio_base); +if (!*base) +return ERROR_FAIL ; + + *irq =alloc_virtio_mmio_irq (gc, virtio_mmio_irq); +if (!*irq) +return ERROR_FAIL ; + +LOG (DEBUG ,"Allocate Virtio MMIO params: IRQ %u BASE 0x%" PRIx64, *irq, + *base); + +return 0 ; +} +static const char *gicv_to_string (libxl_gic_version gic_version) {switch (gic_version) {@@ -85,20 +103,12 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,libxl_device_disk *disk = &d_config->disks[i];if (disk->specification ==LIBXL_DISK_SPECIFICATION_VIRTIO ) { - disk->base =alloc_virtio_mmio_base (gc, &virtio_mmio_base); -if (!disk->base) -return ERROR_FAIL ; +int rc =alloc_virtio_mmio_params (gc, &disk->base, &disk->irq, + &virtio_mmio_base, &virtio_mmio_irq);
tools/libs/light/libxl_arm.c int libxl__arch_domain_prepare_config(libxl__gc *gc, · line 111
Quoted 10 lines
tools/libs/light/libxl_arm.c +2
-6+if (rc) +return rc; - disk->irq =alloc_virtio_mmio_irq (gc, &virtio_mmio_irq); -if (!disk->irq) -return ERROR_FAIL ; - -if (virtio_irq < disk->irq) - virtio_irq = disk->irq; virtio_enabled = true;
I think that "virtio_enabled = true;" should be moved ...
Quoted 7 lines
tools/libs/light/libxl_arm.c +0
-3- -LOG (DEBUG ,"Allocate Virtio MMIO params for Vdev %s: IRQ %u BASE 0x%" PRIx64, - disk->vdev, disk->irq, disk->base); } }
tools/libs/light/libxl_arm.c int libxl__arch_domain_prepare_config(libxl__gc *gc, · line 122
Quoted 7 lines
tools/libs/light/libxl_arm.c +2
-1@@ -107,8 +117,10 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,* present, make sure that we allocate enough SPIs for them. * The resulting "nr_spis" needs to cover the highest possible SPI. */ -if (virtio_enabled) +if (virtio_mmio_irq !=GUEST_VIRTIO_MMIO_SPI_FIRST ) { + virtio_irq = virtio_mmio_irq -1 ; nr_spis =max (nr_spis, virtio_irq -32 +1 );
... here. Otherwise after applying all patches "virtio_enabled" only gets set if there is a virtio disk device. So it won't be set for virtio i2c, etc.
I see that in V2 it was there, but in V3 is not. Or maybe there is some reason for doing that which I am not aware of?
Other changes look good.
Quoted 4 lines
tools/libs/light/libxl_arm.c +1
-0+ }for (i =0 ; i < d_config->b_info.num_irqs; i++) {uint32_t irq = d_config->b_info.irqs[i];
Signature · 3 lines
Regards, Oleksandr Tyshchenko
Re: [PATCH V3 4/6] libxl: arm: Split make_virtio_mmio_node()
In reply to Viresh KumarOn 04.08.22 10:01, Viresh Kumar wrote:
Hello Viresh
Quoted 58 lines
make_virtio_mmio_node()creates the DT node for simple MMIO devices currently, i.e. the ones that don't require any additional properties.In order to allow using it for other complex device types, split the functionality into two, one where the fdt node isn't closed and the other one to create a simple DT node.
Signed-off-by Viresh Kumar <[email protected]>--- tools/libs/light/libxl_arm.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)tools/libs/light/libxl_arm.c +12
-8@@ -900,9 +900,8 @@ static int make_xen_iommu_node(libxl__gc *gc, void *fdt)return 0 ; } -static int make_virtio_mmio_node (libxl__gc *gc,void *fdt, -uint64_t base,uint32_t irq, -uint32_t backend_domid) +static int make_virtio_mmio_node_common (libxl__gc *gc,void *fdt,uint64_t base, +uint32_t irq) {int res;gic_interrupt intr;@@ -922,7 +921,15 @@ static int make_virtio_mmio_node(libxl__gc *gc, void *fdt, res =fdt_property_interrupts (gc, fdt, &intr,1 );if (res)return res; - res =fdt_property (fdt,"dma-coherent" ,NULL ,0 ); +return fdt_property (fdt,"dma-coherent" ,NULL ,0 ); +} + +static int make_virtio_mmio_node_simple (libxl__gc *gc,void *fdt,uint64_t base, +uint32_t irq,uint32_t backend_domid) +{ +int res; + + res =make_virtio_mmio_node_common (gc, fdt, base, irq);if (res)return res;if (backend_domid !=LIBXL_TOOLSTACK_DOMID ) {@@ -935,10 +942,7 @@ static int make_virtio_mmio_node(libxl__gc *gc, void *fdt,if (res)return res; } - res =fdt_end_node (fdt); -if (res)return res; - -return 0 ; +return fdt_end_node (fdt); } static const struct arch_info *get_arch_info(libxl__gc *gc,
tools/libs/light/libxl_arm.c static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, · line 1271
Quoted 9 lines
tools/libs/light/libxl_arm.c +2
-2@@ -1261,8 +1265,8 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, iommu_created = true; } -FDT (make_virtio_mmio_node (gc, fdt, disk->base, disk->irq, - disk->backend_domid) ); +FDT (make_virtio_mmio_node_simple (gc, fdt, disk->base, + disk->irq, disk->backend_domid) ); } }
[I failed to find a better place where to make a comment]
I think that the following chunk should be also moved to make_virtio_mmio_node_common() since it is not a virtio disk specific action, this "iommus" property pointing to "xen,grant-dma" IOMMU node is used to inform a guest that restricted memory access using Xen grant mappings needs to be enabled for the virtio device if it's backend is going to run in a non hardware domain, which I assume also applies for virtio i2c, etc.
if (backend_domid != LIBXL_TOOLSTACK_DOMID) {
uint32_t iommus_prop[2];
iommus_prop[0] = cpu_to_fdt32(GUEST_PHANDLE_IOMMU); iommus_prop[1] = cpu_to_fdt32(backend_domid);
res = fdt_property(fdt, "iommus", iommus_prop, sizeof(iommus_prop)); if (res) return res;
}
This means that "uint32_t backend_domid" should be also passed as argument to make_virtio_mmio_node_common()
Something like the diff on top of current patch below (not tested):
tools/libs/light/libxl_arm.c +0 -0
@@ -900,7 +900,7 @@ static int make_xen_iommu_node(libxl__gc *gc, void *fdt)
}
static int make_virtio_mmio_node_common(libxl__gc *gc, void *fdt, uint64_t base,
- uint32_t irq)
+ uint32_t irq, uint32_t backend_domid)
{
int res;
gic_interrupt intr;
@@ -920,15 +920,7 @@ static int make_virtio_mmio_node_common(libxl__gc *gc, void *fdt, uint64_t base, res = fdt_property_interrupts(gc, fdt, &intr, 1);
if (res) return res;
- return fdt_property(fdt, "dma-coherent", NULL, 0);
-}
-
-static int make_virtio_mmio_node_simple(libxl__gc *gc, void *fdt, uint64_t base, - uint32_t irq, uint32_t backend_domid) -{
- int res;
-
- res = make_virtio_mmio_node_common(gc, fdt, base, irq);
+ res = fdt_property(fdt, "dma-coherent", NULL, 0);
if (res) return res;
if (backend_domid != LIBXL_TOOLSTACK_DOMID) {
@@ -941,6 +933,17 @@ static int make_virtio_mmio_node_simple(libxl__gc *gc, void *fdt, uint64_t base, if (res) return res;
}
+ return res;
+}
+
+static int make_virtio_mmio_node_simple(libxl__gc *gc, void *fdt, uint64_t base, + uint32_t irq, uint32_t backend_domid) +{
+ int res;
+
+ res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); + if (res) return res;
+
return fdt_end_node(fdt);
}
Other changes look good.
Quoted 1 line
Signature · 3 lines
Regards, Oleksandr Tyshchenko
Re: [PATCH V3 5/6] libxl: Allocate MMIO params for I2c device and update DT
In reply to Viresh KumarOn 04.08.22 10:01, Viresh Kumar wrote:
Hello Viresh
Quoted 60 lines
This patch allocates Virtio MMIO params (IRQ and memory region) and pass them to the backend, also update Guest device-tree based on Virtio I2C DT bindings [1].
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/i2c/i2c-virtio.yaml
Signed-off-by Viresh Kumar <[email protected]>--- tools/libs/light/libxl_arm.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)tools/libs/light/libxl_arm.c +29
-0@@ -112,6 +112,15 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, } } +for (i =0 ; i < d_config->num_i2cs; i++) { +libxl_device_i2c *i2c = &d_config->i2cs[i]; + +int rc =alloc_virtio_mmio_params (gc, &i2c->base, &i2c->irq, + &virtio_mmio_base, &virtio_mmio_irq); +if (rc) +return rc; + } +/* * Every virtio-mmio device uses one emulated SPI. If Virtio devices are * present, make sure that we allocate enough SPIs for them. @@ -945,6 +954,26 @@ static int make_virtio_mmio_node_simple(libxl__gc *gc, void *fdt, uint64_t base,return fdt_end_node (fdt); } +static int make_virtio_mmio_node_i2c (libxl__gc *gc,void *fdt,uint64_t base, +uint32_t irq) +{ +int res; + + res =make_virtio_mmio_node_common (gc, fdt, base, irq); +if (res)return res; + + res =fdt_begin_node (fdt,"i2c" ); +if (res)return res; + + res =fdt_property_compat (gc, fdt,1 ,"virtio,device22" ); +if (res)return res; + + res =fdt_end_node (fdt); +if (res)return res; + +return fdt_end_node (fdt); +} +static const struct arch_info *get_arch_info (libxl__gc *gc,const struct xc_dom_image *dom) {@@ -1270,6 +1299,12 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, }
tools/libs/light/libxl_arm.c static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, · line 1309
Quoted 10 lines
tools/libs/light/libxl_arm.c +6
-0} +for (i =0 ; i < d_config->num_i2cs; i++) { +libxl_device_i2c *i2c = &d_config->i2cs[i]; + +FDT (make_virtio_mmio_node_i2c (gc, fdt, i2c->base, i2c->irq) ); + } +if (pfdt)FDT (copy_partial_fdt (gc, fdt, pfdt) );
I think that patch needs to be updated according to the suggestion provided for "[PATCH V3 4/6] libxl: arm: Split make_virtio_mmio_node()" (of course, if you agree with it).
If so, the make_virtio_mmio_node_i2c() should gain "uint32_t backend_domid" argument, etc. And with introducing new virtio i2c the make_xen_iommu_node() should also be called for it if not created yet (or maybe better to have only single invocation of make_xen_iommu_node() at the end)
Something like the diff on top of current patch below (not tested):
tools/libs/light/libxl_arm.c +0 -0
@@ -957,11 +957,11 @@ static int make_virtio_mmio_node_simple(libxl__gc *gc, void *fdt, uint64_t base,
}
static int make_virtio_mmio_node_i2c(libxl__gc *gc, void *fdt, uint64_t base, - uint32_t irq)
+ uint32_t irq, uint32_t backend_domid) {
int res;
- res = make_virtio_mmio_node_common(gc, fdt, base, irq);
+ res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); if (res) return res;
res = fdt_begin_node(fdt, "i2c");
@@ -1177,7 +1177,7 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, size_t fdt_size = 0;
int pfdt_size = 0;
libxl_domain_build_info *const info = &d_config->b_info;
- bool iommu_created;
+ bool iommu_needed;
unsigned int i;
const libxl_version_info *vers;
@@ -1285,16 +1285,13 @@ next_resize:
if (d_config->num_pcidevs)
FDT( make_vpci_node(gc, fdt, ainfo, dom) );
- iommu_created = false;
+ iommu_needed = false;
for (i = 0; i < d_config->num_disks; i++) { libxl_device_disk *disk = &d_config->disks[i];
if (disk->specification == LIBXL_DISK_SPECIFICATION_VIRTIO) { - if (disk->backend_domid != LIBXL_TOOLSTACK_DOMID && - !iommu_created) {
- FDT( make_xen_iommu_node(gc, fdt) );
- iommu_created = true;
- }
+ if (disk->backend_domid != LIBXL_TOOLSTACK_DOMID) + iommu_needed = true;
FDT( make_virtio_mmio_node_simple(gc, fdt, disk->base, disk->irq, disk->backend_domid) ); @@ -1303,10 +1300,20 @@ next_resize:
for (i = 0; i < d_config->num_i2cs; i++) { libxl_device_i2c *i2c = &d_config->i2cs[i]; + if (i2c->backend_domid != LIBXL_TOOLSTACK_DOMID) + iommu_needed = true;
- FDT( make_virtio_mmio_node_i2c(gc, fdt, i2c->base, i2c->irq) ); + FDT( make_virtio_mmio_node_i2c(gc, fdt, i2c->base, i2c->irq, + i2c->backend_domid) ); }
+ /*
+ * Note, this should be only called after creating all virtio-mmio + * device nodes
+ */
+ if (iommu_needed)
+ FDT( make_xen_iommu_node(gc, fdt) );
+
if (pfdt)
FDT( copy_partial_fdt(gc, fdt, pfdt) );
(END)
Other changes look good.
Quoted 1 line
Signature · 3 lines
Regards, Oleksandr Tyshchenko
Re: [PATCH V3 6/6] libxl: Allocate MMIO params for GPIO device and update DT
In reply to Viresh KumarOn 04.08.22 10:01, Viresh Kumar wrote:
Hello Viresh
Quoted 72 lines
This patch allocates Virtio MMIO params (IRQ and memory region) and pass them to the backend, also update Guest device-tree based on Virtio GPIO DT bindings [1].
[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/gpio/gpio-virtio.yaml
Signed-off-by Viresh Kumar <[email protected]>--- tools/libs/light/libxl_arm.c | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)tools/libs/light/libxl_arm.c +41
-0@@ -121,6 +121,15 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,return rc; } +for (i =0 ; i < d_config->num_gpios; i++) { +libxl_device_gpio *gpio = &d_config->gpios[i]; + +int rc =alloc_virtio_mmio_params (gc, &gpio->base, &gpio->irq, + &virtio_mmio_base, &virtio_mmio_irq); +if (rc) +return rc; + } +/* * Every virtio-mmio device uses one emulated SPI. If Virtio devices are * present, make sure that we allocate enough SPIs for them. @@ -974,6 +983,38 @@ static int make_virtio_mmio_node_i2c(libxl__gc *gc, void *fdt, uint64_t base,return fdt_end_node (fdt); } +static int make_virtio_mmio_node_gpio (libxl__gc *gc,void *fdt,uint64_t base, +uint32_t irq) +{ +int res; + + res =make_virtio_mmio_node_common (gc, fdt, base, irq); +if (res)return res; + + res =fdt_begin_node (fdt,"gpio" ); +if (res)return res; + + res =fdt_property_compat (gc, fdt,1 ,"virtio,device29" ); +if (res)return res; + + res =fdt_property (fdt,"gpio-controller" ,NULL ,0 ); +if (res)return res; + + res =fdt_property_cell (fdt,"#gpio-cells" ,2 ); +if (res)return res; + + res =fdt_property (fdt,"interrupt-controller" ,NULL ,0 ); +if (res)return res; + + res =fdt_property_cell (fdt,"#interrupt-cells" ,2 ); +if (res)return res; + + res =fdt_end_node (fdt); +if (res)return res; + +return fdt_end_node (fdt); +} +static const struct arch_info *get_arch_info (libxl__gc *gc,const struct xc_dom_image *dom) {@@ -1305,6 +1346,12 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config,FDT (make_virtio_mmio_node_i2c (gc, fdt, i2c->base, i2c->irq) );
tools/libs/light/libxl_arm.c static int libxl__prepare_dtb(libxl__gc *gc, libxl_domain_config *d_config, · line 1356
Quoted 10 lines
tools/libs/light/libxl_arm.c +6
-0} +for (i =0 ; i < d_config->num_gpios; i++) { +libxl_device_gpio *gpio = &d_config->gpios[i]; + +FDT (make_virtio_mmio_node_gpio (gc, fdt, gpio->base, gpio->irq) ); + } +if (pfdt)FDT (copy_partial_fdt (gc, fdt, pfdt) );
I think that patch needs to be updated taking into the account suggestions provided for two previous patches (of course, if you agree with them).
If so, the make_virtio_mmio_node_gpio() should gain "uint32_t backend_domid" argument, etc. And we need to make sure that make_xen_iommu_node() will be called for virtio gpio.
Something like the diff on top of current patch below (not tested):
tools/libs/light/libxl_arm.c +0 -0
@@ -986,11 +986,11 @@ static int make_virtio_mmio_node_i2c(libxl__gc *gc, void *fdt, uint64_t base,
}
static int make_virtio_mmio_node_gpio(libxl__gc *gc, void *fdt, uint64_t base, - uint32_t irq)
+ uint32_t irq, uint32_t backend_domid) {
int res;
- res = make_virtio_mmio_node_common(gc, fdt, base, irq);
+ res = make_virtio_mmio_node_common(gc, fdt, base, irq, backend_domid); if (res) return res;
res = fdt_begin_node(fdt, "gpio");
@@ -1350,8 +1350,11 @@ next_resize:
for (i = 0; i < d_config->num_gpios; i++) { libxl_device_gpio *gpio = &d_config->gpios[i]; + if (gpio->backend_domid != LIBXL_TOOLSTACK_DOMID) + iommu_needed = true;
- FDT( make_virtio_mmio_node_gpio(gc, fdt, gpio->base, gpio->irq) ); + FDT( make_virtio_mmio_node_gpio(gc, fdt, gpio->base, gpio->irq,
+ gpio->backend_domid) );
}
/*
Other changes look good.
Quoted 1 line
Signature · 3 lines
Regards, Oleksandr Tyshchenko
Quoted 1 line · Viresh Kumar
Hello,
Hello Viresh
Quoted 7 lines
This patchset adds toolstack support for I2C and GPIO virtio devices. This is inspired from the work done by Oleksandr for the Disk device.
This is developed as part of Linaro's Project Stratos, where we are working towards Hypervisor agnostic Rust based backend [1].
Quoted 6 lines
This is based of origin/staging (commit
01ca29f0b17a("sched:dom0_vcpus_pinshould only affect dom0")) which already has Oleksandr's patches applied.
V2->V3:
- Rebased over latest tree and made changes according to changes in Oleksandr's patches from sometime back.
Thanks, I have reviewed all patches that touch libxl_arm.c (##3-6)
Quoted 53 lines
- Minor cleanups.
V1->V2:
- Patches 3/6 and 4/6 are new.
- Patches 5/6 and 6/6 updated based on the above two patches.
- Added link to the bindings for I2C and GPIO.
- Rebased over latest master branch.Thanks.
--
Viresh[1] https://lore.kernel.org/xen-devel/20220414092358.kepxbmnrtycz7mhe@vireshk-i7/
Viresh Kumar (6):
libxl: Add support for Virtio I2C device
libxl: Add support for Virtio GPIO device
libxl: arm: Createalloc_virtio_mmio_params()
libxl: arm: Splitmake_virtio_mmio_node()
libxl: Allocate MMIO params for I2c device and update DT
libxl: Allocate MMIO params for GPIO device and update DTtools/golang/xenlight/helpers.gen.go | 212 ++++++++++++++++++++ tools/golang/xenlight/types.gen.go | 54 ++++++ tools/include/libxl.h | 64 ++++++ tools/include/libxl_utils.h | 6 + tools/libs/light/Makefile | 2 + tools/libs/light/libxl_arm.c | 138 +++++++++++-- tools/libs/light/libxl_create.c | 26 +++ tools/libs/light/libxl_dm.c | 34 +++- tools/libs/light/libxl_gpio.c | 226 ++++++++++++++++++++++ tools/libs/light/libxl_i2c.c | 226 ++++++++++++++++++++++ tools/libs/light/libxl_internal.h | 2 + tools/libs/light/libxl_types.idl | 48 +++++ tools/libs/light/libxl_types_internal.idl | 2 + tools/ocaml/libs/xl/genwrap.py | 2 + tools/ocaml/libs/xl/xenlight_stubs.c | 2 + tools/xl/Makefile | 2 +- tools/xl/xl.h | 6 + tools/xl/xl_cmdtable.c | 30 +++ tools/xl/xl_gpio.c | 142 ++++++++++++++ tools/xl/xl_i2c.c | 142 ++++++++++++++ tools/xl/xl_parse.c | 160 +++++++++++++++ tools/xl/xl_parse.h | 2 + tools/xl/xl_sxp.c | 4 + 23 files changed, 1509 insertions(+), 23 deletions(-)create mode 100644
tools/libs/light/libxl_gpio.ccreate mode 100644tools/libs/light/libxl_i2c.ccreate mode 100644tools/xl/xl_gpio.ccreate mode 100644tools/xl/xl_i2c.c
Signature · 3 lines
Regards, Oleksandr Tyshchenko
Re: [PATCH V3 3/6] libxl: arm: Create alloc_virtio_mmio_params()
In reply to OleksandrQuoted 82 lines · Oleksandr
On 04.08.22 10:01, Viresh Kumar wrote:
Hello Viresh
Quoted 44 lines
Create a separate routine to allocate base and irq for a device as the same code will be required for each device type.
Suggested-by Oleksandr Tyshchenko <[email protected]>Signed-off-by Viresh Kumar <[email protected]>--- tools/libs/light/libxl_arm.c | 38 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-)tools/libs/light/libxl_arm.c +19
-3@@ -48,6 +48,24 @@ static uint32_t alloc_virtio_mmio_irq(libxl__gc *gc, uint32_t *virtio_mmio_irq)return irq; } +static int alloc_virtio_mmio_params (libxl__gc *gc,uint64_t *base, +uint32_t *irq,uint64_t *virtio_mmio_base, +uint32_t *virtio_mmio_irq) +{ + *base =alloc_virtio_mmio_base (gc, virtio_mmio_base); +if (!*base) +return ERROR_FAIL ; + + *irq =alloc_virtio_mmio_irq (gc, virtio_mmio_irq); +if (!*irq) +return ERROR_FAIL ; + +LOG (DEBUG ,"Allocate Virtio MMIO params: IRQ %u BASE 0x%" PRIx64, *irq, + *base); + +return 0 ; +} +static const char *gicv_to_string (libxl_gic_version gic_version) {switch (gic_version) {@@ -85,20 +103,12 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,libxl_device_disk *disk = &d_config->disks[i];if (disk->specification ==LIBXL_DISK_SPECIFICATION_VIRTIO ) { - disk->base =alloc_virtio_mmio_base (gc, &virtio_mmio_base); -if (!disk->base) -return ERROR_FAIL ; + int rc = alloc_virtio_mmio_params(gc, &disk->base, &disk->irq,tools/libs/light/libxl_arm.c int libxl__arch_domain_prepare_config(libxl__gc *gc, · line 109
Quoted 10 lines
tools/libs/light/libxl_arm.c +3
-6+ &virtio_mmio_base, &virtio_mmio_irq); +if (rc) +return rc; - disk->irq =alloc_virtio_mmio_irq (gc, &virtio_mmio_irq); -if (!disk->irq) -return ERROR_FAIL ; - -if (virtio_irq < disk->irq) - virtio_irq = disk->irq; virtio_enabled = true;I think that "
virtio_enabled= true;" should be moved ...tools/libs/light/libxl_arm.c int libxl__arch_domain_prepare_config(libxl__gc *gc, · line 122
Quoted 13 lines
tools/libs/light/libxl_arm.c +2
-4- -LOG (DEBUG ,"Allocate Virtio MMIO params for Vdev %s: IRQ %u BASE 0x%" PRIx64, - disk->vdev, disk->irq, disk->base); } }@@ -107,8 +117,10 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,* present, make sure that we allocate enough SPIs for them. * The resulting "nr_spis" needs to cover the highest possible SPI. */ -if (virtio_enabled) +if (virtio_mmio_irq !=GUEST_VIRTIO_MMIO_SPI_FIRST ) { + virtio_irq = virtio_mmio_irq -1 ; nr_spis =max (nr_spis, virtio_irq -32 +1 );... here. Otherwise after applying all patches "
virtio_enabled" only gets set if there is a virtio disk device. So it won't be set for virtio i2c, etc.
Quoted 2 lines
I see that in V2 it was there, but in V3 is not. Or maybe there is some reason for doing that which I am not aware of?
There is only one use of virtio_enabled after this patch, i.e. do check for vpl011. Maybe we can drop the variable and use virtio_mmio_irq != GUEST_VIRTIO_MMIO_SPI_FIRST ?
Signature · 1 line
viresh
Re: [PATCH V3 3/6] libxl: arm: Create alloc_virtio_mmio_params()
Quoted 3 lines · Viresh Kumar
There is only one use of
virtio_enabledafter this patch, i.e. do check for vpl011. Maybe we can drop the variable and usevirtio_mmio_irq!=GUEST_VIRTIO_MMIO_SPI_FIRST?
Nevermind, after modifying code I decided to keep the variable instead.
Signature · 1 line
viresh