From nobody Sat Apr 27 18:54:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1659596584; cv=none; d=zohomail.com; s=zohoarc; b=VEUvuAUEes/+F2QwV2rwYCRfrYc9nWJkLV9kWG9GvqqfnDqq3p9GVDK09JJZtKDj6+ffQAD3g4gVfj4CfGQ9Xz3MdIs5dBbkoX0ndJ43JsilunuuNDJlU4/y5Cy5Cgmq400FlQ1YrQQr72+dzrD4VEZQFBBzj4ajg8jIPtp5oF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659596584; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yuZwz8uc5wN8Cuv0zx5mBsmVFoUbz2odV0n16zvvUWs=; b=J9/Od1lD4z3iWN/3iF1Zg9sENrl5TVwiVPKiL90NOw0IYj8HOS9T6Q836vC4ZGtBYqQy1WVfhfDwTtXhHcPDBQK+4HGgzSAjQQQeqw8Ivtku/vKa/lmEiD/NNRcGIJ1ja8pGa+mYK7bwWIdYyEndEDENZK430C0rFlUmd+cEekI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1659596584651918.1419608977326; Thu, 4 Aug 2022 00:03:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.380188.614228 (Exim 4.92) (envelope-from ) id 1oJUry-0008Ov-I7; Thu, 04 Aug 2022 07:02:10 +0000 Received: by outflank-mailman (output) from mailman id 380188.614228; Thu, 04 Aug 2022 07:02:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUry-0008Ok-Ec; Thu, 04 Aug 2022 07:02:10 +0000 Received: by outflank-mailman (input) for mailman id 380188; Thu, 04 Aug 2022 07:02:09 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUrw-000883-LF for xen-devel@lists.xen.org; Thu, 04 Aug 2022 07:02:08 +0000 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [2607:f8b0:4864:20::42c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 58ea8c49-13c3-11ed-bd2d-47488cf2e6aa; Thu, 04 Aug 2022 09:02:05 +0200 (CEST) Received: by mail-pf1-x42c.google.com with SMTP id g12so18583879pfb.3 for ; Thu, 04 Aug 2022 00:02:05 -0700 (PDT) Received: from localhost ([122.171.18.80]) by smtp.gmail.com with ESMTPSA id f11-20020aa79d8b000000b00528c3ad8e09sm122696pfq.66.2022.08.04.00.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 00:02:03 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 58ea8c49-13c3-11ed-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yuZwz8uc5wN8Cuv0zx5mBsmVFoUbz2odV0n16zvvUWs=; b=nK8GLyWJ+PU0uo74Lx5SOgKTNuV6XTTN5f76SOdQSIDOlwm7T6Nod848pg6pL4chTE hU72pI934W+vGowgQc1V3AfSqU82sIBb2j3M9TTC7bHE17BEjc2NLMAbxpanL/19L/Yn a4qS8bvOC67nvbD166vnT6fp9sm9I+7jISl1yoM4aDFRazn8g69dnOGsDm55VXZHVM6w xKPHCldOT4ORGAE9lR6ZRXMS7XM88eBzQQW9srHl3B919b8FfGhIq5bEgS+nWcFb8eLx nLRdU9v3D/p9mrVOJuJ458gkWngzEu1I3wdBaiWKGeVf9FP7repJgUOPWZUQQAVnM1r5 2zGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yuZwz8uc5wN8Cuv0zx5mBsmVFoUbz2odV0n16zvvUWs=; b=WnDZbLWAzdcHairC/Ay3K+Le4241j7+K5dHrmMPaxq6vriHFzqUSK7yDpWZJWqQAuj UqgYMxc7/Dap3C+83Q9SiwzFfFFvB/tFq8eaSxNt78SPFAL/JUfy1w9KWp/0zPkcU2zh J7lD9mcCZMF20OQtDPVmiatcbb3KkVPCeAvV4NuByxZaQGLHhtB2GfRnSYzyS1yfRGYC qVGlPfy2v9kzdibzPtl9pGYZ6DGWfxyTHcP26dQ12Rl5PZYq/yfDdfF2rdms4jbmIZ+A GZcnaCd2WmdJErSLJi+vl4T2wa1/OjspqL6uUFYLPuZ7PhQouD/zJSGt0qJ4COGpk270 kxnw== X-Gm-Message-State: ACgBeo3bjQKJLAKK5P6PJdf1HOWf+4YEytGqQqZd5u4e9iraKnRlRcao /1GpaiFnrywhnfSOB5f5iEMLDiIpSOU1CA== X-Google-Smtp-Source: AA6agR6DeSoPu8ilVEQvwYemn0oh1V25UV19Sj9jSD6kTDC4+rERJn/9l6AOxh2bjjhH9ViSWPDIrA== X-Received: by 2002:a65:6a52:0:b0:41b:6cd:dfd3 with SMTP id o18-20020a656a52000000b0041b06cddfd3mr493761pgu.545.1659596524183; Thu, 04 Aug 2022 00:02:04 -0700 (PDT) From: Viresh Kumar To: xen-devel@lists.xen.org Cc: Viresh Kumar , Vincent Guittot , stratos-dev@op-lists.linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefano Stabellini , Mathieu Poirier , Mike Holmes , Oleksandr Tyshchenko , Wei Liu , Juergen Gross , Julien Grall Subject: [PATCH V3 1/6] libxl: Add support for Virtio I2C device Date: Thu, 4 Aug 2022 12:31:49 +0530 Message-Id: <6cd6ca9d72d4f844e8a007b687e28f49301fae03.1659596139.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659596585973100004 Content-Type: text/plain; charset="utf-8" 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 =3D [ "" ] 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. Signed-off-by: Viresh Kumar --- 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 diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/h= elpers.gen.go index fa3cf2ab7658..4c7b60439bf0 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1221,6 +1221,9 @@ x.Usbdevice =3D C.GoString(tmp.usbdevice) if err :=3D x.VkbDevice.fromC(&tmp.vkb_device);err !=3D nil { return fmt.Errorf("converting field VkbDevice: %v", err) } +if err :=3D x.I2cDevice.fromC(&tmp.i2c_device);err !=3D nil { +return fmt.Errorf("converting field I2cDevice: %v", err) +} x.Soundhw =3D C.GoString(tmp.soundhw) if err :=3D x.XenPlatformPci.fromC(&tmp.xen_platform_pci);err !=3D nil { return fmt.Errorf("converting field XenPlatformPci: %v", err) @@ -1538,6 +1541,9 @@ hvm.usbdevice =3D C.CString(tmp.Usbdevice)} if err :=3D tmp.VkbDevice.toC(&hvm.vkb_device); err !=3D nil { return fmt.Errorf("converting field VkbDevice: %v", err) } +if err :=3D tmp.I2cDevice.toC(&hvm.i2c_device); err !=3D nil { +return fmt.Errorf("converting field I2cDevice: %v", err) +} if tmp.Soundhw !=3D "" { hvm.soundhw =3D C.CString(tmp.Soundhw)} if err :=3D tmp.XenPlatformPci.toC(&hvm.xen_platform_pci); err !=3D nil { @@ -1734,6 +1740,46 @@ xc.multi_touch_num_contacts =3D C.uint32_t(x.MultiTo= uchNumContacts) return nil } =20 +// 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 :=3D x.fromC(&xc); err !=3D nil { +return nil, err } + +return &x, nil} + +func (x *DeviceI2c) fromC(xc *C.libxl_device_i2c) error { + x.BackendDomid =3D Domid(xc.backend_domid) +x.BackendDomname =3D C.GoString(xc.backend_domname) +x.Devid =3D Devid(xc.devid) +x.BackendType =3D I2cBackend(xc.backend_type) +x.Irq =3D uint32(xc.irq) +x.Base =3D uint64(xc.base) + + return nil} + +func (x *DeviceI2c) toC(xc *C.libxl_device_i2c) (err error){defer func(){ +if err !=3D nil{ +C.libxl_device_i2c_dispose(xc)} +}() + +xc.backend_domid =3D C.libxl_domid(x.BackendDomid) +if x.BackendDomname !=3D "" { +xc.backend_domname =3D C.CString(x.BackendDomname)} +xc.devid =3D C.libxl_devid(x.Devid) +xc.backend_type =3D C.libxl_i2c_backend(x.BackendType) +xc.irq =3D C.uint32_t(x.Irq) +xc.base =3D C.uint64_t(x.Base) + + return nil + } + // NewDeviceDisk returns an instance of DeviceDisk initialized with defaul= ts. func NewDeviceDisk() (*DeviceDisk, error) { var ( @@ -2867,6 +2913,15 @@ if err :=3D x.Vkbs[i].fromC(&v); err !=3D nil { return fmt.Errorf("converting field Vkbs: %v", err) } } } +x.I2cs =3D nil +if n :=3D int(xc.num_i2cs); n > 0 { +cI2cs :=3D (*[1<<28]C.libxl_device_i2c)(unsafe.Pointer(xc.i2cs))[:n:n] +x.I2cs =3D make([]DeviceI2c, n) +for i, v :=3D range cI2cs { +if err :=3D x.I2cs[i].fromC(&v); err !=3D nil { +return fmt.Errorf("converting field I2cs: %v", err) } +} +} x.Vtpms =3D nil if n :=3D int(xc.num_vtpms); n > 0 { cVtpms :=3D (*[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 :=3D len(x.I2cs); numI2cs > 0 { +xc.i2cs =3D (*C.libxl_device_i2c)(C.malloc(C.ulong(numI2cs)*C.sizeof_libxl= _device_i2c)) +xc.num_i2cs =3D C.int(numI2cs) +cI2cs :=3D (*[1<<28]C.libxl_device_i2c)(unsafe.Pointer(xc.i2cs))[:numI2cs:= numI2cs] +for i,v :=3D range x.I2cs { +if err :=3D v.toC(&cI2cs[i]); err !=3D nil { +return fmt.Errorf("converting field I2cs: %v", err) +} +} +} if numVtpms :=3D len(x.Vtpms); numVtpms > 0 { xc.vtpms =3D (*C.libxl_device_vtpm)(C.malloc(C.ulong(numVtpms)*C.sizeof_li= bxl_device_vtpm)) xc.num_vtpms =3D C.int(numVtpms) @@ -3733,6 +3798,49 @@ xc.rref =3D C.int(x.Rref) return nil } =20 +// 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 :=3D x.fromC(&xc); err !=3D nil { +return nil, err } + +return &x, nil} + +func (x *I2cinfo) fromC(xc *C.libxl_i2cinfo) error { + x.Backend =3D C.GoString(xc.backend) +x.BackendId =3D uint32(xc.backend_id) +x.Frontend =3D C.GoString(xc.frontend) +x.FrontendId =3D uint32(xc.frontend_id) +x.Devid =3D Devid(xc.devid) +x.State =3D int(xc.state) +x.Evtch =3D int(xc.evtch) +x.Rref =3D int(xc.rref) + + return nil} + +func (x *I2cinfo) toC(xc *C.libxl_i2cinfo) (err error){defer func(){ +if err !=3D nil{ +C.libxl_i2cinfo_dispose(xc)} +}() + +if x.Backend !=3D "" { +xc.backend =3D C.CString(x.Backend)} +xc.backend_id =3D C.uint32_t(x.BackendId) +if x.Frontend !=3D "" { +xc.frontend =3D C.CString(x.Frontend)} +xc.frontend_id =3D C.uint32_t(x.FrontendId) +xc.devid =3D C.libxl_devid(x.Devid) +xc.state =3D C.int(x.State) + + return nil + } + // NewNumainfo returns an instance of Numainfo initialized with defaults. func NewNumainfo() (*Numainfo, error) { var ( diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/typ= es.gen.go index a0be7ada8c63..f8d7e84d6180 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -255,6 +255,11 @@ VkbBackendQemu VkbBackend =3D 1 VkbBackendLinux VkbBackend =3D 2 ) =20 +type I2cBackend int +const( +I2cBackendVirtio I2cBackend =3D 0 +) + type Passthrough int const( PassthroughDefault Passthrough =3D 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 } =20 +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 } =20 +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 diff --git a/tools/include/libxl.h b/tools/include/libxl.h index 2321a648a59a..ab18c0b8c794 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -829,6 +829,15 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_BUILDINFO_VKB_DEVICE 1 =20 +/* + * 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 inclu= de + * 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; =20 +/* 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) diff --git a/tools/include/libxl_utils.h b/tools/include/libxl_utils.h index 46918aea847f..72b7796b7e4b 100644 --- a/tools/include/libxl_utils.h +++ b/tools/include/libxl_utils.h @@ -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); =20 +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); =20 diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 13545654c2fc..961bdd33297b 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -112,6 +112,7 @@ OBJS-y +=3D libxl_vdispl.o OBJS-y +=3D libxl_pvcalls.o OBJS-y +=3D libxl_vsnd.o OBJS-y +=3D libxl_vkb.o +OBJS-y +=3D libxl_i2c.o OBJS-y +=3D libxl_genid.o OBJS-y +=3D _libxl_types.o OBJS-y +=3D libxl_flask.o diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_creat= e.c index b9dd2deedf13..84fe9f80c8fe 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -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); =20 libxl_defbool_setdefault(&b_info->u.hvm.spice.enable, false); @@ -1753,6 +1754,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libx= l__multidev *multidev, libxl__device_console console; libxl__device device; libxl_device_vkb vkb; + libxl_device_i2c i2c; =20 init_console_info(gc, &console, 0); console.backend_domid =3D state->console_domid; @@ -1765,6 +1767,12 @@ static void domcreate_launch_dm(libxl__egc *egc, lib= xl__multidev *multidev, libxl_device_vkb_dispose(&vkb); } =20 + 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 =3D 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, lib= xl__multidev *multidev, &d_config->vkbs[i]); } =20 + for (i =3D 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 =3D=3D LIBXL_VUART_TYPE_SBSA_U= ART) { init_console_info(gc, &vuart, 0); vuart.backend_domid =3D state->console_domid; diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c index 1864ee30f0a2..9340ae4628a2 100644 --- a/tools/libs/light/libxl_dm.c +++ b/tools/libs/light/libxl_dm.c @@ -2095,7 +2095,8 @@ static void libxl__dm_vifs_from_hvm_guest_config(libx= l__gc *gc, static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, const libxl_domain_config *guest_c= onfig, libxl_device_vfb *vfb, - libxl_device_vkb *vkb) + libxl_device_vkb *vkb, + libxl_device_i2c *i2c) { const libxl_domain_build_info *b_info =3D &guest_config->b_info; =20 @@ -2104,6 +2105,7 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(l= ibxl__gc *gc, =20 libxl_device_vfb_init(vfb); libxl_device_vkb_init(vkb); + libxl_device_i2c_init(i2c); =20 vfb->backend_domid =3D 0; vfb->devid =3D 0; @@ -2114,6 +2116,9 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(l= ibxl__gc *gc, vkb->backend_domid =3D 0; vkb->devid =3D 0; =20 + i2c->backend_domid =3D 0; + i2c->devid =3D 0; + return 0; } =20 @@ -2276,6 +2281,7 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stu= b_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__s= tub_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, vk= b); + GCNEW(i2c); + libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, vfb, vk= b, i2c); dm_config->vfbs =3D vfb; dm_config->num_vfbs =3D 1; dm_config->vkbs =3D vkb; dm_config->num_vkbs =3D 1; + dm_config->i2cs =3D i2c; + dm_config->num_i2cs =3D 1; } =20 if (guest_config->b_info.stubdomain_kernel && @@ -2494,6 +2503,12 @@ static void spawn_stub_launch_dm(libxl__egc *egc, if (ret) goto out; } =20 + if (dm_config->num_i2cs) { + ret =3D 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) { diff --git a/tools/libs/light/libxl_i2c.c b/tools/libs/light/libxl_i2c.c new file mode 100644 index 000000000000..2c46351ce3a4 --- /dev/null +++ b/tools/libs/light/libxl_i2c.c @@ -0,0 +1,226 @@ +/* + * Copyright (C) 2022 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_internal.h" + +static int libxl__device_i2c_setdefault(libxl__gc *gc, uint32_t domid, + libxl_device_i2c *i2c, bool hotplu= g) +{ + if (i2c->backend_type !=3D LIBXL_I2C_BACKEND_VIRTIO) { + i2c->backend_type =3D LIBXL_I2C_BACKEND_VIRTIO; + } + + return libxl__resolve_domid(gc, i2c->backend_domname, &i2c->backend_do= mid); +} + +static int libxl__device_i2c_dm_needed(void *e, uint32_t domid) +{ + libxl_device_i2c *elem =3D e; + + return elem->backend_type =3D=3D LIBXL_I2C_BACKEND_VIRTIO; +} + +static int libxl__set_xenstore_i2c(libxl__gc *gc, uint32_t domid, + libxl_device_i2c *i2c, + flexarray_t *back, flexarray_t *front, + flexarray_t *ro_front) +{ + flexarray_append_pair(back, "irq", GCSPRINTF("%u", i2c->irq)); + flexarray_append_pair(back, "base", GCSPRINTF("%lu", i2c->base)); + + flexarray_append_pair(front, "irq", GCSPRINTF("%u", i2c->irq)); + flexarray_append_pair(front, "base", GCSPRINTF("%lu", i2c->base)); + + return 0; +} + +static int libxl__i2c_from_xenstore(libxl__gc *gc, const char *libxl_path, + libxl_devid devid, + libxl_device_i2c *i2c) +{ + const char *be_path, *fe_path, *tmp; + libxl__device dev; + int rc; + + i2c->devid =3D devid; + + rc =3D libxl__xs_read_mandatory(gc, XBT_NULL, + GCSPRINTF("%s/backend", libxl_path), + &be_path); + if (rc) goto out; + + rc =3D libxl__xs_read_mandatory(gc, XBT_NULL, + GCSPRINTF("%s/frontend", libxl_path), + &fe_path); + if (rc) goto out; + + rc =3D libxl__backendpath_parse_domid(gc, be_path, &i2c->backend_domid= ); + if (rc) goto out; + + rc =3D libxl__parse_backend_path(gc, be_path, &dev); + if (rc) goto out; + + i2c->backend_type =3D LIBXL_I2C_BACKEND_VIRTIO; + + rc =3D libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/irq", be_path), &tmp); + if (rc) goto out; + + if (tmp) { + i2c->irq =3D strtoul(tmp, NULL, 0); + } + + rc =3D libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/base", be_path), &tmp); + if (rc) goto out; + + if (tmp) { + i2c->base =3D strtoul(tmp, NULL, 0); + } + + rc =3D 0; + +out: + + return rc; +} + +static int libxl__device_from_i2c(libxl__gc *gc, uint32_t domid, + libxl_device_i2c *type, libxl__device *d= evice) +{ + device->backend_devid =3D type->devid; + device->backend_domid =3D type->backend_domid; + device->backend_kind =3D LIBXL__DEVICE_KIND_I2C; + device->devid =3D type->devid; + device->domid =3D domid; + device->kind =3D LIBXL__DEVICE_KIND_I2C; + + return 0; +} + +int libxl_device_i2c_add(libxl_ctx *ctx, uint32_t domid, libxl_device_i2c = *i2c, + const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, domid, ao_how); + int rc; + + rc =3D libxl__device_add(gc, domid, &libxl__i2c_devtype, i2c); + if (rc) { + LOGD(ERROR, domid, "Unable to add i2c device"); + goto out; + } + +out: + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; +} + +int libxl_devid_to_device_i2c(libxl_ctx *ctx, uint32_t domid, + int devid, libxl_device_i2c *i2c) +{ + GC_INIT(ctx); + + libxl_device_i2c *i2cs =3D NULL; + int n, i; + int rc; + + libxl_device_i2c_init(i2c); + + i2cs =3D libxl__device_list(gc, &libxl__i2c_devtype, domid, &n); + + if (!i2cs) { rc =3D ERROR_NOTFOUND; goto out; } + + for (i =3D 0; i < n; ++i) { + if (devid =3D=3D i2cs[i].devid) { + libxl_device_i2c_copy(ctx, i2c, &i2cs[i]); + rc =3D 0; + goto out; + } + } + + rc =3D ERROR_NOTFOUND; + +out: + + if (i2cs) + libxl__device_list_free(&libxl__i2c_devtype, i2cs, n); + + GC_FREE; + return rc; +} + +int libxl_device_i2c_getinfo(libxl_ctx *ctx, uint32_t domid, + const libxl_device_i2c *i2c, + libxl_i2cinfo *info) +{ + GC_INIT(ctx); + char *libxl_path, *dompath, *devpath; + char *val; + int rc; + + libxl_i2cinfo_init(info); + dompath =3D libxl__xs_get_dompath(gc, domid); + info->devid =3D i2c->devid; + + devpath =3D libxl__domain_device_frontend_path(gc, domid, info->devid, + LIBXL__DEVICE_KIND_I2C); + libxl_path =3D libxl__domain_device_libxl_path(gc, domid, info->devid, + LIBXL__DEVICE_KIND_I2C); + + info->backend =3D xs_read(ctx->xsh, XBT_NULL, + GCSPRINTF("%s/backend", libxl_path), + NULL); + if (!info->backend) { rc =3D ERROR_FAIL; goto out; } + + rc =3D libxl__backendpath_parse_domid(gc, info->backend, &info->backen= d_id); + if (rc) goto out; + + val =3D libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/state", devpath)); + info->state =3D val ? strtoul(val, NULL, 10) : -1; + + info->frontend =3D xs_read(ctx->xsh, XBT_NULL, + GCSPRINTF("%s/frontend", libxl_path), + NULL); + info->frontend_id =3D domid; + + rc =3D 0; + +out: + GC_FREE; + return rc; +} + +static LIBXL_DEFINE_UPDATE_DEVID(i2c) + +#define libxl__add_i2cs NULL +#define libxl_device_i2c_compare NULL + +LIBXL_DEFINE_DEVICE_LIST(i2c) +LIBXL_DEFINE_DEVICE_REMOVE(i2c) + +DEFINE_DEVICE_TYPE_STRUCT(i2c, I2C, i2cs, + .skip_attach =3D 1, + .dm_needed =3D libxl__device_i2c_dm_needed, + .set_xenstore_config =3D (device_set_xenstore_config_fn_t) + libxl__set_xenstore_i2c, + .from_xenstore =3D (device_from_xenstore_fn_t)libxl__i2c_from_xenstore +); + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_int= ernal.h index cb9e8b3b8b5a..a8904cfea427 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -4003,6 +4003,7 @@ static inline int *libxl__device_type_get_num( =20 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; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_type= s.idl index d634f304cda2..014a3ea8364c 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -278,6 +278,10 @@ libxl_vkb_backend =3D Enumeration("vkb_backend", [ (2, "LINUX") ]) =20 +libxl_i2c_backend =3D Enumeration("i2c_backend", [ + (0, "VIRTIO") + ]) + libxl_passthrough =3D Enumeration("passthrough", [ (0, "default"), (1, "disabled"), @@ -626,6 +630,7 @@ libxl_domain_build_info =3D Struct("domain_build_info",[ # - "mouse" for PS/2 protocol relat= ive mouse ("usbdevice", string), ("vkb_device", libxl_defbool), + ("i2c_device", libxl_defbool), ("soundhw", string), ("xen_platform_pci", libxl_defbool), ("usbdevice_list", libxl_string_l= ist), @@ -705,6 +710,15 @@ libxl_device_vkb =3D Struct("device_vkb", [ ("multi_touch_num_contacts", uint32) ]) =20 +libxl_device_i2c =3D 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 =3D Struct("device_disk", [ ("backend_domid", libxl_domid), ("backend_domname", string), @@ -982,6 +996,7 @@ libxl_domain_config =3D 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 =3D Struct("vkbinfo", [ ("rref", integer) ], dir=3DDIR_OUT) =20 +libxl_i2cinfo =3D Struct("i2cinfo", [ + ("backend", string), + ("backend_id", uint32), + ("frontend", string), + ("frontend_id", uint32), + ("devid", libxl_devid), + ("state", integer), + ], dir=3DDIR_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 th= is # node to each other node. diff --git a/tools/libs/light/libxl_types_internal.idl b/tools/libs/light/l= ibxl_types_internal.idl index 8f71980aecf1..1d83c600aaaf 100644 --- a/tools/libs/light/libxl_types_internal.idl +++ b/tools/libs/light/libxl_types_internal.idl @@ -33,6 +33,7 @@ libxl__device_kind =3D Enumeration("device_kind", [ (15, "VSND"), (16, "VINPUT"), (17, "VIRTIO_DISK"), + (18, "I2C"), ]) =20 libxl__console_backend =3D Enumeration("console_backend", [ diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index 7bf26bdcd831..a9db0b97d80f 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -36,6 +36,7 @@ DEVICE_LIST =3D [ ("list", ["ctx", "domid"= , "t list"]), functions =3D { # ( 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"]= ), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xen= light_stubs.c index 45b8af61c74a..cdf473f4ed57 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -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) =20 diff --git a/tools/xl/Makefile b/tools/xl/Makefile index b7f439121a3a..06801962f11e 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -23,7 +23,7 @@ XL_OBJS +=3D xl_vtpm.o xl_block.o xl_nic.o xl_usb.o XL_OBJS +=3D xl_sched.o xl_pci.o xl_vcpu.o xl_cdrom.o xl_mem.o XL_OBJS +=3D xl_info.o xl_console.o xl_misc.o XL_OBJS +=3D xl_vmcontrol.o xl_saverestore.o xl_migrate.o -XL_OBJS +=3D xl_vdispl.o xl_vsnd.o xl_vkb.o +XL_OBJS +=3D xl_vdispl.o xl_vsnd.o xl_vkb.o xl_i2c.o =20 $(XL_OBJS): CFLAGS +=3D $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS +=3D $(CFLAGS_XL) diff --git a/tools/xl/xl.h b/tools/xl/xl.h index 7c9aff6ad7a6..28618326149e 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -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); diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 35182ca19630..c409ab1578d4 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -406,6 +406,21 @@ const struct cmd_spec cmd_table[] =3D { "Destroy a domain's virtual keyboard device", " ", }, + { "i2c-attach", + &main_i2cattach, 1, 1, + "Create a new virtual i2c device", + " ...", + }, + { "i2c-list", + &main_i2clist, 0, 0, + "List virtual i2c devices for a domain", + "", + }, + { "i2c-detach", + &main_i2cdetach, 0, 1, + "Destroy a domain's virtual i2c device", + " ", + }, { "vdispl-attach", &main_vdisplattach, 1, 1, "Create a new virtual display device", diff --git a/tools/xl/xl_i2c.c b/tools/xl/xl_i2c.c new file mode 100644 index 000000000000..463fac2d5836 --- /dev/null +++ b/tools/xl/xl_i2c.c @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2022 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include + +#include +#include +#include + +#include "xl.h" +#include "xl_utils.h" +#include "xl_parse.h" + +int main_i2cattach(int argc, char **argv) +{ + int opt; + int rc; + uint32_t domid; + libxl_device_i2c i2c; + + SWITCH_FOREACH_OPT(opt, "", NULL, "i2c-attach", 2) { + /* No options */ + } + + libxl_device_i2c_init(&i2c); + domid =3D find_domain(argv[optind++]); + + for (argv +=3D optind, argc -=3D optind; argc > 0; ++argv, --argc) { + rc =3D parse_i2c_config(&i2c, *argv); + if (rc) goto out; + } + + if (dryrun_only) { + char *json =3D libxl_device_i2c_to_json(ctx, &i2c); + printf("i2c: %s\n", json); + free(json); + goto done; + } + + if (libxl_device_i2c_add(ctx, domid, &i2c, 0)) { + fprintf(stderr, "libxl_device_i2c_add failed.\n"); + rc =3D ERROR_FAIL; goto out; + } + +done: + rc =3D 0; + +out: + libxl_device_i2c_dispose(&i2c); + return rc; +} + +int main_i2clist(int argc, char **argv) +{ + int opt; + libxl_device_i2c *i2cs; + libxl_i2cinfo i2cinfo; + int nb, i; + + SWITCH_FOREACH_OPT(opt, "", NULL, "i2c-list", 1) { + /* No options */ + } + + /* Idx BE Hdl Sta evch ref ID BE-type BE-path */ + printf("%-3s %-2s %-6s %-5s %-6s %6s %-10s %-10s %-30s\n", + "Idx", "BE", "handle", "state", "evt-ch", "ref", + "ID", "BE-type", "BE-path"); + for (argv +=3D optind, argc -=3D optind; argc > 0; --argc, ++argv) { + uint32_t domid =3D find_domain(*argv); + i2cs =3D libxl_device_i2c_list(ctx, domid, &nb); + if (!i2cs) { + continue; + } + for (i =3D 0; i < nb; ++i) { + if (libxl_device_i2c_getinfo(ctx, domid, &i2cs[i], &i2cinfo) = =3D=3D 0) { + printf("%-3d %-2d %6d %5d %-10s %-30s\n", + i2cinfo.devid, i2cinfo.backend_id, + i2cinfo.devid, i2cinfo.state, + libxl_i2c_backend_to_string(i2cs[i].backend_type), + i2cinfo.backend); + libxl_i2cinfo_dispose(&i2cinfo); + } + } + libxl_device_i2c_list_free(i2cs, nb); + } + return 0; +} + +int main_i2cdetach(int argc, char **argv) +{ + uint32_t domid, devid; + int opt, rc; + libxl_device_i2c i2c; + + SWITCH_FOREACH_OPT(opt, "", NULL, "i2c-detach", 2) { + /* No options */ + } + + domid =3D find_domain(argv[optind++]); + devid =3D atoi(argv[optind++]); + + libxl_device_i2c_init(&i2c); + + if (libxl_devid_to_device_i2c(ctx, domid, devid, &i2c)) { + fprintf(stderr, "Error: Device %d not connected.\n", devid); + rc =3D ERROR_FAIL; + goto out; + } + + rc =3D libxl_device_i2c_remove(ctx, domid, &i2c, 0); + if (rc) { + fprintf(stderr, "libxl_device_i2c_remove failed.\n"); + rc =3D ERROR_FAIL; + goto out; + } + + rc =3D 0; + +out: + libxl_device_i2c_dispose(&i2c); + return rc; +} + + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 1b5381cef033..b91ffba14d40 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1208,6 +1208,74 @@ static void parse_vkb_list(const XLU_Config *config, if (rc) exit(EXIT_FAILURE); } =20 +int parse_i2c_config(libxl_device_i2c *i2c, char *token) +{ + char *oparg; + + if (MATCH_OPTION("backend", token, oparg)) { + i2c->backend_domname =3D strdup(oparg); + } else if (MATCH_OPTION("backend-type", token, oparg)) { + libxl_i2c_backend backend_type; + if (libxl_i2c_backend_from_string(oparg, &backend_type)) { + fprintf(stderr, "Unknown backend_type \"%s\" in i2c spec\n", + oparg); + return -1; + } + i2c->backend_type =3D backend_type; + } else if (MATCH_OPTION("irq", token, oparg)) { + i2c->irq =3D strtoul(oparg, NULL, 0); + } else if (MATCH_OPTION("base", token, oparg)) { + i2c->base =3D strtoul(oparg, NULL, 0); + } else { + fprintf(stderr, "Unknown string \"%s\" in i2c spec\n", token); + return -1; + } + + return 0; +} + +static void parse_i2c_list(const XLU_Config *config, + libxl_domain_config *d_config) +{ + XLU_ConfigList *i2cs; + const char *item; + char *buf =3D NULL; + int rc; + + if (!xlu_cfg_get_list (config, "i2c", &i2cs, 0, 0)) { + int entry =3D 0; + while ((item =3D xlu_cfg_get_listitem(i2cs, entry)) !=3D NULL) { + libxl_device_i2c *i2c; + char *p; + + i2c =3D ARRAY_EXTEND_INIT(d_config->i2cs, + d_config->num_i2cs, + libxl_device_i2c_init); + + buf =3D strdup(item); + + p =3D strtok (buf, ","); + while (p !=3D NULL) + { + while (*p =3D=3D ' ') p++; + + rc =3D parse_i2c_config(i2c, p); + if (rc) goto out; + + p =3D strtok (NULL, ","); + } + + entry++; + } + } + + rc =3D 0; + +out: + free(buf); + if (rc) exit(EXIT_FAILURE); +} + void parse_config_data(const char *config_source, const char *config_data, int config_len, @@ -2309,13 +2377,16 @@ void parse_config_data(const char *config_source, =20 d_config->num_vfbs =3D 0; d_config->num_vkbs =3D 0; + d_config->num_i2cs =3D 0; d_config->vfbs =3D NULL; d_config->vkbs =3D NULL; + d_config->i2cs =3D NULL; =20 if (!xlu_cfg_get_list (config, "vfb", &cvfbs, 0, 0)) { while ((buf =3D xlu_cfg_get_listitem (cvfbs, d_config->num_vfbs)) = !=3D NULL) { libxl_device_vfb *vfb; libxl_device_vkb *vkb; + libxl_device_i2c *i2c; =20 char *buf2 =3D strdup(buf); char *p, *p2; @@ -2326,6 +2397,9 @@ void parse_config_data(const char *config_source, vkb =3D ARRAY_EXTEND_INIT(d_config->vkbs, d_config->num_vkbs, libxl_device_vkb_init); =20 + i2c =3D ARRAY_EXTEND_INIT(d_config->i2cs, d_config->num_i2cs, + libxl_device_i2c_init); + p =3D strtok(buf2, ","); if (!p) goto skip_vfb; @@ -2583,6 +2657,7 @@ void parse_config_data(const char *config_source, if (vnc_enabled) { libxl_device_vfb *vfb; libxl_device_vkb *vkb; + libxl_device_i2c *i2c; =20 vfb =3D ARRAY_EXTEND_INIT(d_config->vfbs, d_config->num_vfbs, libxl_device_vfb_init); @@ -2590,6 +2665,9 @@ void parse_config_data(const char *config_source, vkb =3D ARRAY_EXTEND_INIT(d_config->vkbs, d_config->num_vkbs, libxl_device_vkb_init); =20 + i2c =3D ARRAY_EXTEND_INIT(d_config->i2cs, d_config->num_i2cs, + libxl_device_i2c_init); + parse_top_level_vnc_options(config, &vfb->vnc); parse_top_level_sdl_options(config, &vfb->sdl); xlu_cfg_replace_string (config, "keymap", &vfb->keymap, 0); @@ -2704,6 +2782,7 @@ void parse_config_data(const char *config_source, exit(-ERROR_FAIL); } xlu_cfg_get_defbool(config, "vkb_device", &b_info->u.hvm.vkb_devic= e, 0); + xlu_cfg_get_defbool(config, "i2c_device", &b_info->u.hvm.i2c_devic= e, 0); xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw,= 0); xlu_cfg_get_defbool(config, "xen_platform_pci", &b_info->u.hvm.xen_platform_pci, 0); @@ -2752,6 +2831,7 @@ void parse_config_data(const char *config_source, } =20 parse_vkb_list(config, d_config); + parse_i2c_list(config, d_config); =20 xlu_cfg_get_defbool(config, "xend_suspend_evtchn_compat", &c_info->xend_suspend_evtchn_compat, 0); diff --git a/tools/xl/xl_parse.h b/tools/xl/xl_parse.h index bab2861f8c3e..4b972d525199 100644 --- a/tools/xl/xl_parse.h +++ b/tools/xl/xl_parse.h @@ -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); =20 int match_option_size(const char *prefix, size_t len, char *arg, char **argopt); diff --git a/tools/xl/xl_sxp.c b/tools/xl/xl_sxp.c index 359a0015709e..a44c765aa515 100644 --- a/tools/xl/xl_sxp.c +++ b/tools/xl/xl_sxp.c @@ -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: --=20 2.31.1.272.g89b43f80a514 From nobody Sat Apr 27 18:54:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1659596574; cv=none; d=zohomail.com; s=zohoarc; b=A5vnnBpBMElFrh1ZFp64hc4KDoNEih70zHGt/wj4V7GBG1ChM7lORGTdZ3DGzfB2K8qbZ7EQz5BFARQNLy7juU34WlzjLVjp3k+Xiyp/AokCRI5yn+LXR9yfzLF7PPTKTwo1QpX7WfA/nLAPApoBiSGlDwageJlOUXTWR0TIxIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659596574; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P4kqj2jADnNbmqdjtfqu3TdDmLlLN1dIEeugaQ81KuY=; b=l9qd3ZWuos9XHC8g/wHYUYHz5FfIb0tYY4LUHXgpUMpQbWg3fJeRHzJKWaDRrkKcTVlksYNg38Mkuy1U+S6dAf/r7A8R6yDpKDd6dvlO3XXE4Fnv+nyPL8oBTaUSQvA2sXkqz8ySBuWqaUdkyN1ih0V72oQIBQu6Qt++g/nSfpA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 165959657402451.5825125899554; Thu, 4 Aug 2022 00:02:54 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.380189.614239 (Exim 4.92) (envelope-from ) id 1oJUs2-0000GI-0d; Thu, 04 Aug 2022 07:02:14 +0000 Received: by outflank-mailman (output) from mailman id 380189.614239; Thu, 04 Aug 2022 07:02:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUs1-0000G8-Sk; Thu, 04 Aug 2022 07:02:13 +0000 Received: by outflank-mailman (input) for mailman id 380189; Thu, 04 Aug 2022 07:02:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUs0-000883-Cu for xen-devel@lists.xen.org; Thu, 04 Aug 2022 07:02:12 +0000 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [2607:f8b0:4864:20::52c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5b335924-13c3-11ed-bd2d-47488cf2e6aa; Thu, 04 Aug 2022 09:02:09 +0200 (CEST) Received: by mail-pg1-x52c.google.com with SMTP id q16so17171115pgq.6 for ; Thu, 04 Aug 2022 00:02:09 -0700 (PDT) Received: from localhost ([122.171.18.80]) by smtp.gmail.com with ESMTPSA id c137-20020a624e8f000000b0052859441ad3sm40259pfb.214.2022.08.04.00.02.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 00:02:06 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5b335924-13c3-11ed-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P4kqj2jADnNbmqdjtfqu3TdDmLlLN1dIEeugaQ81KuY=; b=pQTa1poEm0NEyC3F6Cj203J2MOskG7YJRSLRBzeurJEyW1zIdB7Of25gQH+ZorCA2L W4RQ8i21nn/2dXlK6wQbkobOY2Ea7zqxX+/1seTFAREb3HH48pbvAWumbneWGX/bT9pc NvuUmcouR2opiUuf+MwZeGAb54NG81trDQb7EDycGx72lnAchgKIJOj0TUDpuiCOfKb3 zmoqBjFOc2LGOds3dI9OLpUL32tHN74kWnK4d23OymSjWqMkd7auoXAK/7ovtRvuAFVr U5X6N9yx4zeaX/RouEsHubQx49V8lM6bJJH6zB5h1LeImEL8GrK+hYYl5uC/w4ZFKwAh YFpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P4kqj2jADnNbmqdjtfqu3TdDmLlLN1dIEeugaQ81KuY=; b=t1aV3UPaFK8Yh6/+OGNm/YpjQmfJY0Ib7b93AsEtYLndRVeMVJJeqYqo5Wws0RAsMR slAv5YgGGF0nJQHCPsQ4jOj1alU9ZXOf3sEDXH6ExIevMNQ+8aB05Sjrcp5j51r2OzRw RZgpamOp1S7v+526SI1wQqxgg2AbfcQBwdHSkq11GWi44ru0BKOXBwhJRKF8CoIj7UHe 9zkjika9Nl5t6M3SjIa9b5OV4wXE/zclPZDfrUDaqVj9tUjbmvwETpM6TeQaGjbuc/wE SiwsYXB27nhKWvGrFBQQ0ZiW77j2+XWzr+CXJ1tmY7VH27b0RpiJaF9lz9WiT5A9cwmw ektA== X-Gm-Message-State: ACgBeo0QHOeZYNPfGgd6nYOxmfvPOvPt2OnrelhAQIumtB+3ts9H985q NV3O6ZE13ha4t4J7k5DlE1vKHk0NjO4iDg== X-Google-Smtp-Source: AA6agR4eanw+Z7+wPffMHwz9AKakvaTKBPOF0440rRrZP7ddsEoLCXdikFtPl3ldID4olqskSkwJTQ== X-Received: by 2002:a63:10c:0:b0:41b:b4ba:d5da with SMTP id 12-20020a63010c000000b0041bb4bad5damr532648pgb.322.1659596527914; Thu, 04 Aug 2022 00:02:07 -0700 (PDT) From: Viresh Kumar To: xen-devel@lists.xen.org Cc: Viresh Kumar , Vincent Guittot , stratos-dev@op-lists.linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefano Stabellini , Mathieu Poirier , Mike Holmes , Oleksandr Tyshchenko , Wei Liu , Juergen Gross , Julien Grall Subject: [PATCH V3 2/6] libxl: Add support for Virtio GPIO device Date: Thu, 4 Aug 2022 12:31:50 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659596576217100003 Content-Type: text/plain; charset="utf-8" This 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 =3D [ "" ] 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. Signed-off-by: Viresh Kumar --- 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 diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/h= elpers.gen.go index 4c7b60439bf0..2f41ace71c61 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1221,6 +1221,9 @@ x.Usbdevice =3D C.GoString(tmp.usbdevice) if err :=3D x.VkbDevice.fromC(&tmp.vkb_device);err !=3D nil { return fmt.Errorf("converting field VkbDevice: %v", err) } +if err :=3D x.GpioDevice.fromC(&tmp.gpio_device);err !=3D nil { +return fmt.Errorf("converting field GpioDevice: %v", err) +} if err :=3D x.I2cDevice.fromC(&tmp.i2c_device);err !=3D nil { return fmt.Errorf("converting field I2cDevice: %v", err) } @@ -1541,6 +1544,9 @@ hvm.usbdevice =3D C.CString(tmp.Usbdevice)} if err :=3D tmp.VkbDevice.toC(&hvm.vkb_device); err !=3D nil { return fmt.Errorf("converting field VkbDevice: %v", err) } +if err :=3D tmp.GpioDevice.toC(&hvm.gpio_device); err !=3D nil { +return fmt.Errorf("converting field GpioDevice: %v", err) +} if err :=3D tmp.I2cDevice.toC(&hvm.i2c_device); err !=3D nil { return fmt.Errorf("converting field I2cDevice: %v", err) } @@ -1740,6 +1746,46 @@ xc.multi_touch_num_contacts =3D C.uint32_t(x.MultiTo= uchNumContacts) return nil } =20 +// NewDeviceGpio returns an instance of DeviceGpio initialized with defaul= ts. +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 :=3D x.fromC(&xc); err !=3D nil { +return nil, err } + +return &x, nil} + +func (x *DeviceGpio) fromC(xc *C.libxl_device_gpio) error { + x.BackendDomid =3D Domid(xc.backend_domid) +x.BackendDomname =3D C.GoString(xc.backend_domname) +x.Devid =3D Devid(xc.devid) +x.BackendType =3D GpioBackend(xc.backend_type) +x.Irq =3D uint32(xc.irq) +x.Base =3D uint64(xc.base) + + return nil} + +func (x *DeviceGpio) toC(xc *C.libxl_device_gpio) (err error){defer func(){ +if err !=3D nil{ +C.libxl_device_gpio_dispose(xc)} +}() + +xc.backend_domid =3D C.libxl_domid(x.BackendDomid) +if x.BackendDomname !=3D "" { +xc.backend_domname =3D C.CString(x.BackendDomname)} +xc.devid =3D C.libxl_devid(x.Devid) +xc.backend_type =3D C.libxl_gpio_backend(x.BackendType) +xc.irq =3D C.uint32_t(x.Irq) +xc.base =3D 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 :=3D x.Vkbs[i].fromC(&v); err !=3D nil { return fmt.Errorf("converting field Vkbs: %v", err) } } } +x.Gpios =3D nil +if n :=3D int(xc.num_gpios); n > 0 { +cGpios :=3D (*[1<<28]C.libxl_device_gpio)(unsafe.Pointer(xc.gpios))[:n:n] +x.Gpios =3D make([]DeviceGpio, n) +for i, v :=3D range cGpios { +if err :=3D x.Gpios[i].fromC(&v); err !=3D nil { +return fmt.Errorf("converting field Gpios: %v", err) } +} +} x.I2cs =3D nil if n :=3D int(xc.num_i2cs); n > 0 { cI2cs :=3D (*[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 :=3D len(x.Gpios); numGpios > 0 { +xc.gpios =3D (*C.libxl_device_gpio)(C.malloc(C.ulong(numGpios)*C.sizeof_li= bxl_device_gpio)) +xc.num_gpios =3D C.int(numGpios) +cGpios :=3D (*[1<<28]C.libxl_device_gpio)(unsafe.Pointer(xc.gpios))[:numGp= ios:numGpios] +for i,v :=3D range x.Gpios { +if err :=3D v.toC(&cGpios[i]); err !=3D nil { +return fmt.Errorf("converting field Gpios: %v", err) +} +} +} if numI2cs :=3D len(x.I2cs); numI2cs > 0 { xc.i2cs =3D (*C.libxl_device_i2c)(C.malloc(C.ulong(numI2cs)*C.sizeof_libxl= _device_i2c)) xc.num_i2cs =3D C.int(numI2cs) @@ -3798,6 +3863,47 @@ xc.rref =3D C.int(x.Rref) return nil } =20 +// 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 :=3D x.fromC(&xc); err !=3D nil { +return nil, err } + +return &x, nil} + +func (x *Gpioinfo) fromC(xc *C.libxl_gpioinfo) error { + x.Backend =3D C.GoString(xc.backend) +x.BackendId =3D uint32(xc.backend_id) +x.Frontend =3D C.GoString(xc.frontend) +x.FrontendId =3D uint32(xc.frontend_id) +x.Devid =3D Devid(xc.devid) +x.State =3D int(xc.state) + + return nil} + +func (x *Gpioinfo) toC(xc *C.libxl_gpioinfo) (err error){defer func(){ +if err !=3D nil{ +C.libxl_gpioinfo_dispose(xc)} +}() + +if x.Backend !=3D "" { +xc.backend =3D C.CString(x.Backend)} +xc.backend_id =3D C.uint32_t(x.BackendId) +if x.Frontend !=3D "" { +xc.frontend =3D C.CString(x.Frontend)} +xc.frontend_id =3D C.uint32_t(x.FrontendId) +xc.devid =3D C.libxl_devid(x.Devid) +xc.state =3D 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 =3D C.GoString(xc.frontend) x.FrontendId =3D uint32(xc.frontend_id) x.Devid =3D Devid(xc.devid) x.State =3D int(xc.state) -x.Evtch =3D int(xc.evtch) -x.Rref =3D int(xc.rref) =20 return nil} =20 diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/typ= es.gen.go index f8d7e84d6180..5a4656035cd1 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -255,6 +255,11 @@ VkbBackendQemu VkbBackend =3D 1 VkbBackendLinux VkbBackend =3D 2 ) =20 +type GpioBackend int +const( +GpioBackendVirtio GpioBackend =3D 0 +) + type I2cBackend int const( I2cBackendVirtio I2cBackend =3D 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 } =20 +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 } =20 +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 diff --git a/tools/include/libxl.h b/tools/include/libxl.h index ab18c0b8c794..3bbb6d031372 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -829,6 +829,15 @@ typedef struct libxl__ctx libxl_ctx; */ #define LIBXL_HAVE_BUILDINFO_VKB_DEVICE 1 =20 +/* + * 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 incl= ude + * 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; =20 +/* GPIO */ +int libxl_device_gpio_add(libxl_ctx *ctx, uint32_t domid, libxl_device_gpi= o *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) diff --git a/tools/include/libxl_utils.h b/tools/include/libxl_utils.h index 72b7796b7e4b..91f5c68172cb 100644 --- a/tools/include/libxl_utils.h +++ b/tools/include/libxl_utils.h @@ -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); =20 +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); =20 diff --git a/tools/libs/light/Makefile b/tools/libs/light/Makefile index 961bdd33297b..7fae83100829 100644 --- a/tools/libs/light/Makefile +++ b/tools/libs/light/Makefile @@ -113,6 +113,7 @@ OBJS-y +=3D libxl_pvcalls.o OBJS-y +=3D libxl_vsnd.o OBJS-y +=3D libxl_vkb.o OBJS-y +=3D libxl_i2c.o +OBJS-y +=3D libxl_gpio.o OBJS-y +=3D libxl_genid.o OBJS-y +=3D _libxl_types.o OBJS-y +=3D libxl_flask.o diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_creat= e.c index 84fe9f80c8fe..98a27ff8c005 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -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); =20 @@ -1754,6 +1755,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libx= l__multidev *multidev, libxl__device_console console; libxl__device device; libxl_device_vkb vkb; + libxl_device_gpio gpio; libxl_device_i2c i2c; =20 init_console_info(gc, &console, 0); @@ -1767,6 +1769,12 @@ static void domcreate_launch_dm(libxl__egc *egc, lib= xl__multidev *multidev, libxl_device_vkb_dispose(&vkb); } =20 + 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, lib= xl__multidev *multidev, &d_config->vkbs[i]); } =20 + for (i =3D 0; i < d_config->num_gpios; i++) { + libxl__device_add(gc, domid, &libxl__gpio_devtype, + &d_config->gpios[i]); + } + for (i =3D 0; i < d_config->num_i2cs; i++) { libxl__device_add(gc, domid, &libxl__i2c_devtype, &d_config->i2cs[i]); diff --git a/tools/libs/light/libxl_dm.c b/tools/libs/light/libxl_dm.c index 9340ae4628a2..124b73f1dd00 100644 --- a/tools/libs/light/libxl_dm.c +++ b/tools/libs/light/libxl_dm.c @@ -2096,6 +2096,7 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(l= ibxl__gc *gc, const libxl_domain_config *guest_c= onfig, libxl_device_vfb *vfb, libxl_device_vkb *vkb, + libxl_device_gpio *gpio, libxl_device_i2c *i2c) { const libxl_domain_build_info *b_info =3D &guest_config->b_info; @@ -2105,6 +2106,7 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(l= ibxl__gc *gc, =20 libxl_device_vfb_init(vfb); libxl_device_vkb_init(vkb); + libxl_device_gpio_init(gpio); libxl_device_i2c_init(i2c); =20 vfb->backend_domid =3D 0; @@ -2116,6 +2118,9 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(l= ibxl__gc *gc, vkb->backend_domid =3D 0; vkb->devid =3D 0; =20 + gpio->backend_domid =3D 0; + gpio->devid =3D 0; + i2c->backend_domid =3D 0; i2c->devid =3D 0; =20 @@ -2281,6 +2286,7 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stu= b_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__s= tub_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, vk= b, i2c); + libxl__vfb_and_vkb_from_hvm_guest_config(gc, guest_config, vfb, vk= b, gpio, i2c); dm_config->vfbs =3D vfb; dm_config->num_vfbs =3D 1; dm_config->vkbs =3D vkb; dm_config->num_vkbs =3D 1; + dm_config->gpios =3D gpio; + dm_config->num_gpios =3D 1; dm_config->i2cs =3D i2c; dm_config->num_i2cs =3D 1; } @@ -2503,6 +2512,12 @@ static void spawn_stub_launch_dm(libxl__egc *egc, if (ret) goto out; } =20 + if (dm_config->num_gpios) { + ret =3D libxl__device_add(gc, dm_domid, &libxl__gpio_devtype, + &dm_config->gpios[0]); + if (ret) goto out; + } + if (dm_config->num_i2cs) { ret =3D libxl__device_add(gc, dm_domid, &libxl__i2c_devtype, &dm_config->i2cs[0]); diff --git a/tools/libs/light/libxl_gpio.c b/tools/libs/light/libxl_gpio.c new file mode 100644 index 000000000000..1597f0ac7cea --- /dev/null +++ b/tools/libs/light/libxl_gpio.c @@ -0,0 +1,226 @@ +/* + * Copyright (C) 2022 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_internal.h" + +static int libxl__device_gpio_setdefault(libxl__gc *gc, uint32_t domid, + libxl_device_gpio *gpio, bool hotp= lug) +{ + if (gpio->backend_type !=3D LIBXL_GPIO_BACKEND_VIRTIO) { + gpio->backend_type =3D LIBXL_GPIO_BACKEND_VIRTIO; + } + + return libxl__resolve_domid(gc, gpio->backend_domname, &gpio->backend_= domid); +} + +static int libxl__device_gpio_dm_needed(void *e, uint32_t domid) +{ + libxl_device_gpio *elem =3D e; + + return elem->backend_type =3D=3D LIBXL_GPIO_BACKEND_VIRTIO; +} + +static int libxl__set_xenstore_gpio(libxl__gc *gc, uint32_t domid, + libxl_device_gpio *gpio, + flexarray_t *back, flexarray_t *front, + flexarray_t *ro_front) +{ + flexarray_append_pair(back, "irq", GCSPRINTF("%u", gpio->irq)); + flexarray_append_pair(back, "base", GCSPRINTF("%lu", gpio->base)); + + flexarray_append_pair(front, "irq", GCSPRINTF("%u", gpio->irq)); + flexarray_append_pair(front, "base", GCSPRINTF("%lu", gpio->base)); + + return 0; +} + +static int libxl__gpio_from_xenstore(libxl__gc *gc, const char *libxl_path, + libxl_devid devid, + libxl_device_gpio *gpio) +{ + const char *be_path, *fe_path, *tmp; + libxl__device dev; + int rc; + + gpio->devid =3D devid; + + rc =3D libxl__xs_read_mandatory(gc, XBT_NULL, + GCSPRINTF("%s/backend", libxl_path), + &be_path); + if (rc) goto out; + + rc =3D libxl__xs_read_mandatory(gc, XBT_NULL, + GCSPRINTF("%s/frontend", libxl_path), + &fe_path); + if (rc) goto out; + + rc =3D libxl__backendpath_parse_domid(gc, be_path, &gpio->backend_domi= d); + if (rc) goto out; + + rc =3D libxl__parse_backend_path(gc, be_path, &dev); + if (rc) goto out; + + gpio->backend_type =3D LIBXL_GPIO_BACKEND_VIRTIO; + + rc =3D libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/irq", be_path), &tmp); + if (rc) goto out; + + if (tmp) { + gpio->irq =3D strtoul(tmp, NULL, 0); + } + + rc =3D libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/base", be_path), &tmp); + if (rc) goto out; + + if (tmp) { + gpio->base =3D strtoul(tmp, NULL, 0); + } + + rc =3D 0; + +out: + + return rc; +} + +static int libxl__device_from_gpio(libxl__gc *gc, uint32_t domid, + libxl_device_gpio *type, libxl__device *= device) +{ + device->backend_devid =3D type->devid; + device->backend_domid =3D type->backend_domid; + device->backend_kind =3D LIBXL__DEVICE_KIND_GPIO; + device->devid =3D type->devid; + device->domid =3D domid; + device->kind =3D LIBXL__DEVICE_KIND_GPIO; + + return 0; +} + +int libxl_device_gpio_add(libxl_ctx *ctx, uint32_t domid, libxl_device_gpi= o *gpio, + const libxl_asyncop_how *ao_how) +{ + AO_CREATE(ctx, domid, ao_how); + int rc; + + rc =3D libxl__device_add(gc, domid, &libxl__gpio_devtype, gpio); + if (rc) { + LOGD(ERROR, domid, "Unable to add gpio device"); + goto out; + } + +out: + libxl__ao_complete(egc, ao, rc); + return AO_INPROGRESS; +} + +int libxl_devid_to_device_gpio(libxl_ctx *ctx, uint32_t domid, + int devid, libxl_device_gpio *gpio) +{ + GC_INIT(ctx); + + libxl_device_gpio *gpios =3D NULL; + int n, i; + int rc; + + libxl_device_gpio_init(gpio); + + gpios =3D libxl__device_list(gc, &libxl__gpio_devtype, domid, &n); + + if (!gpios) { rc =3D ERROR_NOTFOUND; goto out; } + + for (i =3D 0; i < n; ++i) { + if (devid =3D=3D gpios[i].devid) { + libxl_device_gpio_copy(ctx, gpio, &gpios[i]); + rc =3D 0; + goto out; + } + } + + rc =3D ERROR_NOTFOUND; + +out: + + if (gpios) + libxl__device_list_free(&libxl__gpio_devtype, gpios, n); + + GC_FREE; + return rc; +} + +int libxl_device_gpio_getinfo(libxl_ctx *ctx, uint32_t domid, + const libxl_device_gpio *gpio, + libxl_gpioinfo *info) +{ + GC_INIT(ctx); + char *libxl_path, *dompath, *devpath; + char *val; + int rc; + + libxl_gpioinfo_init(info); + dompath =3D libxl__xs_get_dompath(gc, domid); + info->devid =3D gpio->devid; + + devpath =3D libxl__domain_device_frontend_path(gc, domid, info->devid, + LIBXL__DEVICE_KIND_GPIO); + libxl_path =3D libxl__domain_device_libxl_path(gc, domid, info->devid, + LIBXL__DEVICE_KIND_GPIO); + + info->backend =3D xs_read(ctx->xsh, XBT_NULL, + GCSPRINTF("%s/backend", libxl_path), + NULL); + if (!info->backend) { rc =3D ERROR_FAIL; goto out; } + + rc =3D libxl__backendpath_parse_domid(gc, info->backend, &info->backen= d_id); + if (rc) goto out; + + val =3D libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/state", devpath)); + info->state =3D val ? strtoul(val, NULL, 10) : -1; + + info->frontend =3D xs_read(ctx->xsh, XBT_NULL, + GCSPRINTF("%s/frontend", libxl_path), + NULL); + info->frontend_id =3D domid; + + rc =3D 0; + +out: + GC_FREE; + return rc; +} + +static LIBXL_DEFINE_UPDATE_DEVID(gpio) + +#define libxl__add_gpios NULL +#define libxl_device_gpio_compare NULL + +LIBXL_DEFINE_DEVICE_LIST(gpio) +LIBXL_DEFINE_DEVICE_REMOVE(gpio) + +DEFINE_DEVICE_TYPE_STRUCT(gpio, GPIO, gpios, + .skip_attach =3D 1, + .dm_needed =3D libxl__device_gpio_dm_needed, + .set_xenstore_config =3D (device_set_xenstore_config_fn_t) + libxl__set_xenstore_gpio, + .from_xenstore =3D (device_from_xenstore_fn_t)libxl__gpio_from_xenstore +); + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_int= ernal.h index a8904cfea427..a64d0cb63179 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -4003,6 +4003,7 @@ static inline int *libxl__device_type_get_num( =20 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; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_type= s.idl index 014a3ea8364c..4c476a325e9d 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -278,6 +278,10 @@ libxl_vkb_backend =3D Enumeration("vkb_backend", [ (2, "LINUX") ]) =20 +libxl_gpio_backend =3D Enumeration("gpio_backend", [ + (0, "VIRTIO") + ]) + libxl_i2c_backend =3D Enumeration("i2c_backend", [ (0, "VIRTIO") ]) @@ -630,6 +634,7 @@ libxl_domain_build_info =3D Struct("domain_build_info",[ # - "mouse" for PS/2 protocol relat= ive 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 =3D Struct("device_vkb", [ ("multi_touch_num_contacts", uint32) ]) =20 +libxl_device_gpio =3D 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 =3D Struct("device_i2c", [ ("backend_domid", libxl_domid), ("backend_domname", string), @@ -996,6 +1010,7 @@ libxl_domain_config =3D 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 =3D Struct("vkbinfo", [ ("rref", integer) ], dir=3DDIR_OUT) =20 +libxl_gpioinfo =3D Struct("gpioinfo", [ + ("backend", string), + ("backend_id", uint32), + ("frontend", string), + ("frontend_id", uint32), + ("devid", libxl_devid), + ("state", integer), + ], dir=3DDIR_OUT) + libxl_i2cinfo =3D Struct("i2cinfo", [ ("backend", string), ("backend_id", uint32), diff --git a/tools/libs/light/libxl_types_internal.idl b/tools/libs/light/l= ibxl_types_internal.idl index 1d83c600aaaf..253faedf235f 100644 --- a/tools/libs/light/libxl_types_internal.idl +++ b/tools/libs/light/libxl_types_internal.idl @@ -34,6 +34,7 @@ libxl__device_kind =3D Enumeration("device_kind", [ (16, "VINPUT"), (17, "VIRTIO_DISK"), (18, "I2C"), + (19, "GPIO"), ]) =20 libxl__console_backend =3D Enumeration("console_backend", [ diff --git a/tools/ocaml/libs/xl/genwrap.py b/tools/ocaml/libs/xl/genwrap.py index a9db0b97d80f..ffab4b362d2a 100644 --- a/tools/ocaml/libs/xl/genwrap.py +++ b/tools/ocaml/libs/xl/genwrap.py @@ -36,6 +36,7 @@ DEVICE_LIST =3D [ ("list", ["ctx", "domid"= , "t list"]), functions =3D { # ( 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"]), diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xen= light_stubs.c index cdf473f4ed57..0114cc22a1b6 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -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) diff --git a/tools/xl/Makefile b/tools/xl/Makefile index 06801962f11e..34ff203bfd86 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -23,7 +23,7 @@ XL_OBJS +=3D xl_vtpm.o xl_block.o xl_nic.o xl_usb.o XL_OBJS +=3D xl_sched.o xl_pci.o xl_vcpu.o xl_cdrom.o xl_mem.o XL_OBJS +=3D xl_info.o xl_console.o xl_misc.o XL_OBJS +=3D xl_vmcontrol.o xl_saverestore.o xl_migrate.o -XL_OBJS +=3D xl_vdispl.o xl_vsnd.o xl_vkb.o xl_i2c.o +XL_OBJS +=3D xl_vdispl.o xl_vsnd.o xl_vkb.o xl_gpio.o xl_i2c.o =20 $(XL_OBJS): CFLAGS +=3D $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS +=3D $(CFLAGS_XL) diff --git a/tools/xl/xl.h b/tools/xl/xl.h index 28618326149e..dfa557077631 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -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); diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index c409ab1578d4..0c0d32b2e25b 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -406,6 +406,21 @@ const struct cmd_spec cmd_table[] =3D { "Destroy a domain's virtual keyboard device", " ", }, + { "gpio-attach", + &main_gpioattach, 1, 1, + "Create a new virtual gpio device", + " ...", + }, + { "gpio-list", + &main_gpiolist, 0, 0, + "List virtual gpio devices for a domain", + "", + }, + { "gpio-detach", + &main_gpiodetach, 0, 1, + "Destroy a domain's virtual gpio device", + " ", + }, { "i2c-attach", &main_i2cattach, 1, 1, "Create a new virtual i2c device", diff --git a/tools/xl/xl_gpio.c b/tools/xl/xl_gpio.c new file mode 100644 index 000000000000..fa63b01ab180 --- /dev/null +++ b/tools/xl/xl_gpio.c @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2022 Linaro Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include + +#include +#include +#include + +#include "xl.h" +#include "xl_utils.h" +#include "xl_parse.h" + +int main_gpioattach(int argc, char **argv) +{ + int opt; + int rc; + uint32_t domid; + libxl_device_gpio gpio; + + SWITCH_FOREACH_OPT(opt, "", NULL, "gpio-attach", 2) { + /* No options */ + } + + libxl_device_gpio_init(&gpio); + domid =3D find_domain(argv[optind++]); + + for (argv +=3D optind, argc -=3D optind; argc > 0; ++argv, --argc) { + rc =3D parse_gpio_config(&gpio, *argv); + if (rc) goto out; + } + + if (dryrun_only) { + char *json =3D libxl_device_gpio_to_json(ctx, &gpio); + printf("gpio: %s\n", json); + free(json); + goto done; + } + + if (libxl_device_gpio_add(ctx, domid, &gpio, 0)) { + fprintf(stderr, "libxl_device_gpio_add failed.\n"); + rc =3D ERROR_FAIL; goto out; + } + +done: + rc =3D 0; + +out: + libxl_device_gpio_dispose(&gpio); + return rc; +} + +int main_gpiolist(int argc, char **argv) +{ + int opt; + libxl_device_gpio *gpios; + libxl_gpioinfo gpioinfo; + int nb, i; + + SWITCH_FOREACH_OPT(opt, "", NULL, "gpio-list", 1) { + /* No options */ + } + + /* Idx BE Hdl Sta evch ref ID BE-type BE-path */ + printf("%-3s %-2s %-6s %-5s %-6s %6s %-10s %-10s %-30s\n", + "Idx", "BE", "handle", "state", "evt-ch", "ref", + "ID", "BE-type", "BE-path"); + for (argv +=3D optind, argc -=3D optind; argc > 0; --argc, ++argv) { + uint32_t domid =3D find_domain(*argv); + gpios =3D libxl_device_gpio_list(ctx, domid, &nb); + if (!gpios) { + continue; + } + for (i =3D 0; i < nb; ++i) { + if (libxl_device_gpio_getinfo(ctx, domid, &gpios[i], &gpioinfo= ) =3D=3D 0) { + printf("%-3d %-2d %6d %5d %-10s %-30s\n", + gpioinfo.devid, gpioinfo.backend_id, + gpioinfo.devid, gpioinfo.state, + libxl_gpio_backend_to_string(gpios[i].backend_type), + gpioinfo.backend); + libxl_gpioinfo_dispose(&gpioinfo); + } + } + libxl_device_gpio_list_free(gpios, nb); + } + return 0; +} + +int main_gpiodetach(int argc, char **argv) +{ + uint32_t domid, devid; + int opt, rc; + libxl_device_gpio gpio; + + SWITCH_FOREACH_OPT(opt, "", NULL, "gpio-detach", 2) { + /* No options */ + } + + domid =3D find_domain(argv[optind++]); + devid =3D atoi(argv[optind++]); + + libxl_device_gpio_init(&gpio); + + if (libxl_devid_to_device_gpio(ctx, domid, devid, &gpio)) { + fprintf(stderr, "Error: Device %d not connected.\n", devid); + rc =3D ERROR_FAIL; + goto out; + } + + rc =3D libxl_device_gpio_remove(ctx, domid, &gpio, 0); + if (rc) { + fprintf(stderr, "libxl_device_gpio_remove failed.\n"); + rc =3D ERROR_FAIL; + goto out; + } + + rc =3D 0; + +out: + libxl_device_gpio_dispose(&gpio); + return rc; +} + + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index b91ffba14d40..181379cd5d19 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -1208,6 +1208,74 @@ static void parse_vkb_list(const XLU_Config *config, if (rc) exit(EXIT_FAILURE); } =20 +int parse_gpio_config(libxl_device_gpio *gpio, char *token) +{ + char *oparg; + + if (MATCH_OPTION("backend", token, oparg)) { + gpio->backend_domname =3D strdup(oparg); + } else if (MATCH_OPTION("backend-type", token, oparg)) { + libxl_gpio_backend backend_type; + if (libxl_gpio_backend_from_string(oparg, &backend_type)) { + fprintf(stderr, "Unknown backend_type \"%s\" in gpio spec\n", + oparg); + return -1; + } + gpio->backend_type =3D backend_type; + } else if (MATCH_OPTION("irq", token, oparg)) { + gpio->irq =3D strtoul(oparg, NULL, 0); + } else if (MATCH_OPTION("base", token, oparg)) { + gpio->base =3D strtoul(oparg, NULL, 0); + } else { + fprintf(stderr, "Unknown string \"%s\" in gpio spec\n", token); + return -1; + } + + return 0; +} + +static void parse_gpio_list(const XLU_Config *config, + libxl_domain_config *d_config) +{ + XLU_ConfigList *gpios; + const char *item; + char *buf =3D NULL; + int rc; + + if (!xlu_cfg_get_list (config, "gpio", &gpios, 0, 0)) { + int entry =3D 0; + while ((item =3D xlu_cfg_get_listitem(gpios, entry)) !=3D NULL) { + libxl_device_gpio *gpio; + char *p; + + gpio =3D ARRAY_EXTEND_INIT(d_config->gpios, + d_config->num_gpios, + libxl_device_gpio_init); + + buf =3D strdup(item); + + p =3D strtok (buf, ","); + while (p !=3D NULL) + { + while (*p =3D=3D ' ') p++; + + rc =3D parse_gpio_config(gpio, p); + if (rc) goto out; + + p =3D strtok (NULL, ","); + } + + entry++; + } + } + + rc =3D 0; + +out: + free(buf); + if (rc) exit(EXIT_FAILURE); +} + int parse_i2c_config(libxl_device_i2c *i2c, char *token) { char *oparg; @@ -2377,15 +2445,18 @@ void parse_config_data(const char *config_source, =20 d_config->num_vfbs =3D 0; d_config->num_vkbs =3D 0; + d_config->num_gpios =3D 0; d_config->num_i2cs =3D 0; d_config->vfbs =3D NULL; d_config->vkbs =3D NULL; + d_config->gpios =3D NULL; d_config->i2cs =3D NULL; =20 if (!xlu_cfg_get_list (config, "vfb", &cvfbs, 0, 0)) { while ((buf =3D xlu_cfg_get_listitem (cvfbs, d_config->num_vfbs)) = !=3D NULL) { libxl_device_vfb *vfb; libxl_device_vkb *vkb; + libxl_device_gpio *gpio; libxl_device_i2c *i2c; =20 char *buf2 =3D strdup(buf); @@ -2397,6 +2468,9 @@ void parse_config_data(const char *config_source, vkb =3D ARRAY_EXTEND_INIT(d_config->vkbs, d_config->num_vkbs, libxl_device_vkb_init); =20 + gpio =3D ARRAY_EXTEND_INIT(d_config->gpios, d_config->num_gpio= s, + libxl_device_gpio_init); + i2c =3D ARRAY_EXTEND_INIT(d_config->i2cs, d_config->num_i2cs, libxl_device_i2c_init); =20 @@ -2657,6 +2731,7 @@ void parse_config_data(const char *config_source, if (vnc_enabled) { libxl_device_vfb *vfb; libxl_device_vkb *vkb; + libxl_device_gpio *gpio; libxl_device_i2c *i2c; =20 vfb =3D ARRAY_EXTEND_INIT(d_config->vfbs, d_config->num_vfbs, @@ -2665,6 +2740,9 @@ void parse_config_data(const char *config_source, vkb =3D ARRAY_EXTEND_INIT(d_config->vkbs, d_config->num_vkbs, libxl_device_vkb_init); =20 + gpio =3D ARRAY_EXTEND_INIT(d_config->gpios, d_config->num_gpio= s, + libxl_device_gpio_init); + i2c =3D ARRAY_EXTEND_INIT(d_config->i2cs, d_config->num_i2cs, libxl_device_i2c_init); =20 @@ -2782,6 +2860,7 @@ void parse_config_data(const char *config_source, exit(-ERROR_FAIL); } xlu_cfg_get_defbool(config, "vkb_device", &b_info->u.hvm.vkb_devic= e, 0); + xlu_cfg_get_defbool(config, "gpio_device", &b_info->u.hvm.gpio_dev= ice, 0); xlu_cfg_get_defbool(config, "i2c_device", &b_info->u.hvm.i2c_devic= e, 0); xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw,= 0); xlu_cfg_get_defbool(config, "xen_platform_pci", @@ -2831,6 +2910,7 @@ void parse_config_data(const char *config_source, } =20 parse_vkb_list(config, d_config); + parse_gpio_list(config, d_config); parse_i2c_list(config, d_config); =20 xlu_cfg_get_defbool(config, "xend_suspend_evtchn_compat", diff --git a/tools/xl/xl_parse.h b/tools/xl/xl_parse.h index 4b972d525199..6e041abe5d50 100644 --- a/tools/xl/xl_parse.h +++ b/tools/xl/xl_parse.h @@ -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); =20 int match_option_size(const char *prefix, size_t len, diff --git a/tools/xl/xl_sxp.c b/tools/xl/xl_sxp.c index a44c765aa515..632e1f338d09 100644 --- a/tools/xl/xl_sxp.c +++ b/tools/xl/xl_sxp.c @@ -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"); --=20 2.31.1.272.g89b43f80a514 From nobody Sat Apr 27 18:54:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1659596846; cv=none; d=zohomail.com; s=zohoarc; b=Vg6mjkiujxZ9gZIplhSrAJh2ko1LvMt9cit/bOzmWWvZBCkh31h/alREThIh0LylhAI6Gmm3TPaXWq7YilyfNab7AB69DK/M4iRcK7+oACY1FT9i6yfXrR5H0EnAtnErvGvnxws9WF2kw2fukXGCIFXiVZ078t3q6Q8FM1MlSc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659596846; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XNF5lFqkiEnLHtnRZXOdPOJLnrAuWb9MTwMC64Rff4g=; b=Riulemwc8/HJbNA+BI0SKH9Vn9EspG0cvZUCyCuz4aRspFkT2ySHyK4v2Sh4Q23Spl4lDb7DeIkFz810IfLNqOSminMdezUK4BCYudAgmVFXWt0tBK9N7LlUA1MfzqQqs7jSoMueNirneoncHODrdYbHryKY653POFzLvOw1zt4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1659596846661363.0226498452628; Thu, 4 Aug 2022 00:07:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.380190.614250 (Exim 4.92) (envelope-from ) id 1oJUs4-0000ZF-De; Thu, 04 Aug 2022 07:02:16 +0000 Received: by outflank-mailman (output) from mailman id 380190.614250; Thu, 04 Aug 2022 07:02:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUs4-0000Z8-8V; Thu, 04 Aug 2022 07:02:16 +0000 Received: by outflank-mailman (input) for mailman id 380190; Thu, 04 Aug 2022 07:02:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUs2-0000K7-Jc for xen-devel@lists.xen.org; Thu, 04 Aug 2022 07:02:14 +0000 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [2607:f8b0:4864:20::436]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5c8d323c-13c3-11ed-924f-1f966e50362f; Thu, 04 Aug 2022 09:02:13 +0200 (CEST) Received: by mail-pf1-x436.google.com with SMTP id h28so12217860pfq.11 for ; Thu, 04 Aug 2022 00:02:12 -0700 (PDT) Received: from localhost ([122.171.18.80]) by smtp.gmail.com with ESMTPSA id w3-20020a170902e88300b0016be96e07d1sm46803plg.121.2022.08.04.00.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 00:02:10 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5c8d323c-13c3-11ed-924f-1f966e50362f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XNF5lFqkiEnLHtnRZXOdPOJLnrAuWb9MTwMC64Rff4g=; b=e3ZvLaojG2E72Ta3MxOi+qccJQPC6b8WYdL7kygELyRlQdwQDZ3/nakfLdc3ClC9Hx ao586GkbiYS1aSItaG/kwC2e1j7BA69a4+DJOjScu0MSZW9lMEn0yHYpl1TpVXl/H+p5 KCiJwx9E0Sq/S+uJJq21ato8miVUyES7yr1HD92BU4wsbYGAmH3tXFJxit/4TKFKxBKK LRAbZcN4vAkR+sp0AIx77Ssb5zMLab4GGyZ2fmwl+0tygtQc0ZcKDZFc3ihwCCUNVvMM USiCTqSVJG1Hvcvc2XowYl7jQitz6r1fV8kGO/nBtjUa5ehx1AARUI30nuo3DJFRT/WV e9Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XNF5lFqkiEnLHtnRZXOdPOJLnrAuWb9MTwMC64Rff4g=; b=CeXFDXpkOm8QFPS7mF+PV/6LJuX5jsUkjmjSOavmwAYPV6ycyLbRHg2saizvTsE2ld kc1iA3f7m98XK9uzIoWKzdzeTkLoHEtT247kUaQ4ENBRJpZr231YeuZb//5WvjSmYnJm HUFCBnGr347D0A5wds7cfFPX1WOzFiVC/LgYL2cQ4OHDP7jx4VhqhoRc1GAmZh3Xn2n4 C3C7Of3Mxg2LAM0pK2ngVrKx20iQnypGTDtSP+b7DRXXvospq/eOP8R2B62uD7ho+tFi 2bmTuUDVs6+l2/xWQrFtM3Wr2GQBPp12u9lPqW8Xh4rjQMd6W0hsuc8m5ihk01zw+Zkq GJbg== X-Gm-Message-State: ACgBeo19AoWYjwh6eHbw6AXKMp0QoC2g3877Gk2MlL803QZCQNpRkwE+ xwweE27nBz0jiD4a6OLd8hGmZ2nXSTMgpA== X-Google-Smtp-Source: AA6agR7gitQUj4IOmeOqn77IlXVXzoGacsho48zQcudPw1kc2hYZ8NewuGzPCxAAncAnQI5Y+oiCLA== X-Received: by 2002:aa7:919a:0:b0:52a:eeef:3e65 with SMTP id x26-20020aa7919a000000b0052aeeef3e65mr391687pfa.15.1659596531003; Thu, 04 Aug 2022 00:02:11 -0700 (PDT) From: Viresh Kumar To: xen-devel@lists.xen.org Cc: Viresh Kumar , Vincent Guittot , stratos-dev@op-lists.linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefano Stabellini , Mathieu Poirier , Mike Holmes , Oleksandr Tyshchenko , Wei Liu , Juergen Gross , Julien Grall , Oleksandr Tyshchenko Subject: [PATCH V3 3/6] libxl: arm: Create alloc_virtio_mmio_params() Date: Thu, 4 Aug 2022 12:31:51 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659596848315100001 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Viresh Kumar --- tools/libs/light/libxl_arm.c | 38 ++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 1a3ac1646e94..2f64b9f0ebee 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -48,6 +48,24 @@ static uint32_t alloc_virtio_mmio_irq(libxl__gc *gc, uin= t32_t *virtio_mmio_irq) return irq; } =20 +static int alloc_virtio_mmio_params(libxl__gc *gc, uint64_t *base, + uint32_t *irq, uint64_t *virtio_mmio_b= ase, + uint32_t *virtio_mmio_irq) +{ + *base =3D alloc_virtio_mmio_base(gc, virtio_mmio_base); + if (!*base) + return ERROR_FAIL; + + *irq =3D 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 =3D &d_config->disks[i]; =20 if (disk->specification =3D=3D LIBXL_DISK_SPECIFICATION_VIRTIO) { - disk->base =3D alloc_virtio_mmio_base(gc, &virtio_mmio_base); - if (!disk->base) - return ERROR_FAIL; + int rc =3D alloc_virtio_mmio_params(gc, &disk->base, &disk->ir= q, + &virtio_mmio_base, &virtio_mmio_irq); + if (rc) + return rc; =20 - disk->irq =3D alloc_virtio_mmio_irq(gc, &virtio_mmio_irq); - if (!disk->irq) - return ERROR_FAIL; - - if (virtio_irq < disk->irq) - virtio_irq =3D disk->irq; virtio_enabled =3D true; - - LOG(DEBUG, "Allocate Virtio MMIO params for Vdev %s: IRQ %u BA= SE 0x%"PRIx64, - disk->vdev, disk->irq, disk->base); } } =20 @@ -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 !=3D GUEST_VIRTIO_MMIO_SPI_FIRST) { + virtio_irq =3D virtio_mmio_irq - 1; nr_spis =3D max(nr_spis, virtio_irq - 32 + 1); + } =20 for (i =3D 0; i < d_config->b_info.num_irqs; i++) { uint32_t irq =3D d_config->b_info.irqs[i]; --=20 2.31.1.272.g89b43f80a514 From nobody Sat Apr 27 18:54:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1659596576; cv=none; d=zohomail.com; s=zohoarc; b=VGMD/QwOQNVoCLKbEPF+iq6FLhIXlIUJw9z6X8+dNuuqH+SiLkWb7Ab0JdXJeTF2QRZxhdgMM9uu6AYGmfm2k4aS9lIBYbFr7mUN270BnyK9LiYBPf1vIzV40wRtRaF5e7IfmHfxTyZXuxHphdgx4/AJ4WjxXNObHJuSB3UGFZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659596576; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jnP87DDY9e5w/7DpOY7qD8IgK2FdJZgySh2bza0OcUU=; b=Z+RUqHrUUE/q9FtovZBN53/V3yw8jJF4m3ZBgu118H8tJLwleuQVQS8jqiRHwI7IOfwtQD2nEEB2HZdSWOWC14PPft8PSU4fUvs+1VGTzKffO3SqiekQtyCqqFtUwkHx0J6kLpJfbjm3hAjYjY3LfBnBWc2oih6uQenvkXWGzeI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1659596576936728.6245793684178; Thu, 4 Aug 2022 00:02:56 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.380192.614261 (Exim 4.92) (envelope-from ) id 1oJUs6-0000ss-Mr; Thu, 04 Aug 2022 07:02:18 +0000 Received: by outflank-mailman (output) from mailman id 380192.614261; Thu, 04 Aug 2022 07:02:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUs6-0000sd-ID; Thu, 04 Aug 2022 07:02:18 +0000 Received: by outflank-mailman (input) for mailman id 380192; Thu, 04 Aug 2022 07:02:17 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUs4-0000K7-WC for xen-devel@lists.xen.org; Thu, 04 Aug 2022 07:02:17 +0000 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [2607:f8b0:4864:20::1033]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5ecd4071-13c3-11ed-924f-1f966e50362f; Thu, 04 Aug 2022 09:02:15 +0200 (CEST) Received: by mail-pj1-x1033.google.com with SMTP id gj1so3706980pjb.0 for ; Thu, 04 Aug 2022 00:02:16 -0700 (PDT) Received: from localhost ([122.171.18.80]) by smtp.gmail.com with ESMTPSA id 13-20020a170902c20d00b0016e808dbe55sm61539pll.96.2022.08.04.00.02.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 00:02:13 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5ecd4071-13c3-11ed-924f-1f966e50362f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jnP87DDY9e5w/7DpOY7qD8IgK2FdJZgySh2bza0OcUU=; b=hPlIZbpNzs5JyiNyGlwydaIggY2csLotkcb9yq3kJMW3dGJiHfcr0mfqeBbiiEtkox Zw5I4a4OByiKiXu3+khoeWfqLWSdVI3UO7eUabIoUDcbcfVIL7lleB5zkfWgEv7H8XTI gafGXs+tmRa1RhdVRpTmB/dPTYZrEAEvBt5j0s3wtw5zUd1BERUHOire1ErjZCG46gtz TuVtw1QBzMq1wiGfdm/msZwjeOWOdnTMduO/gwGngC8XsyMo6Y4qVvJ0Xvkk5+/rjYRu cLKpb3ERUXqhqF4eMPgwWMzLLvotFPZr8m7pXfajIiXew/CeeMfzir4vj7ps2SXee4u2 +dJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jnP87DDY9e5w/7DpOY7qD8IgK2FdJZgySh2bza0OcUU=; b=QmlrWKszX2ZJOK22Vj/JrlvcOd/lqVcDHJstNQiiQqMX7rNamLAdPGp3kn/EfdOrhO iSnqvKb240oaaensQc/YTqUwEJB/iRU7oMJYVt1w4aP4O6lgBHbRs5YJzeqDvY7cYDWi YpbgzFf23HpR6Jq0AxZubPnLuffV0m1fUmem3noVpurBxZoiyPhSLWChXICWankr18vc gSBL2OmcBdl+clFCWosYAf9HqDRoNL0+OTG7UCyGAbge7LeKhfk8bVB1vM00nfDhxpPD AmcgjR6WzC6oLWh3e8UUYu++xpKRwGfhnnGS1Z94NgwfxNeJJEALqYmL1shqRZ+iAyoJ VeEg== X-Gm-Message-State: ACgBeo14aei7q3Ms8oNOT4chSpDVkU8b+GD1qTe8woMTSxcbq0anjlmO hj3n5HHLvUFKgj6mIR4sQPZq3VjB27hwtQ== X-Google-Smtp-Source: AA6agR4ijlVlOpqTXiYXXLsVPnBoPAub2by/fursTxgK7g2T0ShzSEw4Kj7xvjSvQYiKBuHI3EOu5A== X-Received: by 2002:a17:90a:f418:b0:1f3:223d:4349 with SMTP id ch24-20020a17090af41800b001f3223d4349mr9189723pjb.2.1659596534819; Thu, 04 Aug 2022 00:02:14 -0700 (PDT) From: Viresh Kumar To: xen-devel@lists.xen.org Cc: Viresh Kumar , Vincent Guittot , stratos-dev@op-lists.linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefano Stabellini , Mathieu Poirier , Mike Holmes , Oleksandr Tyshchenko , Wei Liu , Juergen Gross , Julien Grall Subject: [PATCH V3 4/6] libxl: arm: Split make_virtio_mmio_node() Date: Thu, 4 Aug 2022 12:31:52 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659596578150100005 Content-Type: text/plain; charset="utf-8" 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 --- tools/libs/light/libxl_arm.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 2f64b9f0ebee..6a8c4d042bd9 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -900,9 +900,8 @@ static int make_xen_iommu_node(libxl__gc *gc, void *fdt) return 0; } =20 -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 =3D fdt_property_interrupts(gc, fdt, &intr, 1); if (res) return res; =20 - res =3D 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_dom= id) +{ + int res; + + res =3D make_virtio_mmio_node_common(gc, fdt, base, irq); if (res) return res; =20 if (backend_domid !=3D LIBXL_TOOLSTACK_DOMID) { @@ -935,10 +942,7 @@ static int make_virtio_mmio_node(libxl__gc *gc, void *= fdt, if (res) return res; } =20 - res =3D fdt_end_node(fdt); - if (res) return res; - - return 0; + return fdt_end_node(fdt); } =20 static const struct arch_info *get_arch_info(libxl__gc *gc, @@ -1261,8 +1265,8 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_do= main_config *d_config, iommu_created =3D true; } =20 - 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= ) ); } } =20 --=20 2.31.1.272.g89b43f80a514 From nobody Sat Apr 27 18:54:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1659596582; cv=none; d=zohomail.com; s=zohoarc; b=SOoy3bE9zjDeCBvOPYjmbcY4bfYKvIY0AbLSIivMXy3J//Cw4QIxCcwqIaIcdb35UoCedkGV5fqw3FkQ4WJ4QFoPOlTCMkSU94eKe2Fstttc7fTNTG0dcjOHcRy1E3LJ7QpEobLwMJ8jXVFYKh8hMpOhdjRgC/Pon7Ly8wqrmBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659596582; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=plcNRN/8tQG5s5rS9QurHAfD6YpV7OI/Z7FI5KAqQ4s=; b=kSQzmmwKl8zTtb1xHEsPS+N0MqgjsHwyVKOVKDgrOzfPauJZ20A/P6KCfcpE1+lyO+j+TEJBIauLgg4E77tGnjK/eBDjTSRxvg+Jg5+bdyLoZB1Z0tV5W1o2iRl+6v2foLFfxeUo5Hl7QsHezcQQuzA3v3L+SPiByB59hfpklSw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1659596582070988.0414215142281; Thu, 4 Aug 2022 00:03:02 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.380193.614272 (Exim 4.92) (envelope-from ) id 1oJUsB-0001In-T7; Thu, 04 Aug 2022 07:02:23 +0000 Received: by outflank-mailman (output) from mailman id 380193.614272; Thu, 04 Aug 2022 07:02:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUsB-0001Ie-PV; Thu, 04 Aug 2022 07:02:23 +0000 Received: by outflank-mailman (input) for mailman id 380193; Thu, 04 Aug 2022 07:02:22 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUs9-0000K7-Ss for xen-devel@lists.xen.org; Thu, 04 Aug 2022 07:02:22 +0000 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [2607:f8b0:4864:20::636]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 61b4ac22-13c3-11ed-924f-1f966e50362f; Thu, 04 Aug 2022 09:02:20 +0200 (CEST) Received: by mail-pl1-x636.google.com with SMTP id iw1so18529438plb.6 for ; Thu, 04 Aug 2022 00:02:21 -0700 (PDT) Received: from localhost ([122.171.18.80]) by smtp.gmail.com with ESMTPSA id b9-20020a170903228900b0016be596c8afsm3304467plh.282.2022.08.04.00.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 00:02:17 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 61b4ac22-13c3-11ed-924f-1f966e50362f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=plcNRN/8tQG5s5rS9QurHAfD6YpV7OI/Z7FI5KAqQ4s=; b=K8raEjzmABAiayJjDNqkxk7YSxZQuKQXlcIUbbnRWmEDx3AaQ5MnvPI9eAvXDjQv5t /vG+onpXKnKLoDuuMWQAyMGwpfcGMdhVqpmWl04Mv6iKR4169ZfwhQsREaVN1jrvBQIg AEbYsI4FmX1SGhAozoDRcrYnnVltepQqTjbQhwJPRZkrQCEt1FWru+ZeEmaayFF7NE55 W17YHI5wzf9iM5Xi3iEBJhoLSXqD70N2MCyP4l6/Zyc67rHn/ydYln8wPYYPBBasWQAY N+ufGPb5JZ3HwIJh06hzQIL7C+jqToa4A9+0eH7a/o3oyGUdM9oA6BPV7D13eWIUyBQE u54A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=plcNRN/8tQG5s5rS9QurHAfD6YpV7OI/Z7FI5KAqQ4s=; b=zZNb07RZTlaeG9/4G+ac/xVhnakDQqLebjWCzlQK7Eank3mug9GNKLk7GNo13Acey/ 66ZJoctVOMebh+xfUflTdrVPTe+b2uWB0OECjpuztE+p1m6nALZN6GiKxN3Ml7iLddKE qdB/WE65/iHy28f2MLCFU+zp4Pi3mA1oTOnooMrFnOIDg8lgm0vNqqMPQwf6w1IEU1B4 Ca9zvcQnnMDXiGwXEZTpceWpVDCxLYy5DI430PAXrEYquXGchMn7m7sWHnX2wQ68GRT4 78UDP4MA6jd0prW4dI+4k/4jGZV1vI/YAnsDT6ABBrEGe4dEkbSZmi3Xl0F9990aw8Hz Kd9Q== X-Gm-Message-State: ACgBeo2vE3H9M9CdkydBg+auC8msuxgMrT1kuAFvK8gHeDD1pgAOiEKa uW6gye5MXF+zA7Go4BJZUQJs9Q03Lyc2Bg== X-Google-Smtp-Source: AA6agR5rOsm8iFNxhTGFwolo4GgVdRr4qTTCVkcKGgqBCfdGxSNJLngy3Jw+P3Wl5rWCP4/myEVdTQ== X-Received: by 2002:a17:902:b20d:b0:16d:aefa:8ef6 with SMTP id t13-20020a170902b20d00b0016daefa8ef6mr631278plr.90.1659596539540; Thu, 04 Aug 2022 00:02:19 -0700 (PDT) From: Viresh Kumar To: xen-devel@lists.xen.org Cc: Viresh Kumar , Vincent Guittot , stratos-dev@op-lists.linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefano Stabellini , Mathieu Poirier , Mike Holmes , Oleksandr Tyshchenko , Wei Liu , Juergen Gross , Julien Grall Subject: [PATCH V3 5/6] libxl: Allocate MMIO params for I2c device and update DT Date: Thu, 4 Aug 2022 12:31:53 +0530 Message-Id: <8dbee989789fdd872256a8679278e174c8c2bdb0.1659596139.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659596583884100001 Content-Type: text/plain; charset="utf-8" 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-vi= rtio.yaml Signed-off-by: Viresh Kumar --- tools/libs/light/libxl_arm.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 6a8c4d042bd9..08a1499c9523 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -112,6 +112,15 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, } } =20 + for (i =3D 0; i < d_config->num_i2cs; i++) { + libxl_device_i2c *i2c =3D &d_config->i2cs[i]; + + int rc =3D 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 a= re * 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); } =20 +static int make_virtio_mmio_node_i2c(libxl__gc *gc, void *fdt, uint64_t ba= se, + uint32_t irq) +{ + int res; + + res =3D make_virtio_mmio_node_common(gc, fdt, base, irq); + if (res) return res; + + res =3D fdt_begin_node(fdt, "i2c"); + if (res) return res; + + res =3D fdt_property_compat(gc, fdt, 1, "virtio,device22"); + if (res) return res; + + res =3D 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 *do= m) { @@ -1270,6 +1299,12 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_d= omain_config *d_config, } } =20 + for (i =3D 0; i < d_config->num_i2cs; i++) { + libxl_device_i2c *i2c =3D &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) ); =20 --=20 2.31.1.272.g89b43f80a514 From nobody Sat Apr 27 18:54:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1659596583; cv=none; d=zohomail.com; s=zohoarc; b=NEM6cuOpC++xz5EdJrV4Z+f/9ZH18HL/i8FMCR0eJsDwJXa9QywycgWsxIYQXHvd2wGQCR7viS5VmQvVGipaKWqnkQloTTYUL2fBtXBl8l3rOWMp0IPF08M7oDIxpjQ8zdAANHLD1UevaoQbuQYfQW3O7fENhp0VDROeXHVuBy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659596583; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NvJtOV01vWUnDPySFX3bI7cooUnCi0cZCWz8i8egjwM=; b=ev9u7BBudp5BaJCTBEg6pDYnrJ2eJZLw/n/PBkAYFfuxx7240s8ZgsdcrZnchqpJiVocOnnKJedX3dGOXgQs78U6NfMdSO4tqJMnOcTFJlf1lgyuTc1NTdeWR7N7Spc3WB/H6CMWiyS9kz3rfb+inZzqjkCezweyVLu1zOfqra0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1659596583980929.2472203487296; Thu, 4 Aug 2022 00:03:03 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.380197.614283 (Exim 4.92) (envelope-from ) id 1oJUsF-0001kQ-7w; Thu, 04 Aug 2022 07:02:27 +0000 Received: by outflank-mailman (output) from mailman id 380197.614283; Thu, 04 Aug 2022 07:02:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUsF-0001kC-4d; Thu, 04 Aug 2022 07:02:27 +0000 Received: by outflank-mailman (input) for mailman id 380197; Thu, 04 Aug 2022 07:02:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oJUsE-000883-0B for xen-devel@lists.xen.org; Thu, 04 Aug 2022 07:02:26 +0000 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [2607:f8b0:4864:20::62d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6477013a-13c3-11ed-bd2d-47488cf2e6aa; Thu, 04 Aug 2022 09:02:25 +0200 (CEST) Received: by mail-pl1-x62d.google.com with SMTP id w7so18512722ply.12 for ; Thu, 04 Aug 2022 00:02:25 -0700 (PDT) Received: from localhost ([122.171.18.80]) by smtp.gmail.com with ESMTPSA id h8-20020a056a00000800b0052e6c058bccsm125165pfk.61.2022.08.04.00.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 00:02:22 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6477013a-13c3-11ed-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NvJtOV01vWUnDPySFX3bI7cooUnCi0cZCWz8i8egjwM=; b=N1XGR7kbt9Bqp5pXN6OP5kmgAQq9Tg8JzcsFNdTmILkSC52Le5clpihTXEF3YoVL2S AlLFk9rxhAMEpB/2w3pJ04pDOLgLLbMUGm/TZTWZgpAa1KLFsZlvMwB3S4ueKJjAf5Ku jfCp6jEYqb6J78KMhz9Qvt6k4YYXihBZLRg7hOo5Z+dNObqu8FtleKviTzhYBLHKtX0W coYRw0OgZ6pJRAAJCwFPw3/bbipRh/RGa6AdagWarexTuyr9qoBs81OEZ+G1zgM8gUTT J3pXLaqUXP/gV0MeCUW+AzgBWHhDyCxyg24S+uxw0LgPnbzRRW4UKppG0BfANplP7DBY d9PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NvJtOV01vWUnDPySFX3bI7cooUnCi0cZCWz8i8egjwM=; b=gJLXZLlADXa319OZRqHdy2ikAEMEWLkvMQagIGrYJ1NQBnIEsL3Bf7Uo7F+yS2SIJZ 4xkYbQyBUzybzILBFC6EphnHSawWDohUhHJ27r+tNYhjsrXR9WzpS0px3P7OsKCbGS+y U42rdwpan/qalXM2ceoy2PVctFgOgOprj0kovNqbHlfZcBGrRODmZNej0qVrQsh5GGe0 g05M2GH8y1w6qBUs/q5DYNSfoVcI8qZUjFG5sIEHl5JkMXliT/4l9Z+un+m1RI/+8ZHZ YIYHwHhb7oWNN0OkmPsRNCoUtj6iG+fj5TIzAeNI37fEBqdEV4kPpnDBJ94jUOX55DbH RvHA== X-Gm-Message-State: ACgBeo0cXoA/byrbf7YRzXbU0qbxmAJRSaTmMBhvvGWA0+KeeNyRynNK VaPT9a6lJiPqs13+wR9IaGZ1tAMR2bZGdg== X-Google-Smtp-Source: AA6agR6WuDtE+TTMuV9OLfDWyDOeFAH1y7h8Wh2zRU/3Xosqq4SwzfT522R4gKUbnDNCBke/tDBHSQ== X-Received: by 2002:a17:902:f608:b0:16d:c44:137 with SMTP id n8-20020a170902f60800b0016d0c440137mr525312plg.173.1659596543763; Thu, 04 Aug 2022 00:02:23 -0700 (PDT) From: Viresh Kumar To: xen-devel@lists.xen.org Cc: Viresh Kumar , Vincent Guittot , stratos-dev@op-lists.linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefano Stabellini , Mathieu Poirier , Mike Holmes , Oleksandr Tyshchenko , Wei Liu , Juergen Gross , Julien Grall Subject: [PATCH V3 6/6] libxl: Allocate MMIO params for GPIO device and update DT Date: Thu, 4 Aug 2022 12:31:54 +0530 Message-Id: <20af3a836d0ddd0d73024f8c10f7325e89ef19d8.1659596139.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659596585931100003 Content-Type: text/plain; charset="utf-8" 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 --- tools/libs/light/libxl_arm.c | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tools/libs/light/libxl_arm.c b/tools/libs/light/libxl_arm.c index 08a1499c9523..14b95087f027 100644 --- a/tools/libs/light/libxl_arm.c +++ b/tools/libs/light/libxl_arm.c @@ -121,6 +121,15 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, return rc; } =20 + for (i =3D 0; i < d_config->num_gpios; i++) { + libxl_device_gpio *gpio =3D &d_config->gpios[i]; + + int rc =3D 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 a= re * present, make sure that we allocate enough SPIs for them. @@ -974,6 +983,38 @@ static int make_virtio_mmio_node_i2c(libxl__gc *gc, vo= id *fdt, uint64_t base, return fdt_end_node(fdt); } =20 +static int make_virtio_mmio_node_gpio(libxl__gc *gc, void *fdt, uint64_t b= ase, + uint32_t irq) +{ + int res; + + res =3D make_virtio_mmio_node_common(gc, fdt, base, irq); + if (res) return res; + + res =3D fdt_begin_node(fdt, "gpio"); + if (res) return res; + + res =3D fdt_property_compat(gc, fdt, 1, "virtio,device29"); + if (res) return res; + + res =3D fdt_property(fdt, "gpio-controller", NULL, 0); + if (res) return res; + + res =3D fdt_property_cell(fdt, "#gpio-cells", 2); + if (res) return res; + + res =3D fdt_property(fdt, "interrupt-controller", NULL, 0); + if (res) return res; + + res =3D fdt_property_cell(fdt, "#interrupt-cells", 2); + if (res) return res; + + res =3D 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 *do= m) { @@ -1305,6 +1346,12 @@ static int libxl__prepare_dtb(libxl__gc *gc, libxl_d= omain_config *d_config, FDT( make_virtio_mmio_node_i2c(gc, fdt, i2c->base, i2c->irq) ); } =20 + for (i =3D 0; i < d_config->num_gpios; i++) { + libxl_device_gpio *gpio =3D &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) ); =20 --=20 2.31.1.272.g89b43f80a514