From: Haren Myneni <haren@linux.ibm.com>
To: mpe@ellerman.id.au
Cc: mikey@neuling.org, herbert@gondor.apana.org.au,
npiggin@gmail.com, hch@infradead.org, oohall@gmail.com,
sukadev@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH V6 12/14] powerpc/vas: Return credits after handling fault
Date: Wed, 04 Mar 2020 12:52:30 -0800 [thread overview]
Message-ID: <1583355150.18705.2163.camel@hbabu-laptop> (raw)
In-Reply-To: <1583353283.18705.2112.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@linux.ibm.com>
---
arch/powerpc/platforms/powernv/vas-fault.c | 9 +++++++++
arch/powerpc/platforms/powernv/vas-window.c | 17 +++++++++++++++++
arch/powerpc/platforms/powernv/vas.h | 1 +
3 files changed, 27 insertions(+)
diff --git a/arch/powerpc/platforms/powernv/vas-fault.c b/arch/powerpc/platforms/powernv/vas-fault.c
index 3ab0831..614a27c 100644
--- a/arch/powerpc/platforms/powernv/vas-fault.c
+++ b/arch/powerpc/platforms/powernv/vas-fault.c
@@ -237,6 +237,10 @@ irqreturn_t vas_fault_thread_fn(int irq, void *data)
memcpy(crb, fifo, CRB_SIZE);
entry->stamp.nx.pswid = FIFO_INVALID_ENTRY;
entry->ccw |= CCW0_INVALID;
+ /*
+ * Return credit for the fault window.
+ */
+ vas_return_credit(vinst->fault_win, 0);
mutex_unlock(&vinst->mutex);
pr_devel("VAS[%d] fault_fifo %p, fifo %p, fault_crbs %d\n",
@@ -266,6 +270,11 @@ irqreturn_t vas_fault_thread_fn(int irq, void *data)
}
update_csb(window, crb);
+ /*
+ * Return credit for send window after processing
+ * fault CRB.
+ */
+ vas_return_credit(window, 1);
} while (true);
}
diff --git a/arch/powerpc/platforms/powernv/vas-window.c b/arch/powerpc/platforms/powernv/vas-window.c
index 427a884..1439a6f 100644
--- a/arch/powerpc/platforms/powernv/vas-window.c
+++ b/arch/powerpc/platforms/powernv/vas-window.c
@@ -1318,6 +1318,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 9ba4605..f0efb98 100644
--- a/arch/powerpc/platforms/powernv/vas.h
+++ b/arch/powerpc/platforms/powernv/vas.h
@@ -428,6 +428,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_thread_fn(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:[~2020-03-04 21:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-04 20:21 [PATCH V6 00/14] powerpc/vas: Page fault handling for user space NX requests Haren Myneni
2020-03-04 20:44 ` [PATCH V6 01/14] powerpc/xive: Define xive_native_alloc_irq_on_chip() Haren Myneni
2020-03-04 20:45 ` [PATCH V6 02/14] powerpc/xive: Define xive_native_alloc_get_irq_info() Haren Myneni
2020-03-04 20:45 ` [PATCH V6 03/14] powerpc/vas: Define nx_fault_stamp in coprocessor_request_block Haren Myneni
2020-03-04 20:46 ` [PATCH V6 04/14] powerpc/vas: Alloc and setup IRQ and trigger port address Haren Myneni
2020-03-04 20:46 ` [PATCH V6 05/14] powerpc/vas: Setup fault window per VAS instance Haren Myneni
2020-03-04 20:47 ` [PATCH V6 06/14] powerpc/vas: Setup thread IRQ handler " Haren Myneni
2020-03-04 20:48 ` [PATCH V6 07/14] powerpc/vas: Register NX with fault window ID and IRQ port value Haren Myneni
2020-03-04 20:48 ` [PATCH V6 08/14] powerpc/vas: Take reference to PID and mm for user space windows Haren Myneni
2020-03-04 20:49 ` [PATCH V6 09/14] powerpc/vas: Update CSB and notify process for fault CRBs Haren Myneni
2020-03-04 20:50 ` [PATCH V6 10/14] powerpc/vas: Print CRB and FIFO values Haren Myneni
2020-03-04 20:50 ` [PATCH V6 11/14] powerpc/vas: Do not use default credits for receive window Haren Myneni
2020-03-04 20:52 ` Haren Myneni [this message]
2020-03-04 20:53 ` [PATCH V6 13/14] powerpc/vas: Display process stuck message Haren Myneni
2020-03-04 20:53 ` [PATCH V6 14/14] powerpc/vas: Free send window in VAS instance after credits returned Haren Myneni
2020-03-05 0:04 ` [PATCH V6 00/14] powerpc/vas: Page fault handling for user space NX requests Andrew Donnellan
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=1583355150.18705.2163.camel@hbabu-laptop \
--to=haren@linux.ibm.com \
--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=oohall@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