lkml.org 
[lkml]   [2014]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH char-misc-next 05/13] misc: mic: Common MIC header file changes in preparation for SCIF
    Date
    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


    \
     
     \ /
      Last update: 2014-12-10 21:21    [W:3.149 / U:0.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site