From patchwork Mon Jul 17 13:06:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 9844923 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 A9D536037F for ; Mon, 17 Jul 2017 13:09:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C56626E4A for ; Mon, 17 Jul 2017 13:09:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9145528505; Mon, 17 Jul 2017 13:09:42 +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=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, 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 0E73626E4A for ; Mon, 17 Jul 2017 13:09:42 +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 1dX5jy-00047P-Eb; Mon, 17 Jul 2017 13:07:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dX5jx-00047D-9O for xen-devel@lists.xenproject.org; Mon, 17 Jul 2017 13:07:09 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id FC/D6-01735-C76BC695; Mon, 17 Jul 2017 13:07:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrPIsWRWlGSWpSXmKPExsVyMfTAOt3qbTm RButu61l83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBn3Xv5kKmgVqDgy1a+BsYGvi5GLQ0hgBqPE rm2N7CAOi8A8Zokpi1uZuhg5OSQE+lkljv3W7WLkALLTJG78ioYIV0i8+/WXFcQWEtCSOHpqN ivEoFYmicufl7KC1LMJmEjM6pAAqRERUJK4t2oyE0gNs8AFRomZf5+zgSSEBZIkVk54zQRSzy KgKnHqsBFImFfAW2Jhz0p2iF1yEjfPdTKD2JwCPhJnNqxmgtjrLXHzyESmCYwCCxgZVjFqFKc WlaUW6Roa6iUVZaZnlOQmZuboGhqY6uWmFhcnpqfmJCYV6yXn525iBAYVAxDsYFzZ7nyIUZKD SUmU9yJbdqQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV73rTmRQoJFqempFWmZOcDwhklLcPAoi fAygqR5iwsSc4sz0yFSpxjtOa5cWfeFiWPD6vVAcsqB7UDy1YT/35iEWPLy81KlxHn1QNoEQN oySvPghsLi8RKjrJQwLyPQmUI8BalFuZklqPKvGMU5GJWEeT9tAZrCk5lXArf7FdBZTEBnCfu CnVWSiJCSamCsXznxmEoc2xO7j3djeif/v3FL+s0djukGX9ZdVnv18Vrys/xlOxfM0XIM1r8g Wson2X4/8hHj5GNNXkvzN6+21fFeHxMWzL7Y6ZVnl1yI6JGEELM0EdkzS5o95sYWJ+fVuL7n+ 6DtqfxhSWL8lx/f+L2D7+TeTBB/X3iO13pmwWaBvX3/Th9VYinOSDTUYi4qTgQA41n1EMICAA A= X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-16.tower-206.messagelabs.com!1500296826!87352006!1 X-Originating-IP: [209.85.192.174] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21472 invoked from network); 17 Jul 2017 13:07:07 -0000 Received: from mail-pf0-f174.google.com (HELO mail-pf0-f174.google.com) (209.85.192.174) by server-16.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 17 Jul 2017 13:07:07 -0000 Received: by mail-pf0-f174.google.com with SMTP id e26so8413843pfd.0 for ; Mon, 17 Jul 2017 06:07:07 -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=hEkKGCPm47FMsgYwL/NrMZbix4eTUybWDHit8lEDoDc=; b=FLLD+A3msfMYDRFdEk9l7Hzyi4YQVi9KkBejo5URLwxjtrKQnYKuELzU5b5BSqn9QU ubuR0ISZZWvMUqxLqPb6lbm3WY3gM6CjXIrTpFQiDmhQr+Dtj1Uafg9K13KvPHOzUk3w JXuJjJtx/1Y7uAyVOE8P/2moYRZnq20ugogag= 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=hEkKGCPm47FMsgYwL/NrMZbix4eTUybWDHit8lEDoDc=; b=txEXg348U9CZKdydU1Ago+FSgDZbgdTbmthJOVbu7RCGTZIp+6X0JI6nBiK4VzZk+i XFKy23s687E3s8oko0t69WP9WsEUTy5krDpmgjOVibO2phuwYlwVQ7yeTB6vL3weOS3E P99qbwaWxqfN1jR0cDJgiLAA6H0MVBP79+DSCcufajNziHymNlliYMi9YnTtRYpt/+BQ EY8yNfra3e7FJZceAcMhwvfieb7RoqTFGetCT1vF+oY3H2fJZgYdJBuRO2OKL3E8UxjF nif7GwjENrjroIn73aWToR5E+GSLvfsHakSp6HFuhBdReKJdFygUgurFVpSRLzRoed7c XmNA== X-Gm-Message-State: AIVw111mew8pNWfx7ViV6kYjfdsbR1wo905/hzoEHiofl7+kxPgRWBxG 001tRngGKA4y7rLm7RaswQ== X-Received: by 10.98.38.68 with SMTP id m65mr10482267pfm.47.1500296826020; Mon, 17 Jul 2017 06:07:06 -0700 (PDT) Received: from blr-ubuntu-linaro.wlan.qualcomm.com ([103.5.19.18]) by smtp.gmail.com with ESMTPSA id z69sm15705665pgz.42.2017.07.17.06.07.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Jul 2017 06:07:05 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Mon, 17 Jul 2017 18:36:31 +0530 Message-Id: <1500296815-10243-2-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500296815-10243-1-git-send-email-bhupinder.thakur@linaro.org> References: <1500296815-10243-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Wei Liu , Julien Grall , Stefano Stabellini , Ian Jackson Subject: [Xen-devel] [PATCH 01/25 v6] xen/arm: vpl011: Define common ring buffer helper functions in console.h 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 DEFINE_XEN_FLEX_RING(xencons) defines common helper functions such as xencons_queued() to tell the current size of the ring buffer, xencons_mask() to mask off the index, which are useful helper functions. pl011 emulation code will use these helper functions. io/console.h includes io/ring.h which defines DEFINE_XEN_FLEX_RING. In console/daemon/io.c, string.h had to be included before io/console.h because ring.h uses string functions. Signed-off-by: Bhupinder Thakur Reviewed-by: Stefano Stabellini Acked-by: Wei Liu --- CC: Ian Jackson CC: Wei Liu CC: Konrad Rzeszutek Wilk CC: Stefano Stabellini CC: Julien Grall Changes since v4: - Split this change in a separate patch. tools/console/daemon/io.c | 2 +- xen/include/public/io/console.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 7e474bb..e8033d2 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -21,6 +21,7 @@ #include "utils.h" #include "io.h" +#include #include #include #include @@ -29,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/xen/include/public/io/console.h b/xen/include/public/io/console.h index e2cd97f..5e45e1c 100644 --- a/xen/include/public/io/console.h +++ b/xen/include/public/io/console.h @@ -27,6 +27,8 @@ #ifndef __XEN_PUBLIC_IO_CONSOLE_H__ #define __XEN_PUBLIC_IO_CONSOLE_H__ +#include "ring.h" + typedef uint32_t XENCONS_RING_IDX; #define MASK_XENCONS_IDX(idx, ring) ((idx) & (sizeof(ring)-1)) @@ -38,6 +40,8 @@ struct xencons_interface { XENCONS_RING_IDX out_cons, out_prod; }; +DEFINE_XEN_FLEX_RING(xencons); + #endif /* __XEN_PUBLIC_IO_CONSOLE_H__ */ /*