From patchwork Mon Aug 28 08:55:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 111110 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4547994qge; Mon, 28 Aug 2017 01:58:45 -0700 (PDT) X-Received: by 10.107.20.70 with SMTP id 67mr6147345iou.100.1503910725298; Mon, 28 Aug 2017 01:58:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503910725; cv=none; d=google.com; s=arc-20160816; b=TnIyMCvhcqD/FvlwN5NiEe80U8UKc/WEdr3bxNeWL2QGuUpVCXRw1opk08UdKcivrt +Hb8vtTLfid3Nmowt/kXpoRhoVUdnXpVOpfV61hXFDBorexeJo9VrNz1XMFH1Gc79YgX sEP4aQuYwYgh4wOhNK9q217pj0nPJ6Y0cGKHi+TGr2sQTt0FmZ8OSZnr3YA0bi/sN3Ke 9pB/HRUnAxuNmYkkV/OQY0CShhVsRCBfwHbCcKXDQvCLdZKk4r+4Vr1lTRIJ/AL5Fd37 gnpDLMgKB2NTo5f0or+5Ky7ylV0YaNxsrkUEPpiEU43KxQHT2aITW0wjEC42ra7zGOXL zhfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=d23F1O6qb/I6F+2OFIqAHgS6mjWuJ06gCWICNNt5+jg=; b=K7ze61VlbG1AyY2JdptiwROOJu2WcmW4tR4YEwJp0EzRTQpsHOTGzXXn+3k/gp9Hxh CuhDq01F8LIQFqoDOg7MQtoQYxblgOvGFgawgm33GzpZisUHMLL8ohiZTZEEooeROSiJ BvKEjaRP24wcVJ/y1rVwsjxDUyKcpyT0+RMtvuHmFcAW61fhTGwgxaREk6Gb+u7EiAhr JlvdYJeYO29sFg1jPjiiDgKY5L9F4Yh+aivZrjOnQ2ynbnFVQFyJGNbBtx7KUTU8GkFq KF7TolRSWqNmSSNl/dipefgFdOmDN2rOrgWVyib34HRTPAS/GFTK4WpaWZIwaWPP+cce c2Yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kGliBpza; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id h134si11934211iof.279.2017.08.28.01.58.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 01:58:45 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kGliBpza; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmFqT-0004i6-Lr; Mon, 28 Aug 2017 08:56:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dmFqS-0004h2-7j for xen-devel@lists.xenproject.org; Mon, 28 Aug 2017 08:56:32 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id AA/44-01995-FBAD3A95; Mon, 28 Aug 2017 08:56:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRWlGSWpSXmKPExsXiVRtsqrvv1uJ Ig8kHrC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oztL86wF7ySrJiyZhNzA+Md0S5GTg4hgemM Es9PWnQxcnGwCMxjllh0aCoTiCMh0M8qceHRHCaQKgmBNInzi0+xQNjlEt/X3WKG6NaSOHpqN itIg5DAfiaJ3VOfM3YxcnCwCZhIzOqQAKkREVCSuLdqMthQZoH5jBJNk3rZQBLCAhESvbe6GE FsFgFViSnbL7GC2LwC3hLr2vawQSyTk7h5rhNsGaeAj8SOtXfZIRZ7S3S9/sA6gVFgASPDKka N4tSistQiXUNLvaSizPSMktzEzBxdQwNjvdzU4uLE9NScxKRiveT83E2MwNCqZ2Bg3MH4+7jf IUZJDiYlUd6dFYsjhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnwhtwEygkWpaanVqRl5gCDHCYtw cGjJML7ASTNW1yQmFucmQ6ROsWoyzHpwPYvTEIsefl5qVLivD4gRQIgRRmleXAjYBF3iVFWSp iXkYGBQYinILUoN7MEVf4VozgHo5Iw70GQKTyZeSVwm14BHcEEdISi4EKQI0oSEVJSDYwuMzL EhNvMpsc9vzLfcop3eLLiOrk2ucZ48zuqcw9yX1D3WJyuuzDuz2GfsGd3v339y3SyivmDXaXd 6hkd1/7yCFtND9QIexKU/mGy94TJJhuEnBKqjsisZlFf+u1zRFTlBLbvVj/PKAVF73U/53DyI t8my3mCn6JLuF7Hff5dX39h26La65OUWIozEg21mIuKEwEZmCKrswIAAA== X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-4.tower-31.messagelabs.com!1503910589!53826548!1 X-Originating-IP: [74.125.83.53] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61183 invoked from network); 28 Aug 2017 08:56:30 -0000 Received: from mail-pg0-f53.google.com (HELO mail-pg0-f53.google.com) (74.125.83.53) by server-4.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 28 Aug 2017 08:56:30 -0000 Received: by mail-pg0-f53.google.com with SMTP id 63so22237882pgc.2 for ; Mon, 28 Aug 2017 01:56:30 -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=l6qPJ2j2XHzH4tm5SO40ctm3ZgjV1/opafjwCKIt+cs=; b=kGliBpzaNzpWPTkyVHzwxhxC9rf9isqq1MnHIOjhD8WEX1WXBnqDRyFWKSK7hM8cOv L7+7RDOWncbZZ8iIIsb+uy19eQ2+cHY6filvcA0eJgm4gn8yfBLkuXcd3EgciQKx5upA hefxKew/G7XkY5ff6IN9iFa6lLli401bu9BSA= 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=l6qPJ2j2XHzH4tm5SO40ctm3ZgjV1/opafjwCKIt+cs=; b=V7CVKMIDd8Nvxi61GzIJBTqQ9+XyGYQA0fI2/zvng8VGRf2lUSIfjZ75aYDHfknFWk wJZg3WWcbYVWV5PPHl+sCnZVueGaIjISaC6hXReNxKhFUpULz/y6rOAuHZMNxJHplVno Bdn2jHZkvFZwdYH0w9TaKwuOu2GMY/10XHurjOVbtDfU+VXWok9L2rbdR5bGs/Hhg+d5 sL+8K+E13VsGMTYoW666XU1SyDb0J8VhxnRemBr4JLCuCy1pHaJ/Uoo4Axi1XluVxO0L cFL2OZq4YkyP6W5ZhXqNbl0MxpIufsucUS6x3cdF6rcyh3t1xbzzytjuRCUFblB/ZdQ7 +MDA== X-Gm-Message-State: AHYfb5iRzfwpDJTcSE9p5gzu1oJzNdDOUSQvNyIONw1NudTKwSySVXik jkfZBjPiL5gZjv6GZXxhSQ== X-Received: by 10.98.9.90 with SMTP id e87mr6762112pfd.138.1503910589097; Mon, 28 Aug 2017 01:56:29 -0700 (PDT) Received: from blr-ubuntu-linaro.wlan.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id d88sm21713569pfl.158.2017.08.28.01.56.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 01:56:28 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Mon, 28 Aug 2017 14:25:46 +0530 Message-Id: <1503910570-24427-4-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503910570-24427-1-git-send-email-bhupinder.thakur@linaro.org> References: <1503910570-24427-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 03/27 v8] xen/arm: vpl011: Allocate a new GFN in the toolstack for vuart 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" Allocate a new gfn to be used as a ring buffer between xenconsole and Xen for sending/receiving pl011 console data. 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: - Removed xc_get_vuart_gfn() as it is not required since the vpl011 initialization function which used this API has been moved to after gfn is allocated. - I have included the reviewed-by and acked-by tags as there is no change in the logic. Changes since v3: - Added a new helper function xc_get_vuart_gfn() to return the GFN allocated for vpl011. - Since a new function has been added in this patch, I have not included Stefano's reviewed-by and Wei's acked-by tags. Changes since v2: - Removed the DOMCTL call to set the GFN as now this information is passed in the DOMCTL call to initialize vpl011 emulation. tools/libxc/include/xc_dom.h | 2 ++ tools/libxc/xc_dom_arm.c | 5 ++++- tools/libxc/xc_dom_boot.c | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index ce47058..6e06ef1 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -216,6 +216,8 @@ struct xc_dom_image { /* Extra SMBIOS structures passed to HVMLOADER */ struct xc_hvm_firmware_module smbios_module; + + xen_pfn_t vuart_gfn; }; /* --- pluggable kernel loader ------------------------------------- */ diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index e7d4bd0..c981b7a 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -26,10 +26,11 @@ #include "xg_private.h" #include "xc_dom.h" -#define NR_MAGIC_PAGES 3 +#define NR_MAGIC_PAGES 4 #define CONSOLE_PFN_OFFSET 0 #define XENSTORE_PFN_OFFSET 1 #define MEMACCESS_PFN_OFFSET 2 +#define VUART_PFN_OFFSET 3 #define LPAE_SHIFT 9 @@ -85,10 +86,12 @@ static int alloc_magic_pages(struct xc_dom_image *dom) dom->console_pfn = base + CONSOLE_PFN_OFFSET; dom->xenstore_pfn = base + XENSTORE_PFN_OFFSET; + dom->vuart_gfn = base + VUART_PFN_OFFSET; xc_clear_domain_page(dom->xch, dom->guest_domid, dom->console_pfn); xc_clear_domain_page(dom->xch, dom->guest_domid, dom->xenstore_pfn); xc_clear_domain_page(dom->xch, dom->guest_domid, base + MEMACCESS_PFN_OFFSET); + xc_clear_domain_page(dom->xch, dom->guest_domid, base + VUART_PFN_OFFSET); xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_PFN, dom->console_pfn); xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_STORE_PFN, diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index c3b44dd..8a376d0 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -226,6 +226,8 @@ int xc_dom_boot_image(struct xc_dom_image *dom) return rc; if ( (rc = clear_page(dom, dom->xenstore_pfn)) != 0 ) return rc; + if ( (rc = clear_page(dom, dom->vuart_gfn)) != 0 ) + return rc; /* start info page */ if ( dom->arch_hooks->start_info )