From patchwork Wed Sep 27 06:13:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 9973113 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5F9016037F for ; Wed, 27 Sep 2017 06:17:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5225A2097A for ; Wed, 27 Sep 2017 06:17:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4708623B34; Wed, 27 Sep 2017 06:17:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AE9492097A for ; Wed, 27 Sep 2017 06:17:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dx5bR-0002SB-J2; Wed, 27 Sep 2017 06:13:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dx5bQ-0002Q7-DI for xen-devel@lists.xenproject.org; Wed, 27 Sep 2017 06:13:48 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id E5/C0-02092-B914BC95; Wed, 27 Sep 2017 06:13:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRWlGSWpSXmKPExsVyMfTAWt3Zjqc jDdaJWXzfMpnJgdHj8IcrLAGMUayZeUn5FQmsGY1NzawFG0wqPqxqZ25gPKfZxcjFISQwnVHi y9L/7CAOi8A8ZonT/5aDORIC/awSa/e8Zu5i5ARy8iSOvb8HZadJvN92lh3CrpCY1NgMFhcS0 JI4emo2K8TYFUwSr99PBEpwcLAJmEjM6pAAqRERUJK4t2oyE0gNs8B8RommSb1sIAlhAS+Jje u+gA1lEVCVmPh0PQuIzSvgLbGubQ4bxDI5iZvnOsGWcQr4SJzuv80Gsdhb4tLKftYJjIILGBl WMWoUpxaVpRbpGlnqJRVlpmeU5CZm5ugaGpjq5aYWFyemp+YkJhXrJefnbmIEhlw9AwPjDsbL W/wOMUpyMCmJ8tb8PxUpxJeUn1KZkVicEV9UmpNafIhRhoNDSYL3hsPpSCHBotT01Iq0zBxg8 MOkJTh4lER4r4GkeYsLEnOLM9MhUqcYXTku3Ln0h4nj2KbLQPJL7w0geWDPLSDZcfPuHyYhlr z8vFQpcd6LIM0CIM0ZpXlwo2GRe4lRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMO9dkCk8mXk lcBe8AjqOCei43qknQI4rSURISTUwsnwsuZ09M2ai77VFAmvls9/NCVC2flR7MmpR6FWxe4E7 l+ztTUkriH9cKMshqeGxZFVBVPzjg7JJ51p0p71ZXXe/x6Fv8ZR1obf1f/ptCqk8v2zRhgkut XFmtbq7Hlz4+fbJgjv2pUZHSr+Xii6Nytt3OZsh5ty7tgzPX2ppBpPe3C3KPCa4UomlOCPRUI u5qDgRAFpft+PXAgAA X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-2.tower-206.messagelabs.com!1506492825!92817139!1 X-Originating-IP: [209.85.192.173] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40009 invoked from network); 27 Sep 2017 06:13:46 -0000 Received: from mail-pf0-f173.google.com (HELO mail-pf0-f173.google.com) (209.85.192.173) by server-2.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 27 Sep 2017 06:13:46 -0000 Received: by mail-pf0-f173.google.com with SMTP id e1so6758152pfk.1 for ; Tue, 26 Sep 2017 23:13:46 -0700 (PDT) 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; bh=LGLhx7Och6xef4nWNZ5DPoUrb0BM0rjwbeTkFLXpAzY=; b=X5kJh9xFXC67j7MAc9Po/FsbCOCIlHd9oDCEe2Dr2SBa1NQqcHRNKRW80ncyA6/thW R6nrQLjKwGEDSsM0qbOgfneN8w0RmgllAz/4+5DNgOCjC/V9rolPCOZVooBxKAgj4HwN ei2aWuDMvlzN/N593wWwg0si3uF0F681PFVB4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LGLhx7Och6xef4nWNZ5DPoUrb0BM0rjwbeTkFLXpAzY=; b=E8r+wnx5mToSf/4luev3N1AcH+e4doPEYOjWYKS0Ip4xkNhxj9tvLPvNt86tVcXLoY gnA/qftd2htwzM2Kpd0ULzq1YPRbYs7aVchkzJHv+ckZt89osp2bqmoO39iYRFjm8w8y PnzHz4qESqJ8dVe0OHjInCFNfWsLRhYrEa/luvvhxDjAxdQxkFXm9Tpys8zSeAIL6m3W 47qxNajF/FOkSuOGRUHRoZJCEBhfTvOSIRUBci7qMmfo4CV2IUDqFIdOcmPWCnnfu5iZ EOV8WuqRBFvPNUolcPalbsPjbSa/+FW4gkPJlRySpsNl2vMxSUzTrZopBbe3Zto2mILq 3ldQ== X-Gm-Message-State: AHPjjUjG6DVAEN07ErcXjkHiHGWMNERTbrCMI6Ks0AvWP2McFS9sbL/Q XbunSuzBQO9Ms4cG5hEizMbLQEHzR14= X-Google-Smtp-Source: AOwi7QBCrGStdCWyoBoxc/B8G+iX2TMCbDfzdtJZ8IV6snomVxN8MzrvGjTEnMUMyfvkZwjo4yDH7w== X-Received: by 10.99.186.81 with SMTP id l17mr350598pgu.170.1506492825140; Tue, 26 Sep 2017 23:13:45 -0700 (PDT) Received: from blr-ubuntu-linaro.wlan.qualcomm.com (h3.248.139.40.ip.windstream.net. [40.139.248.3]) by smtp.gmail.com with ESMTPSA id s187sm18013485pgb.82.2017.09.26.23.13.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 23:13:44 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Wed, 27 Sep 2017 11:43:13 +0530 Message-Id: <1506492816-25954-5-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506492816-25954-1-git-send-email-bhupinder.thakur@linaro.org> References: <1506492816-25954-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 04/27 v11] xen/arm: vpl011: Add support for vuart in libxl X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP An option is provided in libxl to enable/disable SBSA vuart while creating a guest domain. Libxl now supports a generic vuart console and SBSA uart is a specific type. In future support can be added for multiple vuart of different types. User can enable SBSA vuart by adding the following line in the guest configuration file: vuart = "sbsa_uart" Signed-off-by: Bhupinder Thakur Acked-by: Stefano Stabellini Acked-by: Wei Liu --- CC: Ian Jackson CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall Changes since v4: - Renamed "pl011" to "sbsa_uart". Changes since v3: - Added a new config option CONFIG_VUART_CONSOLE to enable/disable vuart console support. - Moved libxl_vuart_type to arch-arm part of libxl_domain_build_info - Updated xl command help to mention new console type - vuart. Changes since v2: - Defined vuart option as an enum instead of a string. - Removed the domain creation flag defined for vuart and the related code to pass on the information while domain creation. Now vpl011 is initialized independent of domain creation through new DOMCTL APIs. tools/libxl/libxl.h | 7 +++++++ tools/libxl/libxl_console.c | 3 +++ tools/libxl/libxl_dom.c | 1 + tools/libxl/libxl_internal.h | 3 +++ tools/libxl/libxl_types.idl | 7 +++++++ tools/xl/xl_cmdtable.c | 2 +- tools/xl/xl_console.c | 5 ++++- tools/xl/xl_parse.c | 8 ++++++++ 8 files changed, 34 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 7d853ca..9dfd964 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -308,9 +308,16 @@ /* * LIBXL_HAVE_P9S indicates that the p9 field in IDL has been changed to p9s */ + #define LIBXL_HAVE_P9S 1 /* + * LIBXL_HAVE_BUILDINFO_ARM_VUART indicates that the toolstack supports virtual UART + * for ARM. + */ +#define LIBXL_HAVE_BUILDINFO_ARM_VUART 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility diff --git a/tools/libxl/libxl_console.c b/tools/libxl/libxl_console.c index 68511d7..f4f64ad 100644 --- a/tools/libxl/libxl_console.c +++ b/tools/libxl/libxl_console.c @@ -67,6 +67,9 @@ int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, case LIBXL_CONSOLE_TYPE_SERIAL: cons_type_s = "serial"; break; + case LIBXL_CONSOLE_TYPE_VUART: + cons_type_s = "vuart"; + break; default: goto out; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index f54fd49..e0f0d78 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -803,6 +803,7 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, if (xc_dom_translated(dom)) { state->console_mfn = dom->console_pfn; state->store_mfn = dom->xenstore_pfn; + state->vuart_gfn = dom->vuart_gfn; } else { state->console_mfn = xc_dom_p2m(dom, dom->console_pfn); state->store_mfn = xc_dom_p2m(dom, dom->xenstore_pfn); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 81e87ae..30a5cb2 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1139,6 +1139,9 @@ typedef struct { uint32_t num_vmemranges; xc_domain_configuration_t config; + + xen_pfn_t vuart_gfn; + evtchn_port_t vuart_port; } libxl__domain_build_state; _hidden int libxl__build_pre(libxl__gc *gc, uint32_t domid, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 756e120..37ac8ec 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -105,6 +105,7 @@ libxl_console_type = Enumeration("console_type", [ (0, "UNKNOWN"), (1, "SERIAL"), (2, "PV"), + (3, "VUART"), ]) libxl_disk_format = Enumeration("disk_format", [ @@ -240,6 +241,11 @@ libxl_checkpointed_stream = Enumeration("checkpointed_stream", [ (2, "COLO"), ]) +libxl_vuart_type = Enumeration("vuart_type", [ + (0, "unknown"), + (1, "sbsa_uart"), + ]) + # # Complex libxl types # @@ -581,6 +587,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("arch_arm", Struct(None, [("gic_version", libxl_gic_version), + ("vuart", libxl_vuart_type), ])), # Alternate p2m is not bound to any architecture or guest type, as it is # supported by x86 HVM and ARM support is planned. diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 48f0324..2126e70 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -133,7 +133,7 @@ struct cmd_spec cmd_table[] = { &main_console, 0, 0, "Attach to domain's console", "[options] \n" - "-t console type, pv or serial\n" + "-t console type, pv , serial or vuart\n" "-n console number" }, { "vncviewer", diff --git a/tools/xl/xl_console.c b/tools/xl/xl_console.c index 0508dda..4e65d73 100644 --- a/tools/xl/xl_console.c +++ b/tools/xl/xl_console.c @@ -27,6 +27,7 @@ int main_console(int argc, char **argv) uint32_t domid; int opt = 0, num = 0; libxl_console_type type = 0; + char *console_names = "pv, serial, vuart"; SWITCH_FOREACH_OPT(opt, "n:t:", NULL, "console", 1) { case 't': @@ -34,8 +35,10 @@ int main_console(int argc, char **argv) type = LIBXL_CONSOLE_TYPE_PV; else if (!strcmp(optarg, "serial")) type = LIBXL_CONSOLE_TYPE_SERIAL; + else if (!strcmp(optarg, "vuart")) + type = LIBXL_CONSOLE_TYPE_VUART; else { - fprintf(stderr, "console type supported are: pv, serial\n"); + fprintf(stderr, "console type supported are: %s\n", console_names); return EXIT_FAILURE; } break; diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 0678fbc..edcdd9e 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -965,6 +965,14 @@ void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "maxvcpus", &l, 0)) b_info->max_vcpus = l; + if (!xlu_cfg_get_string(config, "vuart", &buf, 0)) { + if (libxl_vuart_type_from_string(buf, &b_info->arch_arm.vuart)) { + fprintf(stderr, "ERROR: invalid value \"%s\" for \"vuart\"\n", + buf); + exit(1); + } + } + parse_vnuma_config(config, b_info); /* Set max_memkb to target_memkb and max_vcpus to avail_vcpus if