From: Haren Myneni <haren@linux.ibm.com>
To: mpe@ellerman.id.au
Cc: devicetree@vger.kernel.org, mikey@neuling.org,
herbert@gondor.apana.org.au, npiggin@gmail.com,
hch@infradead.org, sukadev@linux.vnet.ibm.com,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH V3 11/13] powerpc/VAS: Return credits after handling fault
Date: Mon, 16 Dec 2019 21:59:39 -0800 [thread overview]
Message-ID: <1576562379.16318.6546.camel@hbabu-laptop> (raw)
In-Reply-To: <1576561080.16318.6531.camel@hbabu-laptop>
NX expects OS to return credit for send window after processing each
fault. Also credit has to be returned even for fault window.
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Haren Myneni <haren@us.ibm.com>
---
arch/powerpc/platforms/powernv/vas-fault.c | 10 ++++++++++
arch/powerpc/platforms/powernv/vas-window.c | 17 +++++++++++++++++
arch/powerpc/platforms/powernv/vas.h | 1 +
3 files changed, 28 insertions(+)
diff --git a/arch/powerpc/platforms/powernv/vas-fault.c b/arch/powerpc/platforms/powernv/vas-fault.c
index 6e8b8c7..eadfee7 100644
--- a/arch/powerpc/platforms/powernv/vas-fault.c
+++ b/arch/powerpc/platforms/powernv/vas-fault.c
@@ -238,6 +238,11 @@ irqreturn_t vas_fault_handler(int irq, void *data)
memset(fifo, 0, CRB_SIZE);
mutex_unlock(&vinst->mutex);
+ /*
+ * Return credit for the fault window.
+ */
+ vas_return_credit(vinst->fault_win, 0);
+
pr_devel("VAS[%d] fault_fifo %p, fifo %p, fault_crbs %d\n",
vinst->vas_id, vinst->fault_fifo, fifo,
vinst->fault_crbs);
@@ -264,6 +269,11 @@ irqreturn_t vas_fault_handler(int irq, void *data)
}
update_csb(window, crb);
+ /*
+ * Return credit for send window after processing
+ * fault CRB.
+ */
+ vas_return_credit(window, 1);
} while (true);
return IRQ_HANDLED;
diff --git a/arch/powerpc/platforms/powernv/vas-window.c b/arch/powerpc/platforms/powernv/vas-window.c
index 8428970..8d90d25 100644
--- a/arch/powerpc/platforms/powernv/vas-window.c
+++ b/arch/powerpc/platforms/powernv/vas-window.c
@@ -1319,6 +1319,23 @@ int vas_win_close(struct vas_window *window)
}
EXPORT_SYMBOL_GPL(vas_win_close);
+/*
+ * Return credit for the given window.
+ */
+void vas_return_credit(struct vas_window *window, bool tx)
+{
+ uint64_t val;
+
+ val = 0ULL;
+ if (tx) { /* send window */
+ val = SET_FIELD(VAS_TX_WCRED, val, 1);
+ write_hvwc_reg(window, VREG(TX_WCRED_ADDER), val);
+ } else {
+ val = SET_FIELD(VAS_LRX_WCRED, val, 1);
+ write_hvwc_reg(window, VREG(LRX_WCRED_ADDER), val);
+ }
+}
+
struct vas_window *vas_pswid_to_window(struct vas_instance *vinst,
uint32_t pswid)
{
diff --git a/arch/powerpc/platforms/powernv/vas.h b/arch/powerpc/platforms/powernv/vas.h
index f5f45ea..495937a 100644
--- a/arch/powerpc/platforms/powernv/vas.h
+++ b/arch/powerpc/platforms/powernv/vas.h
@@ -415,6 +415,7 @@ struct vas_winctx {
extern void vas_window_free_dbgdir(struct vas_window *win);
extern int vas_setup_fault_window(struct vas_instance *vinst);
extern irqreturn_t vas_fault_handler(int irq, void *data);
+extern void vas_return_credit(struct vas_window *window, bool tx);
extern struct vas_window *vas_pswid_to_window(struct vas_instance *vinst,
uint32_t pswid);
--
1.8.3.1
next prev parent reply other threads:[~2019-12-17 6:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 5:38 [PATCH V3 00/13] powerpc/vas: Page fault handling for user space NX requests Haren Myneni
2019-12-17 5:48 ` [PATCH V3 01/13] powerpc/vas: Describe vas-port and interrupts properties Haren Myneni
2019-12-18 22:18 ` Rob Herring
2019-12-18 23:15 ` Haren Myneni
2019-12-17 5:49 ` [PATCH V3 02/13] powerpc/vas: Define nx_fault_stamp in coprocessor_request_block Haren Myneni
2019-12-17 5:49 ` [PATCH V3 03/13] powerpc/vas: Read interrupts and vas-port device tree properties Haren Myneni
2019-12-17 5:54 ` [PATCH V3 04/13] powerpc/vas: Setup fault window per VAS instance Haren Myneni
2019-12-17 5:55 ` [PATCH V3 05/13] powerpc/vas: Setup thread IRQ handler " Haren Myneni
2019-12-17 5:55 ` [PATCH V3 06/13] powerpc/vas: Register NX with fault window ID and IRQ port value Haren Myneni
2019-12-17 5:56 ` [PATCH V3 07/13] powerpc/vas: Take reference to PID and mm for userspace windows Haren Myneni
2019-12-17 5:56 ` [PATCH V3 08/13] powerpc/vas: Update CSB and notify process for fault CRBs Haren Myneni
2019-12-17 5:58 ` [PATCH V3 09/13] powerpc/vas: Print CRB and FIFO values Haren Myneni
2019-12-17 5:58 ` [PATCH V3 10/13] powerpc/vas: Do not use default credits for receive window Haren Myneni
2019-12-17 5:59 ` Haren Myneni [this message]
2019-12-17 6:00 ` [PATCH V3 12/13] powerpc/vas: Display process stuck message Haren Myneni
2019-12-17 6:00 ` [PATCH V3 13/13] powerpc/vas: Free send window in VAS instance after credits returned Haren Myneni
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=1576562379.16318.6546.camel@hbabu-laptop \
--to=haren@linux.ibm.com \
--cc=devicetree@vger.kernel.org \
--cc=hch@infradead.org \
--cc=herbert@gondor.apana.org.au \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=sukadev@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).