linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sudeep Dutt <sudeep.dutt@intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Jonathan Corbet <corbet@lwn.net>,
	linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
	Dave Jiang <dave.jiang@intel.com>,
	Nikhil Rao <nikhil.rao@intel.com>,
	Ashutosh Dixit <ashutosh.dixit@intel.com>,
	Sudeep Dutt <sudeep.dutt@intel.com>
Subject: [PATCH char-misc-next v2 05/13] misc: mic: Common MIC header file changes in preparation for SCIF
Date: Mon, 12 Jan 2015 15:09:59 -0800	[thread overview]
Message-ID: <cc6e379ede0fcd115a9b5c50ab5527c2e51889a1.1421097390.git.sudeep.dutt@intel.com> (raw)
In-Reply-To: <cover.1421097390.git.sudeep.dutt@intel.com>
In-Reply-To: <cover.1421097390.git.sudeep.dutt@intel.com>

Update mic_bootparam and define the maximum number of DMA channels

Reviewed-by: Nikhil Rao <nikhil.rao@intel.com>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
---
 drivers/misc/mic/common/mic_dev.h |  3 +++
 include/uapi/linux/mic_common.h   | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/drivers/misc/mic/common/mic_dev.h b/drivers/misc/mic/common/mic_dev.h
index 92999c2..0b58c46 100644
--- a/drivers/misc/mic/common/mic_dev.h
+++ b/drivers/misc/mic/common/mic_dev.h
@@ -48,4 +48,7 @@ struct mic_mw {
 #define MIC_VIRTIO_PARAM_DEV_REMOVE 0x1
 #define MIC_VIRTIO_PARAM_CONFIG_CHANGED 0x2
 
+/* Maximum number of DMA channels */
+#define MIC_MAX_DMA_CHAN 4
+
 #endif
diff --git a/include/uapi/linux/mic_common.h b/include/uapi/linux/mic_common.h
index 6eb4024..302a2ce 100644
--- a/include/uapi/linux/mic_common.h
+++ b/include/uapi/linux/mic_common.h
@@ -80,6 +80,12 @@ struct mic_device_ctrl {
  * @h2c_config_db: Host to Card Virtio config doorbell set by card
  * @shutdown_status: Card shutdown status set by card
  * @shutdown_card: Set to 1 by the host when a card shutdown is initiated
+ * @tot_nodes: Total number of nodes in the SCIF network
+ * @node_id: Unique id of the node
+ * @h2c_scif_db - Host to card SCIF doorbell set by card
+ * @c2h_scif_db - Card to host SCIF doorbell set by host
+ * @scif_host_dma_addr - SCIF host queue pair DMA address
+ * @scif_card_dma_addr - SCIF card queue pair DMA address
  */
 struct mic_bootparam {
 	__le32 magic;
@@ -88,6 +94,12 @@ struct mic_bootparam {
 	__s8 h2c_config_db;
 	__u8 shutdown_status;
 	__u8 shutdown_card;
+	__u8 tot_nodes;
+	__u8 node_id;
+	__u8 h2c_scif_db;
+	__u8 c2h_scif_db;
+	__u64 scif_host_dma_addr;
+	__u64 scif_card_dma_addr;
 } __attribute__ ((aligned(8)));
 
 /**
-- 
1.8.2.1


  parent reply	other threads:[~2015-01-12 23:16 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-12 23:09 [PATCH char-misc-next v2 00/13] misc: mic: SCIF driver Sudeep Dutt
2015-01-12 23:09 ` [PATCH char-misc-next v2 01/13] misc: mic: SCIF header file and IOCTL interface Sudeep Dutt
2015-01-25 12:39   ` Greg Kroah-Hartman
2015-01-26 18:07     ` Sudeep Dutt
2015-01-25 12:41   ` Greg Kroah-Hartman
2015-01-26 18:07     ` Sudeep Dutt
2015-01-12 23:09 ` [PATCH char-misc-next v2 02/13] misc: mic: SCIF ring buffer infrastructure Sudeep Dutt
2015-01-12 23:09 ` [PATCH char-misc-next v2 03/13] misc: mic: SCIF Hardware Bus Sudeep Dutt
2015-01-12 23:09 ` [PATCH char-misc-next v2 04/13] misc: mic: SCIF Peer Bus Sudeep Dutt
2015-01-12 23:09 ` Sudeep Dutt [this message]
2015-01-12 23:10 ` [PATCH char-misc-next v2 06/13] misc: mic: SCIF module initialization Sudeep Dutt
2015-01-12 23:10 ` [PATCH char-misc-next v2 07/13] misc: mic: SCIF node queue pair setup management Sudeep Dutt
2015-01-12 23:10 ` [PATCH char-misc-next v2 08/13] misc: mic: SCIF open close bind and listen APIs Sudeep Dutt
2015-01-12 23:10 ` [PATCH char-misc-next v2 09/13] misc: mic: SCIF connections APIs i.e. accept and connect Sudeep Dutt
2015-01-12 23:10 ` [PATCH char-misc-next v2 10/13] misc: mic: SCIF messaging and node enumeration APIs Sudeep Dutt
2015-01-12 23:10 ` [PATCH char-misc-next v2 11/13] misc: mic: MIC host driver specific changes to enable SCIF Sudeep Dutt
2015-01-12 23:10 ` [PATCH char-misc-next v2 12/13] misc: mic: MIC card " Sudeep Dutt
2015-01-12 23:10 ` [PATCH char-misc-next v2 13/13] misc: mic: add support for loading/unloading SCIF driver Sudeep Dutt
2015-01-25 12:44 ` [PATCH char-misc-next v2 00/13] misc: mic: " Greg Kroah-Hartman
2015-01-26 18:07   ` Sudeep Dutt
2015-01-26 20:27     ` Greg Kroah-Hartman

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=cc6e379ede0fcd115a9b5c50ab5527c2e51889a1.1421097390.git.sudeep.dutt@intel.com \
    --to=sudeep.dutt@intel.com \
    --cc=arnd@arndb.de \
    --cc=ashutosh.dixit@intel.com \
    --cc=corbet@lwn.net \
    --cc=dave.jiang@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nikhil.rao@intel.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).