Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Sudeep Dutt and committed by
Greg Kroah-Hartman
c9d5c53d b55f0359

+15
+3
drivers/misc/mic/common/mic_dev.h
··· 48 48 #define MIC_VIRTIO_PARAM_DEV_REMOVE 0x1 49 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 54 #endif
+12
include/uapi/linux/mic_common.h
··· 80 80 * @h2c_config_db: Host to Card Virtio config doorbell set by card 81 81 * @shutdown_status: Card shutdown status set by card 82 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 */ 84 90 struct mic_bootparam { 85 91 __le32 magic; ··· 94 88 __s8 h2c_config_db; 95 89 __u8 shutdown_status; 96 90 __u8 shutdown_card; 91 + __u8 tot_nodes; 92 + __u8 node_id; 93 + __u8 h2c_scif_db; 94 + __u8 c2h_scif_db; 95 + __u64 scif_host_dma_addr; 96 + __u64 scif_card_dma_addr; 97 97 } __attribute__ ((aligned(8))); 98 98 99 99 /**