mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Logan Gunthorpe <logang@deltatee.com>
To: linux-ntb@googlegroups.com, linux-pci@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Jon Mason <jdmason@kudzu.us>, Dave Jiang <dave.jiang@intel.com>,
	Allen Hubbe <Allen.Hubbe@emc.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Kurt Schwemmer <kurt.schwemmer@microsemi.com>,
	Stephen Bates <sbates@raithlin.com>,
	Serge Semin <fancer.lancer@gmail.com>,
	Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH v3 14/16] switchtec_ntb: implement scratchpad registers
Date: Tue, 25 Jul 2017 14:57:51 -0600	[thread overview]
Message-ID: <20170725205753.4735-15-logang@deltatee.com> (raw)
In-Reply-To: <20170725205753.4735-1-logang@deltatee.com>

Seeing there is no dedicated hardware for this, we simply add
these as entries in the shared memory window. Thus, we could support
any number of them but 128 seems like enough, for now.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Stephen Bates <sbates@raithlin.com>
Reviewed-by: Kurt Schwemmer <kurt.schwemmer@microsemi.com>
---
 drivers/ntb/hw/mscc/switchtec_ntb.c | 75 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 2 deletions(-)

diff --git a/drivers/ntb/hw/mscc/switchtec_ntb.c b/drivers/ntb/hw/mscc/switchtec_ntb.c
index 3037ca730998..ca403ad2f7ac 100644
--- a/drivers/ntb/hw/mscc/switchtec_ntb.c
+++ b/drivers/ntb/hw/mscc/switchtec_ntb.c
@@ -67,6 +67,7 @@ struct shared_mw {
 	u32 link_sta;
 	u32 partition_id;
 	u64 mw_sizes[MAX_MWS];
+	u32 spad[128];
 };
 
 #define MAX_DIRECT_MW ARRAY_SIZE(((struct ntb_ctrl_regs *)(0))->bar_entry)
@@ -455,22 +456,90 @@ static int switchtec_ntb_peer_db_set(struct ntb_dev *ntb, u64 db_bits)
 
 static int switchtec_ntb_spad_count(struct ntb_dev *ntb)
 {
-	return 0;
+	struct switchtec_ntb *sndev = ntb_sndev(ntb);
+
+	return ARRAY_SIZE(sndev->self_shared->spad);
 }
 
 static u32 switchtec_ntb_spad_read(struct ntb_dev *ntb, int idx)
 {
-	return 0;
+	struct switchtec_ntb *sndev = ntb_sndev(ntb);
+
+	if (idx < 0 || idx >= ARRAY_SIZE(sndev->self_shared->spad))
+		return 0;
+
+	if (!sndev->self_shared)
+		return 0;
+
+	return sndev->self_shared->spad[idx];
 }
 
 static int switchtec_ntb_spad_write(struct ntb_dev *ntb, int idx, u32 val)
 {
+	struct switchtec_ntb *sndev = ntb_sndev(ntb);
+
+	if (idx < 0 || idx >= ARRAY_SIZE(sndev->self_shared->spad))
+		return -EINVAL;
+
+	if (!sndev->self_shared)
+		return -EIO;
+
+	sndev->self_shared->spad[idx] = val;
+
 	return 0;
 }
 
+static u32 switchtec_ntb_peer_spad_read(struct ntb_dev *ntb, int pidx,
+					int sidx)
+{
+	struct switchtec_ntb *sndev = ntb_sndev(ntb);
+
+	if (pidx != NTB_DEF_PEER_IDX)
+		return -EINVAL;
+
+	if (sidx < 0 || sidx >= ARRAY_SIZE(sndev->peer_shared->spad))
+		return 0;
+
+	if (!sndev->peer_shared)
+		return 0;
+
+	return ioread32(&sndev->peer_shared->spad[sidx]);
+}
+
 static int switchtec_ntb_peer_spad_write(struct ntb_dev *ntb, int pidx,
 					 int sidx, u32 val)
 {
+	struct switchtec_ntb *sndev = ntb_sndev(ntb);
+
+	if (pidx != NTB_DEF_PEER_IDX)
+		return -EINVAL;
+
+	if (sidx < 0 || sidx >= ARRAY_SIZE(sndev->peer_shared->spad))
+		return -EINVAL;
+
+	if (!sndev->peer_shared)
+		return -EIO;
+
+	iowrite32(val, &sndev->peer_shared->spad[sidx]);
+
+	return 0;
+}
+
+static int switchtec_ntb_peer_spad_addr(struct ntb_dev *ntb, int pidx,
+					int sidx, phys_addr_t *spad_addr)
+{
+	struct switchtec_ntb *sndev = ntb_sndev(ntb);
+	unsigned long offset;
+
+	if (pidx != NTB_DEF_PEER_IDX)
+		return -EINVAL;
+
+	offset = (unsigned long)&sndev->peer_shared->spad[sidx] -
+		(unsigned long)sndev->stdev->mmio;
+
+	if (spad_addr)
+		*spad_addr = pci_resource_start(ntb->pdev, 0) + offset;
+
 	return 0;
 }
 
