From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
michael.neuling@au1.ibm.com, stewart@linux.vnet.ibm.com,
apopple@au1.ibm.com, hbabu@us.ibm.com, oohall@gmail.com,
bsingharora@gmail.com, linuxppc-dev@ozlabs.org
Subject: [PATCH v2 08/10] VAS: Define vas_win_close() interface
Date: Wed, 25 Jan 2017 17:38:06 -0800 [thread overview]
Message-ID: <1485394688-31129-9-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1485394688-31129-1-git-send-email-sukadev@linux.vnet.ibm.com>
Define the vas_win_close() interface which should be used to close a
send or receive windows.
While the hardware configurations required to open send and receive windows
differ, the configuration to close a window is the same for both. So we use
a single interface to close the window.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/vas.h | 6 +++++
drivers/misc/vas/vas-window.c | 52 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+)
diff --git a/arch/powerpc/include/asm/vas.h b/arch/powerpc/include/asm/vas.h
index b6362e9..bda851a 100644
--- a/arch/powerpc/include/asm/vas.h
+++ b/arch/powerpc/include/asm/vas.h
@@ -75,6 +75,12 @@ struct vas_rx_win_attr {
struct vas_window *vas_rx_win_open(int vasid, enum vas_cop_type cop,
struct vas_rx_win_attr *attr);
+/*
+ * Close the send or receive window identified by @win. For receive windows
+ * return -EAGAIN if there are active send windows attached to this receive
+ * window.
+ */
+int vas_win_close(struct vas_window *win);
/*
* Get/Set bit fields
diff --git a/drivers/misc/vas/vas-window.c b/drivers/misc/vas/vas-window.c
index a640d59..4b06780 100644
--- a/drivers/misc/vas/vas-window.c
+++ b/drivers/misc/vas/vas-window.c
@@ -711,3 +711,55 @@ struct vas_window *vas_rx_win_open(int vasid, enum vas_cop_type cop,
vas_release_window_id(&vinst->ida, rxwin->winid);
return ERR_PTR(rc);
}
+
+int vas_win_close(struct vas_window *window)
+{
+ uint64_t val;
+ int cached;
+
+ if (!window)
+ return 0;
+
+ if (!window->tx_win && atomic_read(&window->num_txwins) != 0) {
+ pr_devel("VAS: Attempting to close an active Rx window!\n");
+ WARN_ON_ONCE(1);
+ return -EAGAIN;
+ }
+
+ /* Unpin window from cache and close it */
+ val = 0ULL;
+ val = SET_FIELD(VAS_WINCTL_PIN, val, 0);
+ val = SET_FIELD(VAS_WINCTL_OPEN, val, 0);
+ write_hvwc_reg(window, VREG(WINCTL), val);
+
+ /*
+ * See Section 1.11.1 for details on closing window, including
+ * - disable new paste operations
+ * - block till pending requests are completed
+ * - If Rx window, ensure FIFO is empty.
+ */
+
+ /* Cast window context out of the cache */
+retry:
+ val = read_hvwc_reg(window, VREG(WIN_CTX_CACHING_CTL));
+ cached = GET_FIELD(val, VAS_WIN_CACHE_STATUS);
+ if (cached) {
+ val = 0ULL;
+ val = SET_FIELD(VAS_CASTOUT_REQ, val, 1);
+ val = SET_FIELD(VAS_PUSH_TO_MEM, val, 0);
+ write_hvwc_reg(window, VREG(WIN_CTX_CACHING_CTL), val);
+
+ schedule_timeout(2000);
+ goto retry;
+ }
+
+ /* if send window, drop reference to matching receive window */
+ if (window->tx_win)
+ put_rx_win(window->rxwin);
+
+ vas_release_window_id(&window->vinst->ida, window->winid);
+
+ vas_window_free(window);
+
+ return 0;
+}
--
2.7.4
next prev parent reply other threads:[~2017-01-26 1:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-26 1:37 [PATCH v2 00/10] Enable VAS Sukadev Bhattiprolu
2017-01-26 1:37 ` [PATCH v2 01/10] VAS: Define macros, register fields and structures Sukadev Bhattiprolu
2017-01-26 1:38 ` [PATCH v2 02/10] Move GET_FIELD/SET_FIELD to vas.h Sukadev Bhattiprolu
2017-01-26 17:31 ` Dan Streetman
2017-01-26 1:38 ` [PATCH v2 03/10] VAS: Define vas_init() and vas_exit() Sukadev Bhattiprolu
2017-01-26 8:28 ` kbuild test robot
2017-01-26 1:38 ` [PATCH v2 04/10] VAS: Define helpers for access MMIO regions Sukadev Bhattiprolu
2017-01-26 1:38 ` [PATCH v2 05/10] VAS: Define helpers to init window context Sukadev Bhattiprolu
2017-01-26 1:38 ` [PATCH v2 06/10] VAS: Define helpers to alloc/free windows Sukadev Bhattiprolu
2017-01-26 1:38 ` [PATCH v2 07/10] VAS: Define vas_rx_win_open() interface Sukadev Bhattiprolu
2017-01-26 1:38 ` Sukadev Bhattiprolu [this message]
2017-01-26 1:38 ` [PATCH v2 09/10] VAS: Define vas_tx_win_open() Sukadev Bhattiprolu
2017-01-26 1:38 ` [PATCH v2 10/10] VAS: Define copy/paste interfaces Sukadev Bhattiprolu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485394688-31129-9-git-send-email-sukadev@linux.vnet.ibm.com \
--to=sukadev@linux.vnet.ibm.com \
--cc=apopple@au1.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bsingharora@gmail.com \
--cc=hbabu@us.ibm.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=michael.neuling@au1.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=oohall@gmail.com \
--cc=stewart@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).