mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-21 22:21:21 +00:00
Char/Misc driver patches for 4.2-rc1
Here's the big char/misc driver pull request for 4.2-rc1. Lots of mei, extcon, coresight, uio, mic, and other driver updates in here. Full details in the shortlog. All of these have been in linux-next for some time with no reported problems. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlWNn0gACgkQMUfUDdst+ykCCQCgvdF4F2+Hy9+RATdk22ak1uq1 JDMAoJTf4oyaIEdaiOKfEIWg9MasS42B =H5wD -----END PGP SIGNATURE----- Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc driver updates from Greg KH: "Here's the big char/misc driver pull request for 4.2-rc1. Lots of mei, extcon, coresight, uio, mic, and other driver updates in here. Full details in the shortlog. All of these have been in linux-next for some time with no reported problems" * tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (176 commits) mei: me: wait for power gating exit confirmation mei: reset flow control on the last client disconnection MAINTAINERS: mei: add mei_cl_bus.h to maintained file list misc: sram: sort and clean up included headers misc: sram: move reserved block logic out of probe function misc: sram: add private struct device and virt_base members misc: sram: report correct SRAM pool size misc: sram: bump error message level on unclean driver unbinding misc: sram: fix device node reference leak on error misc: sram: fix enabled clock leak on error path misc: mic: Fix reported static checker warning misc: mic: Fix randconfig build error by including errno.h uio: pruss: Drop depends on ARCH_DAVINCI_DA850 from config uio: pruss: Add CONFIG_HAS_IOMEM dependence uio: pruss: Include <linux/sizes.h> extcon: Redefine the unique id of supported external connectors without 'enum extcon' type char:xilinx_hwicap:buffer_icap - change 1/0 to true/false for bool type variable in function buffer_icap_set_configuration(). Drivers: hv: vmbus: Allocate ring buffer memory in NUMA aware fashion parport: check exclusive access before register w1: use correct lock on error in w1_seq_show() ...
This commit is contained in:
Linus Torvalds
commit
d87823813f
172 changed files with 15494 additions and 5662 deletions
|
|
@ -352,6 +352,7 @@ header-y += rtc.h
|
|||
header-y += rtnetlink.h
|
||||
header-y += scc.h
|
||||
header-y += sched.h
|
||||
header-y += scif_ioctl.h
|
||||
header-y += screen_info.h
|
||||
header-y += sctp.h
|
||||
header-y += sdla.h
|
||||
|
|
|
|||
|
|
@ -45,6 +45,11 @@
|
|||
|
||||
#define VSS_OP_REGISTER 128
|
||||
|
||||
/*
|
||||
Daemon code with full handshake support.
|
||||
*/
|
||||
#define VSS_OP_REGISTER1 129
|
||||
|
||||
enum hv_vss_op {
|
||||
VSS_OP_CREATE = 0,
|
||||
VSS_OP_DELETE,
|
||||
|
|
@ -100,7 +105,8 @@ struct hv_vss_msg {
|
|||
*/
|
||||
|
||||
#define FCOPY_VERSION_0 0
|
||||
#define FCOPY_CURRENT_VERSION FCOPY_VERSION_0
|
||||
#define FCOPY_VERSION_1 1
|
||||
#define FCOPY_CURRENT_VERSION FCOPY_VERSION_1
|
||||
#define W_MAX_PATH 260
|
||||
|
||||
enum hv_fcopy_op {
|
||||
|
|
|
|||
|
|
@ -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)));
|
||||
|
||||
/**
|
||||
|
|
|
|||
130
include/uapi/linux/scif_ioctl.h
Normal file
130
include/uapi/linux/scif_ioctl.h
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
/*
|
||||
* Intel MIC Platform Software Stack (MPSS)
|
||||
*
|
||||
* This file is provided under a dual BSD/GPLv2 license. When using or
|
||||
* redistributing this file, you may do so under either license.
|
||||
*
|
||||
* GPL LICENSE SUMMARY
|
||||
*
|
||||
* Copyright(c) 2014 Intel Corporation.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of version 2 of the GNU General Public License as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* BSD LICENSE
|
||||
*
|
||||
* Copyright(c) 2014 Intel Corporation.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* * Neither the name of Intel Corporation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* Intel SCIF driver.
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* -----------------------------------------
|
||||
* SCIF IOCTL interface information
|
||||
* -----------------------------------------
|
||||
*/
|
||||
#ifndef SCIF_IOCTL_H
|
||||
#define SCIF_IOCTL_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/**
|
||||
* struct scif_port_id - SCIF port information
|
||||
* @node: node on which port resides
|
||||
* @port: local port number
|
||||
*/
|
||||
struct scif_port_id {
|
||||
__u16 node;
|
||||
__u16 port;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct scifioctl_connect - used for SCIF_CONNECT IOCTL
|
||||
* @self: used to read back the assigned port_id
|
||||
* @peer: destination node and port to connect to
|
||||
*/
|
||||
struct scifioctl_connect {
|
||||
struct scif_port_id self;
|
||||
struct scif_port_id peer;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct scifioctl_accept - used for SCIF_ACCEPTREQ IOCTL
|
||||
* @flags: flags
|
||||
* @peer: global id of peer endpoint
|
||||
* @endpt: new connected endpoint descriptor
|
||||
*/
|
||||
struct scifioctl_accept {
|
||||
__s32 flags;
|
||||
struct scif_port_id peer;
|
||||
__u64 endpt;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct scifioctl_msg - used for SCIF_SEND/SCIF_RECV IOCTL
|
||||
* @msg: message buffer address
|
||||
* @len: message length
|
||||
* @flags: flags
|
||||
* @out_len: number of bytes sent/received
|
||||
*/
|
||||
struct scifioctl_msg {
|
||||
__u64 msg;
|
||||
__s32 len;
|
||||
__s32 flags;
|
||||
__s32 out_len;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct scifioctl_node_ids - used for SCIF_GET_NODEIDS IOCTL
|
||||
* @nodes: pointer to an array of node_ids
|
||||
* @self: ID of the current node
|
||||
* @len: length of array
|
||||
*/
|
||||
struct scifioctl_node_ids {
|
||||
__u64 nodes;
|
||||
__u64 self;
|
||||
__s32 len;
|
||||
};
|
||||
|
||||
#define SCIF_BIND _IOWR('s', 1, __u64)
|
||||
#define SCIF_LISTEN _IOW('s', 2, __s32)
|
||||
#define SCIF_CONNECT _IOWR('s', 3, struct scifioctl_connect)
|
||||
#define SCIF_ACCEPTREQ _IOWR('s', 4, struct scifioctl_accept)
|
||||
#define SCIF_ACCEPTREG _IOWR('s', 5, __u64)
|
||||
#define SCIF_SEND _IOWR('s', 6, struct scifioctl_msg)
|
||||
#define SCIF_RECV _IOWR('s', 7, struct scifioctl_msg)
|
||||
#define SCIF_GET_NODEIDS _IOWR('s', 14, struct scifioctl_node_ids)
|
||||
|
||||
#endif /* SCIF_IOCTL_H */
|
||||
Loading…
Add table
Add a link
Reference in a new issue