@@ -496,7 +565,9 @@ static const struct ntb_dev_ops switchtec_ntb_ops = {
 	.spad_count		= switchtec_ntb_spad_count,
 	.spad_read		= switchtec_ntb_spad_read,
 	.spad_write		= switchtec_ntb_spad_write,
+	.peer_spad_read		= switchtec_ntb_peer_spad_read,
 	.peer_spad_write	= switchtec_ntb_peer_spad_write,
+	.peer_spad_addr		= switchtec_ntb_peer_spad_addr,
 };
 
 static void switchtec_ntb_init_sndev(struct switchtec_ntb *sndev)
-- 
2.11.0

  parent reply	other threads:[~2017-07-25 21:02 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-25 20:57 [PATCH v3 00/16] Switchtec NTB Support Logan Gunthorpe
2017-07-25 20:57 ` [PATCH v3 01/16] switchtec: move structure definitions into a common header Logan Gunthorpe
2017-07-31 20:15   ` Bjorn Helgaas
2017-07-31 20:51     ` Logan Gunthorpe
2017-07-31 22:50       ` Bjorn Helgaas
2017-07-25 20:57 ` [PATCH v3 02/16] switchtec: export class symbol for use in upper layer driver Logan Gunthorpe
2017-07-25 20:57 ` [PATCH v3 03/16] switchtec: add NTB hardware register definitions Logan Gunthorpe
2017-07-25 20:57 ` [PATCH v3 04/16] switchtec: add link event notifier callback Logan Gunthorpe
2017-07-25 20:57 ` [PATCH v3 05/16] ntb: ntb_test: ensure the link is up before trying to configure the mws Logan Gunthorpe
2017-08-01 18:07   ` Jon Mason
2017-08-01 18:09     ` Logan Gunthorpe
2017-08-01 18:16       ` Jon Mason
2017-08-01 18:19         ` Logan Gunthorpe
2017-07-25 20:57 ` [PATCH v3 06/16] ntb: ensure ntb_mw_get_align() is only called when the link is up Logan Gunthorpe
2017-07-31 20:16   ` Bjorn Helgaas
2017-08-01 18:14   ` Jon Mason
2017-08-01 18:17     ` Logan Gunthorpe
2017-08-01 18:28       ` Jon Mason
2017-07-25 20:57 ` [PATCH v3 07/16] ntb: add check and comment for link up to mw_count() and mw_get_align() Logan Gunthorpe
2017-08-01 18:11   ` Jon Mason
2017-07-25 20:57 ` [PATCH v3 08/16] switchtec_ntb: introduce initial NTB driver Logan Gunthorpe
2017-07-31 23:08   ` Dave Jiang
2017-07-25 20:57 ` [PATCH v3 09/16] switchtec_ntb: initialize hardware for memory windows Logan Gunthorpe
2017-07-31 20:25   ` Bjorn Helgaas
2017-08-01 18:55   ` Jon Mason
2017-07-25 20:57 ` [PATCH v3 10/16] switchtec_ntb: initialize hardware for doorbells and messages Logan Gunthorpe
2017-07-31 20:26   ` Bjorn Helgaas
2017-07-25 20:57 ` [PATCH v3 11/16] switchtec_ntb: add skeleton NTB driver Logan Gunthorpe
2017-07-25 20:57 ` [PATCH v3 12/16] switchtec_ntb: add link management Logan Gunthorpe
2017-07-31 20:27   ` Bjorn Helgaas
2017-07-25 20:57 ` [PATCH v3 13/16] switchtec_ntb: implement doorbell registers Logan Gunthorpe
2017-08-01 18:59   ` Jon Mason
2017-07-25 20:57 ` Logan Gunthorpe [this message]
2017-08-01 19:10   ` [PATCH v3 14/16] switchtec_ntb: implement scratchpad registers Jon Mason
2017-08-01 22:26     ` Logan Gunthorpe
2017-08-02 13:06       ` Allen Hubbe
2017-08-02 16:32         ` Jon Mason
2017-08-02 17:02           ` Logan Gunthorpe
2017-07-25 20:57 ` [PATCH v3 15/16] switchtec_ntb: add memory window support Logan Gunthorpe
2017-07-25 20:57 ` [PATCH v3 16/16] switchtec_ntb: update switchtec documentation with notes for NTB Logan Gunthorpe
2017-07-26 13:09 ` [PATCH v3 00/16] Switchtec NTB Support Allen Hubbe

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=20170725205753.4735-15-logang@deltatee.com \
    --to=logang@deltatee.com \
    --cc=Allen.Hubbe@emc.com \
    --cc=bhelgaas@google.com \
    --cc=dave.jiang@intel.com \
    --cc=fancer.lancer@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jdmason@kudzu.us \
    --cc=kurt.schwemmer@microsemi.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-ntb@googlegroups.com \
    --cc=linux-pci@vger.kernel.org \
    --cc=sbates@raithlin.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

all inboxes | Powered by JetHome®