From: Haren Myneni <haren@linux.ibm.com>
To: mpe@ellerman.id.au
Cc: hch@infradead.org, mikey@neuling.org, npiggin@gmail.com,
herbert@gondor.apana.org.au, linuxppc-dev@lists.ozlabs.org,
devicetree@vger.kernel.org, sukadev@linux.vnet.ibm.com,
hbabu@us.ibm.com
Subject: [PATCH V2 03/13] powerpc/vas: Read interrupts and vas-port device tree properties
Date: Sun, 08 Dec 2019 19:29:25 -0800 [thread overview]
Message-ID: <1575862166.16318.19.camel@hbabu-laptop> (raw)
In-Reply-To: <1575861522.16318.9.camel@hbabu-laptop>
Read interrupts and vas-port device tree properties per each VAS
instance. NX generates an interrupt when it sees page fault on the
request buffer. Interrupts property is used to setup IRQ for handing
the fault and set port value for each user space send window.
Signed-off-by: Haren Myneni <haren@us.ibm.com>
---
arch/powerpc/platforms/powernv/vas.c | 40 ++++++++++++++++++++++++++++--------
arch/powerpc/platforms/powernv/vas.h | 2 ++
2 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/vas.c b/arch/powerpc/platforms/powernv/vas.c
index ed9cc6d..40d8213 100644
--- a/arch/powerpc/platforms/powernv/vas.c
+++ b/arch/powerpc/platforms/powernv/vas.c
@@ -25,10 +25,11 @@
static int init_vas_instance(struct platform_device *pdev)
{
- int rc, cpu, vasid;
- struct resource *res;
- struct vas_instance *vinst;
struct device_node *dn = pdev->dev.of_node;
+ int rc, cpu, vasid, nresources = 5;
+ struct vas_instance *vinst;
+ struct resource *res;
+ uint64_t port;
rc = of_property_read_u32(dn, "ibm,vas-id", &vasid);
if (rc) {
@@ -36,7 +37,18 @@ static int init_vas_instance(struct platform_device *pdev)
return -ENODEV;
}
- if (pdev->num_resources != 4) {
+ rc = of_property_read_u64(dn, "ibm,vas-port", &port);
+ if (rc) {
+ pr_err("No ibm,vas-port property for %s?\n", pdev->name);
+ /* No interrupts property */
+ nresources = 4;
+ }
+
+ /*
+ * interrupts property is available with 'ibm,vas-port' property.
+ * 4 Resources and 1 IRQ if interrupts property is available.
+ */
+ if (pdev->num_resources != nresources) {
pr_err("Unexpected DT configuration for [%s, %d]\n",
pdev->name, vasid);
return -ENODEV;
@@ -51,6 +63,7 @@ static int init_vas_instance(struct platform_device *pdev)
mutex_init(&vinst->mutex);
vinst->vas_id = vasid;
vinst->pdev = pdev;
+ vinst->irq_port = port;
res = &pdev->resource[0];
vinst->hvwc_bar_start = res->start;
@@ -66,12 +79,23 @@ static int init_vas_instance(struct platform_device *pdev)
pr_err("Bad 'paste_win_id_shift' in DT, %llx\n", res->end);
goto free_vinst;
}
-
vinst->paste_win_id_shift = 63 - res->end;
- pr_devel("Initialized instance [%s, %d], paste_base 0x%llx, "
- "paste_win_id_shift 0x%llx\n", pdev->name, vasid,
- vinst->paste_base_addr, vinst->paste_win_id_shift);
+ /* interrupts property */
+ if (pdev->num_resources == 5) {
+ res = &pdev->resource[4];
+ vinst->virq = res->start;
+ if (vinst->virq <= 0) {
+ pr_err("IRQ resource is not available for [%s, %d]\n",
+ pdev->name, vasid);
+ vinst->virq = 0;
+ }
+ }
+
+ pr_devel("Initialized instance [%s, %d] paste_base 0x%llx paste_win_id_shift 0x%llx IRQ %d Port 0x%llx\n",
+ pdev->name, vasid, vinst->paste_base_addr,
+ vinst->paste_win_id_shift, vinst->virq,
+ vinst->irq_port);
for_each_possible_cpu(cpu) {
if (cpu_to_chip_id(cpu) == of_get_ibm_chip_id(dn))
diff --git a/arch/powerpc/platforms/powernv/vas.h b/arch/powerpc/platforms/powernv/vas.h
index 5574aec..598608b 100644
--- a/arch/powerpc/platforms/powernv/vas.h
+++ b/arch/powerpc/platforms/powernv/vas.h
@@ -313,6 +313,8 @@ struct vas_instance {
u64 paste_base_addr;
u64 paste_win_id_shift;
+ u64 irq_port;
+ int virq;
struct mutex mutex;
struct vas_window *rxwin[VAS_COP_TYPE_MAX];
struct vas_window *windows[VAS_WINDOWS_PER_CHIP];
--
1.8.3.1
next prev parent reply other threads:[~2019-12-09 3:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 3:18 [PATCH V2 00/13] powerpc/vas: Page fault handling for user space NX requests Haren Myneni
2019-12-09 3:26 ` [PATCH V2 01/13] powerpc/vas: Describe vas-port and interrupts properties Haren Myneni
2019-12-09 3:27 ` [PATCH V2 02/13] powerpc/vas: Define nx_fault_stamp in coprocessor_request_block Haren Myneni
2019-12-09 3:29 ` Haren Myneni [this message]
2019-12-09 3:30 ` [PATCH V2 04/13] powerpc/vas: Setup fault window per VAS instance Haren Myneni
2019-12-12 12:55 ` Christoph Hellwig
2019-12-09 3:31 ` [PATCH V2 05/13] powerpc/vas: Setup thread IRQ handler " Haren Myneni
2019-12-12 12:59 ` Christoph Hellwig
2019-12-09 3:32 ` [PATCH V2 06/13] powerpc/vas: Register NX with fault window ID and IRQ port value Haren Myneni
2019-12-09 3:32 ` [PATCH V2 07/13] powerpc/vas: Take reference to PID and mm for user space windows Haren Myneni
2019-12-12 13:02 ` Christoph Hellwig
2019-12-17 5:35 ` Haren Myneni
2019-12-09 3:33 ` [PATCH V2 08/13] powerpc/vas: Update CSB and notify process for fault CRBs Haren Myneni
2019-12-12 13:07 ` Christoph Hellwig
2019-12-09 3:34 ` [PATCH V2 09/13] powerpc/vas: Print CRB and FIFO values Haren Myneni
2019-12-09 3:34 ` [PATCH V2 10/13] powerpc/vas: Do not use default credits for receive window Haren Myneni
2019-12-09 3:35 ` [PATCH V2 11/13] powerpc/vas: Return credits after handling fault Haren Myneni
2019-12-09 3:36 ` [PATCH V2 12/13] powerpc/vas: Display process stuck message Haren Myneni
2019-12-09 3:37 ` [PATCH V2 13/13] powerpc/vas: Free send window in VAS instance after credits returned Haren Myneni
2019-12-09 5:37 ` [PATCH V2 00/13] powerpc/vas: Page fault handling for user space NX requests Christophe Leroy
2019-12-09 8:38 ` Segher Boessenkool
2019-12-12 5:05 ` Haren Myneni
2019-12-12 5:38 ` 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=1575862166.16318.19.camel@hbabu-laptop \
--to=haren@linux.ibm.com \
--cc=devicetree@vger.kernel.org \
--cc=hbabu@us.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=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).