aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudeep Dutt <sudeep.dutt@intel.com>2015-04-29 08:32:32 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-24 15:13:36 -0400
commitc9d5c53db959e587d8b59c6a202e2dca741baac4 (patch)
treee2d81c9b6162275d388c8c89fbb03b0a7958047e
parentb55f0359c19bae3be8fbda1281c071bc72c0dd55 (diff)
misc: mic: Common MIC header file changes in preparation for SCIF
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mic/common/mic_dev.h3
-rw-r--r--include/uapi/linux/mic_common.h12
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/misc/mic/common/mic_dev.h b/drivers/misc/mic/common/mic_dev.h
index 92999c2bbf82..0b58c46045dc 100644
--- a/drivers/misc/mic/common/mic_dev.h
+++ b/drivers/misc/mic/common/mic_dev.h
@@ -48,4 +48,7 @@ struct mic_mw {
48#define MIC_VIRTIO_PARAM_DEV_REMOVE 0x1 48#define MIC_VIRTIO_PARAM_DEV_REMOVE 0x1
49#define MIC_VIRTIO_PARAM_CONFIG_CHANGED 0x2 49#define MIC_VIRTIO_PARAM_CONFIG_CHANGED 0x2
50 50
51/* Maximum number of DMA channels */
52#define MIC_MAX_DMA_CHAN 4
53
51#endif 54#endif
diff --git a/include/uapi/linux/mic_common.h b/include/uapi/linux/mic_common.h
index 6eb40244e019..302a2ced373c 100644
--- a/include/uapi/linux/mic_common.h
+++ b/include/uapi/linux/mic_common.h
@@ -80,6 +80,12 @@ struct mic_device_ctrl {
80 * @h2c_config_db: Host to Card Virtio config doorbell set by card 80 * @h2c_config_db: Host to Card Virtio config doorbell set by card
81 * @shutdown_status: Card shutdown status set by card 81 * @shutdown_status: Card shutdown status set by card
82 * @shutdown_card: Set to 1 by the host when a card shutdown is initiated 82 * @shutdown_card: Set to 1 by the host when a card shutdown is initiated
83 * @tot_nodes: Total number of nodes in the SCIF network
84 * @node_id: Unique id of the node
85 * @h2c_scif_db - Host to card SCIF doorbell set by card
86 * @c2h_scif_db - Card to host SCIF doorbell set by host
87 * @scif_host_dma_addr - SCIF host queue pair DMA address
88 * @scif_card_dma_addr - SCIF card queue pair DMA address
83 */ 89 */
84struct mic_bootparam { 90struct mic_bootparam {
85 __le32 magic; 91 __le32 magic;
@@ -88,6 +94,12 @@ struct mic_bootparam {
88 __s8 h2c_config_db; 94 __s8 h2c_config_db;
89 __u8 shutdown_status; 95 __u8 shutdown_status;
90 __u8 shutdown_card; 96 __u8 shutdown_card;
97 __u8 tot_nodes;
98 __u8 node_id;
99 __u8 h2c_scif_db;
100 __u8 c2h_scif_db;
101 __u64 scif_host_dma_addr;
102 __u64 scif_card_dma_addr;
91} __attribute__ ((aligned(8))); 103} __attribute__ ((aligned(8)));
92 104
93/** 105/**