diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/extcon.h | 72 | ||||
| -rw-r--r-- | include/linux/extcon/extcon-adc-jack.h | 42 | ||||
| -rw-r--r-- | include/linux/extcon/extcon-gpio.h | 20 | ||||
| -rw-r--r-- | include/linux/hyperv.h | 37 | ||||
| -rw-r--r-- | include/uapi/linux/Kbuild | 2 | ||||
| -rw-r--r-- | include/uapi/linux/mic_common.h | 240 | ||||
| -rw-r--r-- | include/uapi/linux/mic_ioctl.h | 76 |
7 files changed, 388 insertions, 101 deletions
diff --git a/include/linux/extcon.h b/include/linux/extcon.h index fcb51c88319f..21c59af1150b 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h | |||
| @@ -51,10 +51,10 @@ | |||
| 51 | enum extcon_cable_name { | 51 | enum extcon_cable_name { |
| 52 | EXTCON_USB = 0, | 52 | EXTCON_USB = 0, |
| 53 | EXTCON_USB_HOST, | 53 | EXTCON_USB_HOST, |
| 54 | EXTCON_TA, /* Travel Adaptor */ | 54 | EXTCON_TA, /* Travel Adaptor */ |
| 55 | EXTCON_FAST_CHARGER, | 55 | EXTCON_FAST_CHARGER, |
| 56 | EXTCON_SLOW_CHARGER, | 56 | EXTCON_SLOW_CHARGER, |
| 57 | EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */ | 57 | EXTCON_CHARGE_DOWNSTREAM, /* Charging an external device */ |
| 58 | EXTCON_HDMI, | 58 | EXTCON_HDMI, |
| 59 | EXTCON_MHL, | 59 | EXTCON_MHL, |
| 60 | EXTCON_DVI, | 60 | EXTCON_DVI, |
| @@ -76,8 +76,8 @@ struct extcon_cable; | |||
| 76 | 76 | ||
| 77 | /** | 77 | /** |
| 78 | * struct extcon_dev - An extcon device represents one external connector. | 78 | * struct extcon_dev - An extcon device represents one external connector. |
| 79 | * @name: The name of this extcon device. Parent device name is used | 79 | * @name: The name of this extcon device. Parent device name is |
| 80 | * if NULL. | 80 | * used if NULL. |
| 81 | * @supported_cable: Array of supported cable names ending with NULL. | 81 | * @supported_cable: Array of supported cable names ending with NULL. |
| 82 | * If supported_cable is NULL, cable name related APIs | 82 | * If supported_cable is NULL, cable name related APIs |
| 83 | * are disabled. | 83 | * are disabled. |
| @@ -89,21 +89,21 @@ struct extcon_cable; | |||
| 89 | * be attached simulataneously. {0x7, 0} is equivalent to | 89 | * be attached simulataneously. {0x7, 0} is equivalent to |
| 90 | * {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there | 90 | * {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there |
| 91 | * can be no simultaneous connections. | 91 | * can be no simultaneous connections. |
| 92 | * @print_name: An optional callback to override the method to print the | 92 | * @print_name: An optional callback to override the method to print the |
| 93 | * name of the extcon device. | 93 | * name of the extcon device. |
| 94 | * @print_state: An optional callback to override the method to print the | 94 | * @print_state: An optional callback to override the method to print the |
| 95 | * status of the extcon device. | 95 | * status of the extcon device. |
| 96 | * @dev: Device of this extcon. Do not provide at register-time. | 96 | * @dev: Device of this extcon. |
| 97 | * @state: Attach/detach state of this extcon. Do not provide at | 97 | * @state: Attach/detach state of this extcon. Do not provide at |
| 98 | * register-time | 98 | * register-time. |
| 99 | * @nh: Notifier for the state change events from this extcon | 99 | * @nh: Notifier for the state change events from this extcon |
| 100 | * @entry: To support list of extcon devices so that users can search | 100 | * @entry: To support list of extcon devices so that users can search |
| 101 | * for extcon devices based on the extcon name. | 101 | * for extcon devices based on the extcon name. |
| 102 | * @lock: | 102 | * @lock: |
| 103 | * @max_supported: Internal value to store the number of cables. | 103 | * @max_supported: Internal value to store the number of cables. |
| 104 | * @extcon_dev_type: Device_type struct to provide attribute_groups | 104 | * @extcon_dev_type: Device_type struct to provide attribute_groups |
| 105 | * customized for each extcon device. | 105 | * customized for each extcon device. |
| 106 | * @cables: Sysfs subdirectories. Each represents one cable. | 106 | * @cables: Sysfs subdirectories. Each represents one cable. |
| 107 | * | 107 | * |
| 108 | * In most cases, users only need to provide "User initializing data" of | 108 | * In most cases, users only need to provide "User initializing data" of |
| 109 | * this struct when registering an extcon. In some exceptional cases, | 109 | * this struct when registering an extcon. In some exceptional cases, |
| @@ -111,26 +111,27 @@ struct extcon_cable; | |||
| 111 | * are overwritten by register function. | 111 | * are overwritten by register function. |
| 112 | */ | 112 | */ |
| 113 | struct extcon_dev { | 113 | struct extcon_dev { |
| 114 | /* --- Optional user initializing data --- */ | 114 | /* Optional user initializing data */ |
| 115 | const char *name; | 115 | const char *name; |
| 116 | const char **supported_cable; | 116 | const char **supported_cable; |
| 117 | const u32 *mutually_exclusive; | 117 | const u32 *mutually_exclusive; |
| 118 | 118 | ||
| 119 | /* --- Optional callbacks to override class functions --- */ | 119 | /* Optional callbacks to override class functions */ |
| 120 | ssize_t (*print_name)(struct extcon_dev *edev, char *buf); | 120 | ssize_t (*print_name)(struct extcon_dev *edev, char *buf); |
| 121 | ssize_t (*print_state)(struct extcon_dev *edev, char *buf); | 121 | ssize_t (*print_state)(struct extcon_dev *edev, char *buf); |
| 122 | 122 | ||
| 123 | /* --- Internal data. Please do not set. --- */ | 123 | /* Internal data. Please do not set. */ |
| 124 | struct device *dev; | 124 | struct device dev; |
| 125 | u32 state; | ||
| 126 | struct raw_notifier_head nh; | 125 | struct raw_notifier_head nh; |
| 127 | struct list_head entry; | 126 | struct list_head entry; |
| 128 | spinlock_t lock; /* could be called by irq handler */ | ||
| 129 | int max_supported; | 127 | int max_supported; |
| 128 | spinlock_t lock; /* could be called by irq handler */ | ||
| 129 | u32 state; | ||
| 130 | 130 | ||
| 131 | /* /sys/class/extcon/.../cable.n/... */ | 131 | /* /sys/class/extcon/.../cable.n/... */ |
| 132 | struct device_type extcon_dev_type; | 132 | struct device_type extcon_dev_type; |
| 133 | struct extcon_cable *cables; | 133 | struct extcon_cable *cables; |
| 134 | |||
| 134 | /* /sys/class/extcon/.../mutually_exclusive/... */ | 135 | /* /sys/class/extcon/.../mutually_exclusive/... */ |
| 135 | struct attribute_group attr_g_muex; | 136 | struct attribute_group attr_g_muex; |
| 136 | struct attribute **attrs_muex; | 137 | struct attribute **attrs_muex; |
| @@ -138,13 +139,13 @@ struct extcon_dev { | |||
| 138 | }; | 139 | }; |
| 139 | 140 | ||
| 140 | /** | 141 | /** |
| 141 | * struct extcon_cable - An internal data for each cable of extcon device. | 142 | * struct extcon_cable - An internal data for each cable of extcon device. |
| 142 | * @edev: The extcon device | 143 | * @edev: The extcon device |
| 143 | * @cable_index: Index of this cable in the edev | 144 | * @cable_index: Index of this cable in the edev |
| 144 | * @attr_g: Attribute group for the cable | 145 | * @attr_g: Attribute group for the cable |
| 145 | * @attr_name: "name" sysfs entry | 146 | * @attr_name: "name" sysfs entry |
| 146 | * @attr_state: "state" sysfs entry | 147 | * @attr_state: "state" sysfs entry |
| 147 | * @attrs: Array pointing to attr_name and attr_state for attr_g | 148 | * @attrs: Array pointing to attr_name and attr_state for attr_g |
| 148 | */ | 149 | */ |
| 149 | struct extcon_cable { | 150 | struct extcon_cable { |
| 150 | struct extcon_dev *edev; | 151 | struct extcon_dev *edev; |
| @@ -159,11 +160,13 @@ struct extcon_cable { | |||
| 159 | 160 | ||
| 160 | /** | 161 | /** |
| 161 | * struct extcon_specific_cable_nb - An internal data for | 162 | * struct extcon_specific_cable_nb - An internal data for |
| 162 | * extcon_register_interest(). | 163 | * extcon_register_interest(). |
| 163 | * @internal_nb: a notifier block bridging extcon notifier and cable notifier. | 164 | * @internal_nb: A notifier block bridging extcon notifier |
| 164 | * @user_nb: user provided notifier block for events from a specific cable. | 165 | * and cable notifier. |
| 166 | * @user_nb: user provided notifier block for events from | ||
| 167 | * a specific cable. | ||
| 165 | * @cable_index: the target cable. | 168 | * @cable_index: the target cable. |
| 166 | * @edev: the target extcon device. | 169 | * @edev: the target extcon device. |
| 167 | * @previous_value: the saved previous event value. | 170 | * @previous_value: the saved previous event value. |
| 168 | */ | 171 | */ |
| 169 | struct extcon_specific_cable_nb { | 172 | struct extcon_specific_cable_nb { |
| @@ -180,7 +183,7 @@ struct extcon_specific_cable_nb { | |||
| 180 | * Following APIs are for notifiers or configurations. | 183 | * Following APIs are for notifiers or configurations. |
| 181 | * Notifiers are the external port and connection devices. | 184 | * Notifiers are the external port and connection devices. |
| 182 | */ | 185 | */ |
| 183 | extern int extcon_dev_register(struct extcon_dev *edev, struct device *dev); | 186 | extern int extcon_dev_register(struct extcon_dev *edev); |
| 184 | extern void extcon_dev_unregister(struct extcon_dev *edev); | 187 | extern void extcon_dev_unregister(struct extcon_dev *edev); |
| 185 | extern struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name); | 188 | extern struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name); |
| 186 | 189 | ||
| @@ -238,8 +241,7 @@ extern int extcon_register_notifier(struct extcon_dev *edev, | |||
| 238 | extern int extcon_unregister_notifier(struct extcon_dev *edev, | 241 | extern int extcon_unregister_notifier(struct extcon_dev *edev, |
| 239 | struct notifier_block *nb); | 242 | struct notifier_block *nb); |
| 240 | #else /* CONFIG_EXTCON */ | 243 | #else /* CONFIG_EXTCON */ |
| 241 | static inline int extcon_dev_register(struct extcon_dev *edev, | 244 | static inline int extcon_dev_register(struct extcon_dev *edev) |
| 242 | struct device *dev) | ||
| 243 | { | 245 | { |
| 244 | return 0; | 246 | return 0; |
| 245 | } | 247 | } |
diff --git a/include/linux/extcon/extcon-adc-jack.h b/include/linux/extcon/extcon-adc-jack.h index 20e9eef25d4c..9ca958c4e94c 100644 --- a/include/linux/extcon/extcon-adc-jack.h +++ b/include/linux/extcon/extcon-adc-jack.h | |||
| @@ -20,10 +20,10 @@ | |||
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * struct adc_jack_cond - condition to use an extcon state | 22 | * struct adc_jack_cond - condition to use an extcon state |
| 23 | * @state - the corresponding extcon state (if 0, this struct denotes | 23 | * @state: the corresponding extcon state (if 0, this struct |
| 24 | * the last adc_jack_cond element among the array) | 24 | * denotes the last adc_jack_cond element among the array) |
| 25 | * @min_adc - min adc value for this condition | 25 | * @min_adc: min adc value for this condition |
| 26 | * @max_adc - max adc value for this condition | 26 | * @max_adc: max adc value for this condition |
| 27 | * | 27 | * |
| 28 | * For example, if { .state = 0x3, .min_adc = 100, .max_adc = 200}, it means | 28 | * For example, if { .state = 0x3, .min_adc = 100, .max_adc = 200}, it means |
| 29 | * that if ADC value is between (inclusive) 100 and 200, than the cable 0 and | 29 | * that if ADC value is between (inclusive) 100 and 200, than the cable 0 and |
| @@ -33,34 +33,34 @@ | |||
| 33 | * because when no adc_jack_cond is met, state = 0 is automatically chosen. | 33 | * because when no adc_jack_cond is met, state = 0 is automatically chosen. |
| 34 | */ | 34 | */ |
| 35 | struct adc_jack_cond { | 35 | struct adc_jack_cond { |
| 36 | u32 state; /* extcon state value. 0 if invalid */ | 36 | u32 state; /* extcon state value. 0 if invalid */ |
| 37 | u32 min_adc; | 37 | u32 min_adc; |
| 38 | u32 max_adc; | 38 | u32 max_adc; |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | /** | 41 | /** |
| 42 | * struct adc_jack_pdata - platform data for adc jack device. | 42 | * struct adc_jack_pdata - platform data for adc jack device. |
| 43 | * @name - name of the extcon device. If null, "adc-jack" is used. | 43 | * @name: name of the extcon device. If null, "adc-jack" is used. |
| 44 | * @consumer_channel - Unique name to identify the channel on the consumer | 44 | * @consumer_channel: Unique name to identify the channel on the consumer |
| 45 | * side. This typically describes the channels used within | 45 | * side. This typically describes the channels used within |
| 46 | * the consumer. E.g. 'battery_voltage' | 46 | * the consumer. E.g. 'battery_voltage' |
| 47 | * @cable_names - array of cable names ending with null. | 47 | * @cable_names: array of cable names ending with null. |
| 48 | * @adc_contitions - array of struct adc_jack_cond conditions ending | 48 | * @adc_contitions: array of struct adc_jack_cond conditions ending |
| 49 | * with .state = 0 entry. This describes how to decode | 49 | * with .state = 0 entry. This describes how to decode |
| 50 | * adc values into extcon state. | 50 | * adc values into extcon state. |
| 51 | * @irq_flags - irq flags used for the @irq | 51 | * @irq_flags: irq flags used for the @irq |
| 52 | * @handling_delay_ms - in some devices, we need to read ADC value some | 52 | * @handling_delay_ms: in some devices, we need to read ADC value some |
| 53 | * milli-seconds after the interrupt occurs. You may | 53 | * milli-seconds after the interrupt occurs. You may |
| 54 | * describe such delays with @handling_delay_ms, which | 54 | * describe such delays with @handling_delay_ms, which |
| 55 | * is rounded-off by jiffies. | 55 | * is rounded-off by jiffies. |
| 56 | */ | 56 | */ |
| 57 | struct adc_jack_pdata { | 57 | struct adc_jack_pdata { |
| 58 | const char *name; | 58 | const char *name; |
| 59 | const char *consumer_channel; | 59 | const char *consumer_channel; |
| 60 | /* | 60 | |
| 61 | * The last entry should be NULL | 61 | /* The last entry should be NULL */ |
| 62 | */ | ||
| 63 | const char **cable_names; | 62 | const char **cable_names; |
| 63 | |||
| 64 | /* The last entry's state should be 0 */ | 64 | /* The last entry's state should be 0 */ |
| 65 | struct adc_jack_cond *adc_conditions; | 65 | struct adc_jack_cond *adc_conditions; |
| 66 | 66 | ||
diff --git a/include/linux/extcon/extcon-gpio.h b/include/linux/extcon/extcon-gpio.h index 2d8307f7d67d..4195810f87fe 100644 --- a/include/linux/extcon/extcon-gpio.h +++ b/include/linux/extcon/extcon-gpio.h | |||
| @@ -25,14 +25,17 @@ | |||
| 25 | 25 | ||
| 26 | /** | 26 | /** |
| 27 | * struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device. | 27 | * struct gpio_extcon_platform_data - A simple GPIO-controlled extcon device. |
| 28 | * @name The name of this GPIO extcon device. | 28 | * @name: The name of this GPIO extcon device. |
| 29 | * @gpio Corresponding GPIO. | 29 | * @gpio: Corresponding GPIO. |
| 30 | * @debounce Debounce time for GPIO IRQ in ms. | 30 | * @gpio_active_low: Boolean describing whether gpio active state is 1 or 0 |
| 31 | * @irq_flags IRQ Flags (e.g., IRQF_TRIGGER_LOW). | 31 | * If true, low state of gpio means active. |
| 32 | * @state_on print_state is overriden with state_on if attached. If Null, | 32 | * If false, high state of gpio means active. |
| 33 | * default method of extcon class is used. | 33 | * @debounce: Debounce time for GPIO IRQ in ms. |
| 34 | * @state_off print_state is overriden with state_on if detached. If Null, | 34 | * @irq_flags: IRQ Flags (e.g., IRQF_TRIGGER_LOW). |
| 35 | * default method of extcon class is used. | 35 | * @state_on: print_state is overriden with state_on if attached. |
| 36 | * If NULL, default method of extcon class is used. | ||
| 37 | * @state_off: print_state is overriden with state_on if detached. | ||
| 38 | * If NUll, default method of extcon class is used. | ||
| 36 | * | 39 | * |
| 37 | * Note that in order for state_on or state_off to be valid, both state_on | 40 | * Note that in order for state_on or state_off to be valid, both state_on |
| 38 | * and state_off should be not NULL. If at least one of them is NULL, | 41 | * and state_off should be not NULL. If at least one of them is NULL, |
| @@ -41,6 +44,7 @@ | |||
| 41 | struct gpio_extcon_platform_data { | 44 | struct gpio_extcon_platform_data { |
| 42 | const char *name; | 45 | const char *name; |
| 43 | unsigned gpio; | 46 | unsigned gpio; |
| 47 | bool gpio_active_low; | ||
| 44 | unsigned long debounce; | 48 | unsigned long debounce; |
| 45 | unsigned long irq_flags; | 49 | unsigned long irq_flags; |
| 46 | 50 | ||
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index d98503bde7e9..15da677478dd 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h | |||
| @@ -432,15 +432,6 @@ struct hv_ring_buffer_info { | |||
| 432 | u32 ring_data_startoffset; | 432 | u32 ring_data_startoffset; |
| 433 | }; | 433 | }; |
| 434 | 434 | ||
| 435 | struct hv_ring_buffer_debug_info { | ||
| 436 | u32 current_interrupt_mask; | ||
| 437 | u32 current_read_index; | ||
| 438 | u32 current_write_index; | ||
| 439 | u32 bytes_avail_toread; | ||
| 440 | u32 bytes_avail_towrite; | ||
| 441 | }; | ||
| 442 | |||
| 443 | |||
| 444 | /* | 435 | /* |
| 445 | * | 436 | * |
| 446 | * hv_get_ringbuffer_availbytes() | 437 | * hv_get_ringbuffer_availbytes() |
| @@ -902,23 +893,6 @@ enum vmbus_channel_state { | |||
| 902 | CHANNEL_OPENED_STATE, | 893 | CHANNEL_OPENED_STATE, |
| 903 | }; | 894 | }; |
| 904 | 895 | ||
| 905 | struct vmbus_channel_debug_info { | ||
| 906 | u32 relid; | ||
| 907 | enum vmbus_channel_state state; | ||
| 908 | uuid_le interfacetype; | ||
| 909 | uuid_le interface_instance; | ||
| 910 | u32 monitorid; | ||
| 911 | u32 servermonitor_pending; | ||
| 912 | u32 servermonitor_latency; | ||
| 913 | u32 servermonitor_connectionid; | ||
| 914 | u32 clientmonitor_pending; | ||
| 915 | u32 clientmonitor_latency; | ||
| 916 | u32 clientmonitor_connectionid; | ||
| 917 | |||
| 918 | struct hv_ring_buffer_debug_info inbound; | ||
| 919 | struct hv_ring_buffer_debug_info outbound; | ||
| 920 | }; | ||
| 921 | |||
| 922 | /* | 896 | /* |
| 923 | * Represents each channel msg on the vmbus connection This is a | 897 | * Represents each channel msg on the vmbus connection This is a |
| 924 | * variable-size data structure depending on the msg type itself | 898 | * variable-size data structure depending on the msg type itself |
| @@ -1184,19 +1158,8 @@ extern int vmbus_recvpacket_raw(struct vmbus_channel *channel, | |||
| 1184 | u64 *requestid); | 1158 | u64 *requestid); |
| 1185 | 1159 | ||
| 1186 | 1160 | ||
| 1187 | extern void vmbus_get_debug_info(struct vmbus_channel *channel, | ||
| 1188 | struct vmbus_channel_debug_info *debug); | ||
| 1189 | |||
| 1190 | extern void vmbus_ontimer(unsigned long data); | 1161 | extern void vmbus_ontimer(unsigned long data); |
| 1191 | 1162 | ||
| 1192 | struct hv_dev_port_info { | ||
| 1193 | u32 int_mask; | ||
| 1194 | u32 read_idx; | ||
| 1195 | u32 write_idx; | ||
| 1196 | u32 bytes_avail_toread; | ||
| 1197 | u32 bytes_avail_towrite; | ||
| 1198 | }; | ||
| 1199 | |||
| 1200 | /* Base driver object */ | 1163 | /* Base driver object */ |
| 1201 | struct hv_driver { | 1164 | struct hv_driver { |
| 1202 | const char *name; | 1165 | const char *name; |
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 115add2515aa..33d2b8fe166d 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild | |||
| @@ -241,6 +241,8 @@ header-y += media.h | |||
| 241 | header-y += mei.h | 241 | header-y += mei.h |
| 242 | header-y += mempolicy.h | 242 | header-y += mempolicy.h |
| 243 | header-y += meye.h | 243 | header-y += meye.h |
| 244 | header-y += mic_common.h | ||
| 245 | header-y += mic_ioctl.h | ||
| 244 | header-y += mii.h | 246 | header-y += mii.h |
| 245 | header-y += minix_fs.h | 247 | header-y += minix_fs.h |
| 246 | header-y += mman.h | 248 | header-y += mman.h |
diff --git a/include/uapi/linux/mic_common.h b/include/uapi/linux/mic_common.h new file mode 100644 index 000000000000..17e7d95e4f53 --- /dev/null +++ b/include/uapi/linux/mic_common.h | |||
| @@ -0,0 +1,240 @@ | |||
| 1 | /* | ||
| 2 | * Intel MIC Platform Software Stack (MPSS) | ||
| 3 | * | ||
| 4 | * Copyright(c) 2013 Intel Corporation. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License, version 2, as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, but | ||
| 11 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 13 | * General Public License for more details. | ||
| 14 | * | ||
| 15 | * The full GNU General Public License is included in this distribution in | ||
| 16 | * the file called "COPYING". | ||
| 17 | * | ||
| 18 | * Intel MIC driver. | ||
| 19 | * | ||
| 20 | */ | ||
| 21 | #ifndef __MIC_COMMON_H_ | ||
| 22 | #define __MIC_COMMON_H_ | ||
| 23 | |||
| 24 | #include <linux/virtio_ring.h> | ||
| 25 | |||
| 26 | #ifndef __KERNEL__ | ||
| 27 | #define ALIGN(a, x) (((a) + (x) - 1) & ~((x) - 1)) | ||
| 28 | #define __aligned(x) __attribute__ ((aligned(x))) | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #define mic_aligned_size(x) ALIGN(sizeof(x), 8) | ||
| 32 | |||
| 33 | /** | ||
| 34 | * struct mic_device_desc: Virtio device information shared between the | ||
| 35 | * virtio driver and userspace backend | ||
| 36 | * | ||
| 37 | * @type: Device type: console/network/disk etc. Type 0/-1 terminates. | ||
| 38 | * @num_vq: Number of virtqueues. | ||
| 39 | * @feature_len: Number of bytes of feature bits. Multiply by 2: one for | ||
| 40 | host features and one for guest acknowledgements. | ||
| 41 | * @config_len: Number of bytes of the config array after virtqueues. | ||
| 42 | * @status: A status byte, written by the Guest. | ||
| 43 | * @config: Start of the following variable length config. | ||
| 44 | */ | ||
| 45 | struct mic_device_desc { | ||
| 46 | __s8 type; | ||
| 47 | __u8 num_vq; | ||
| 48 | __u8 feature_len; | ||
| 49 | __u8 config_len; | ||
| 50 | __u8 status; | ||
| 51 | __u64 config[0]; | ||
| 52 | } __aligned(8); | ||
| 53 | |||
| 54 | /** | ||
| 55 | * struct mic_device_ctrl: Per virtio device information in the device page | ||
| 56 | * used internally by the host and card side drivers. | ||
| 57 | * | ||
| 58 | * @vdev: Used for storing MIC vdev information by the guest. | ||
| 59 | * @config_change: Set to 1 by host when a config change is requested. | ||
| 60 | * @vdev_reset: Set to 1 by guest to indicate virtio device has been reset. | ||
| 61 | * @guest_ack: Set to 1 by guest to ack a command. | ||
| 62 | * @host_ack: Set to 1 by host to ack a command. | ||
| 63 | * @used_address_updated: Set to 1 by guest when the used address should be | ||
| 64 | * updated. | ||
| 65 | * @c2h_vdev_db: The doorbell number to be used by guest. Set by host. | ||
| 66 | * @h2c_vdev_db: The doorbell number to be used by host. Set by guest. | ||
| 67 | */ | ||
| 68 | struct mic_device_ctrl { | ||
| 69 | __u64 vdev; | ||
| 70 | __u8 config_change; | ||
| 71 | __u8 vdev_reset; | ||
| 72 | __u8 guest_ack; | ||
| 73 | __u8 host_ack; | ||
| 74 | __u8 used_address_updated; | ||
| 75 | __s8 c2h_vdev_db; | ||
| 76 | __s8 h2c_vdev_db; | ||
| 77 | } __aligned(8); | ||
| 78 | |||
| 79 | /** | ||
| 80 | * struct mic_bootparam: Virtio device independent information in device page | ||
| 81 | * | ||
| 82 | * @magic: A magic value used by the card to ensure it can see the host | ||
| 83 | * @c2h_shutdown_db: Card to Host shutdown doorbell set by host | ||
| 84 | * @h2c_shutdown_db: Host to Card shutdown doorbell set by card | ||
| 85 | * @h2c_config_db: Host to Card Virtio config doorbell set by card | ||
| 86 | * @shutdown_status: Card shutdown status set by card | ||
| 87 | * @shutdown_card: Set to 1 by the host when a card shutdown is initiated | ||
| 88 | */ | ||
| 89 | struct mic_bootparam { | ||
| 90 | __u32 magic; | ||
| 91 | __s8 c2h_shutdown_db; | ||
| 92 | __s8 h2c_shutdown_db; | ||
| 93 | __s8 h2c_config_db; | ||
| 94 | __u8 shutdown_status; | ||
| 95 | __u8 shutdown_card; | ||
| 96 | } __aligned(8); | ||
| 97 | |||
| 98 | /** | ||
| 99 | * struct mic_device_page: High level representation of the device page | ||
| 100 | * | ||
| 101 | * @bootparam: The bootparam structure is used for sharing information and | ||
| 102 | * status updates between MIC host and card drivers. | ||
| 103 | * @desc: Array of MIC virtio device descriptors. | ||
| 104 | */ | ||
| 105 | struct mic_device_page { | ||
| 106 | struct mic_bootparam bootparam; | ||
| 107 | struct mic_device_desc desc[0]; | ||
| 108 | }; | ||
| 109 | /** | ||
| 110 | * struct mic_vqconfig: This is how we expect the device configuration field | ||
| 111 | * for a virtqueue to be laid out in config space. | ||
| 112 | * | ||
| 113 | * @address: Guest/MIC physical address of the virtio ring | ||
| 114 | * (avail and desc rings) | ||
| 115 | * @used_address: Guest/MIC physical address of the used ring | ||
| 116 | * @num: The number of entries in the virtio_ring | ||
| 117 | */ | ||
| 118 | struct mic_vqconfig { | ||
| 119 | __u64 address; | ||
| 120 | __u64 used_address; | ||
| 121 | __u16 num; | ||
| 122 | } __aligned(8); | ||
| 123 | |||
| 124 | /* | ||
| 125 | * The alignment to use between consumer and producer parts of vring. | ||
| 126 | * This is pagesize for historical reasons. | ||
| 127 | */ | ||
| 128 | #define MIC_VIRTIO_RING_ALIGN 4096 | ||
| 129 | |||
| 130 | #define MIC_MAX_VRINGS 4 | ||
| 131 | #define MIC_VRING_ENTRIES 128 | ||
| 132 | |||
| 133 | /* | ||
| 134 | * Max vring entries (power of 2) to ensure desc and avail rings | ||
| 135 | * fit in a single page | ||
| 136 | */ | ||
| 137 | #define MIC_MAX_VRING_ENTRIES 128 | ||
| 138 | |||
| 139 | /** | ||
| 140 | * Max size of the desc block in bytes: includes: | ||
| 141 | * - struct mic_device_desc | ||
| 142 | * - struct mic_vqconfig (num_vq of these) | ||
| 143 | * - host and guest features | ||
| 144 | * - virtio device config space | ||
| 145 | */ | ||
| 146 | #define MIC_MAX_DESC_BLK_SIZE 256 | ||
| 147 | |||
| 148 | /** | ||
| 149 | * struct _mic_vring_info - Host vring info exposed to userspace backend | ||
| 150 | * for the avail index and magic for the card. | ||
| 151 | * | ||
| 152 | * @avail_idx: host avail idx | ||
| 153 | * @magic: A magic debug cookie. | ||
| 154 | */ | ||
| 155 | struct _mic_vring_info { | ||
| 156 | __u16 avail_idx; | ||
| 157 | int magic; | ||
| 158 | }; | ||
| 159 | |||
| 160 | /** | ||
| 161 | * struct mic_vring - Vring information. | ||
| 162 | * | ||
| 163 | * @vr: The virtio ring. | ||
| 164 | * @info: Host vring information exposed to the userspace backend for the | ||
| 165 | * avail index and magic for the card. | ||
| 166 | * @va: The va for the buffer allocated for vr and info. | ||
| 167 | * @len: The length of the buffer required for allocating vr and info. | ||
| 168 | */ | ||
| 169 | struct mic_vring { | ||
| 170 | struct vring vr; | ||
| 171 | struct _mic_vring_info *info; | ||
| 172 | void *va; | ||
| 173 | int len; | ||
| 174 | }; | ||
| 175 | |||
| 176 | #define mic_aligned_desc_size(d) ALIGN(mic_desc_size(d), 8) | ||
| 177 | |||
| 178 | #ifndef INTEL_MIC_CARD | ||
| 179 | static inline unsigned mic_desc_size(const struct mic_device_desc *desc) | ||
| 180 | { | ||
| 181 | return mic_aligned_size(*desc) | ||
| 182 | + desc->num_vq * mic_aligned_size(struct mic_vqconfig) | ||
| 183 | + desc->feature_len * 2 | ||
| 184 | + desc->config_len; | ||
| 185 | } | ||
| 186 | |||
| 187 | static inline struct mic_vqconfig * | ||
| 188 | mic_vq_config(const struct mic_device_desc *desc) | ||
| 189 | { | ||
| 190 | return (struct mic_vqconfig *)(desc + 1); | ||
| 191 | } | ||
| 192 | |||
| 193 | static inline __u8 *mic_vq_features(const struct mic_device_desc *desc) | ||
| 194 | { | ||
| 195 | return (__u8 *)(mic_vq_config(desc) + desc->num_vq); | ||
| 196 | } | ||
| 197 | |||
| 198 | static inline __u8 *mic_vq_configspace(const struct mic_device_desc *desc) | ||
| 199 | { | ||
| 200 | return mic_vq_features(desc) + desc->feature_len * 2; | ||
| 201 | } | ||
| 202 | static inline unsigned mic_total_desc_size(struct mic_device_desc *desc) | ||
| 203 | { | ||
| 204 | return mic_aligned_desc_size(desc) + | ||
| 205 | mic_aligned_size(struct mic_device_ctrl); | ||
| 206 | } | ||
| 207 | #endif | ||
| 208 | |||
| 209 | /* Device page size */ | ||
| 210 | #define MIC_DP_SIZE 4096 | ||
| 211 | |||
| 212 | #define MIC_MAGIC 0xc0ffee00 | ||
| 213 | |||
| 214 | /** | ||
| 215 | * enum mic_states - MIC states. | ||
| 216 | */ | ||
| 217 | enum mic_states { | ||
| 218 | MIC_OFFLINE = 0, | ||
| 219 | MIC_ONLINE, | ||
| 220 | MIC_SHUTTING_DOWN, | ||
| 221 | MIC_RESET_FAILED, | ||
| 222 | MIC_SUSPENDING, | ||
| 223 | MIC_SUSPENDED, | ||
| 224 | MIC_LAST | ||
| 225 | }; | ||
| 226 | |||
| 227 | /** | ||
| 228 | * enum mic_status - MIC status reported by card after | ||
| 229 | * a host or card initiated shutdown or a card crash. | ||
| 230 | */ | ||
| 231 | enum mic_status { | ||
| 232 | MIC_NOP = 0, | ||
| 233 | MIC_CRASHED, | ||
| 234 | MIC_HALTED, | ||
| 235 | MIC_POWER_OFF, | ||
| 236 | MIC_RESTART, | ||
| 237 | MIC_STATUS_LAST | ||
| 238 | }; | ||
| 239 | |||
| 240 | #endif | ||
diff --git a/include/uapi/linux/mic_ioctl.h b/include/uapi/linux/mic_ioctl.h new file mode 100644 index 000000000000..7fabba5059cf --- /dev/null +++ b/include/uapi/linux/mic_ioctl.h | |||
| @@ -0,0 +1,76 @@ | |||
| 1 | /* | ||
| 2 | * Intel MIC Platform Software Stack (MPSS) | ||
| 3 | * | ||
| 4 | * Copyright(c) 2013 Intel Corporation. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License, version 2, as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * This program is distributed in the hope that it will be useful, but | ||
| 11 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 13 | * General Public License for more details. | ||
| 14 | * | ||
| 15 | * The full GNU General Public License is included in this distribution in | ||
| 16 | * the file called "COPYING". | ||
| 17 | * | ||
| 18 | * Intel MIC Host driver. | ||
| 19 | * | ||
| 20 | */ | ||
| 21 | #ifndef _MIC_IOCTL_H_ | ||
| 22 | #define _MIC_IOCTL_H_ | ||
| 23 | |||
| 24 | #include <linux/types.h> | ||
| 25 | |||
| 26 | /* | ||
| 27 | * mic_copy - MIC virtio descriptor copy. | ||
| 28 | * | ||
| 29 | * @iov: An array of IOVEC structures containing user space buffers. | ||
| 30 | * @iovcnt: Number of IOVEC structures in iov. | ||
| 31 | * @vr_idx: The vring index. | ||
| 32 | * @update_used: A non zero value results in used index being updated. | ||
| 33 | * @out_len: The aggregate of the total length written to or read from | ||
| 34 | * the virtio device. | ||
| 35 | */ | ||
| 36 | struct mic_copy_desc { | ||
| 37 | #ifdef __KERNEL__ | ||
| 38 | struct iovec __user *iov; | ||
| 39 | #else | ||
| 40 | struct iovec *iov; | ||
| 41 | #endif | ||
| 42 | int iovcnt; | ||
| 43 | __u8 vr_idx; | ||
| 44 | __u8 update_used; | ||
| 45 | __u32 out_len; | ||
| 46 | }; | ||
| 47 | |||
| 48 | /* | ||
| 49 | * Add a new virtio device | ||
| 50 | * The (struct mic_device_desc *) pointer points to a device page entry | ||
| 51 | * for the virtio device consisting of: | ||
| 52 | * - struct mic_device_desc | ||
| 53 | * - struct mic_vqconfig (num_vq of these) | ||
| 54 | * - host and guest features | ||
| 55 | * - virtio device config space | ||
| 56 | * The total size referenced by the pointer should equal the size returned | ||
| 57 | * by desc_size() in mic_common.h | ||
| 58 | */ | ||
| 59 | #define MIC_VIRTIO_ADD_DEVICE _IOWR('s', 1, struct mic_device_desc *) | ||
| 60 | |||
| 61 | /* | ||
| 62 | * Copy the number of entries in the iovec and update the used index | ||
| 63 | * if requested by the user. | ||
| 64 | */ | ||
| 65 | #define MIC_VIRTIO_COPY_DESC _IOWR('s', 2, struct mic_copy_desc *) | ||
| 66 | |||
| 67 | /* | ||
| 68 | * Notify virtio device of a config change | ||
| 69 | * The (__u8 *) pointer points to config space values for the device | ||
| 70 | * as they should be written into the device page. The total size | ||
| 71 | * referenced by the pointer should equal the config_len field of struct | ||
| 72 | * mic_device_desc. | ||
| 73 | */ | ||
| 74 | #define MIC_VIRTIO_CONFIG_CHANGE _IOWR('s', 5, __u8 *) | ||
| 75 | |||
| 76 | #endif | ||
