Pull staging driver updates from Greg KH: "Here is the big staging driver pull request for 4.5-rc1. Lots of cleanups and fixes here, not as many as some releases, but 800+ isn't that bad. Full details in the shortlog. All of these have been in linux-next for a while" * tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (843 commits) Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC." staging: gdm724x: constify tty_port_operations structs staging: gdm72xx: add userspace data struct staging: gdm72xx: Replace timeval with ktime_t iio: adc: ina2xx: Fix incorrect report of data endianness to userspace. iio: light: us5182d: Refactor read_raw function iio: light: us5182d: Add interrupt support and events iio: light: us5182d: Fix enable status inconcistency iio: Make IIO value formating function globally available. staging: emxx_udc: use list_first_entry_or_null() staging/emxx_udc: fix 64-bit warnings STAGING: COMEDI: Using kernel types in plx9080.h STAGING: COMEDI: Added spaces around binary operators in plx9080.h STAGING: COMEDI: Fixed format of comments in plx9080.h staging: comedi: comedilib.h: Coding style warning fix for block comments staging: comedi: s526: add macros for counter control reg values staging: comedi: s526: replace counter mode bitfield struct staging: comedi: check for more errors for zero-length write staging: comedi: simplify returned errors for comedi_write() staging: comedi: return error on "write" if no command set up ...
Showing the changes to include/uapi (1 of 504 files). Show all
Unified · Split
| @@ -127,35 +127,33 @@ · 126 unmodified lines | ||
| 127 | 127 | #define HFI1_CMD_TID_UPDATE 4 /* update expected TID entries */ |
| 128 | 128 | #define HFI1_CMD_TID_FREE 5 /* free expected TID entries */ |
| 129 | 129 | #define HFI1_CMD_CREDIT_UPD 6 /* force an update of PIO credit */ |
| 130 | −#define HFI1_CMD_SDMA_STATUS_UPD 7 /* force update of SDMA status ring */ | |
| 130 | +#define HFI1_CMD_SDMA_STATUS_UPD 7 /* force update of SDMA status ring */ | |
| 131 | 131 | |
| 132 | 132 | #define HFI1_CMD_RECV_CTRL 8 /* control receipt of packets */ |
| 133 | 133 | #define HFI1_CMD_POLL_TYPE 9 /* set the kind of polling we want */ |
| 134 | 134 | #define HFI1_CMD_ACK_EVENT 10 /* ack & clear user status bits */ |
| 135 | −#define HFI1_CMD_SET_PKEY 11 /* set context's pkey */ | |
| 136 | −#define HFI1_CMD_CTXT_RESET 12 /* reset context's HW send context */ | |
| 135 | +#define HFI1_CMD_SET_PKEY 11 /* set context's pkey */ | |
| 136 | +#define HFI1_CMD_CTXT_RESET 12 /* reset context's HW send context */ | |
| 137 | 137 | /* separate EPROM commands from normal PSM commands */ |
| 138 | 138 | #define HFI1_CMD_EP_INFO 64 /* read EPROM device ID */ |
| 139 | 139 | #define HFI1_CMD_EP_ERASE_CHIP 65 /* erase whole EPROM */ |
| 140 | −#define HFI1_CMD_EP_ERASE_P0 66 /* erase EPROM partition 0 */ | |
| 141 | −#define HFI1_CMD_EP_ERASE_P1 67 /* erase EPROM partition 1 */ | |
| 142 | −#define HFI1_CMD_EP_READ_P0 68 /* read EPROM partition 0 */ | |
| 143 | −#define HFI1_CMD_EP_READ_P1 69 /* read EPROM partition 1 */ | |
| 144 | −#define HFI1_CMD_EP_WRITE_P0 70 /* write EPROM partition 0 */ | |
| 145 | −#define HFI1_CMD_EP_WRITE_P1 71 /* write EPROM partition 1 */ | |
| 146 | − | |
| 147 | −#define _HFI1_EVENT_FROZEN_BIT 0 | |
| 148 | −#define _HFI1_EVENT_LINKDOWN_BIT 1 | |
| 149 | −#define _HFI1_EVENT_LID_CHANGE_BIT 2 | |
| 150 | −#define _HFI1_EVENT_LMC_CHANGE_BIT 3 | |
| 151 | −#define _HFI1_EVENT_SL2VL_CHANGE_BIT 4 | |
| 140 | +/* range 66-74 no longer used */ | |
| 141 | +#define HFI1_CMD_EP_ERASE_RANGE 75 /* erase EPROM range */ | |
| 142 | +#define HFI1_CMD_EP_READ_RANGE 76 /* read EPROM range */ | |
| 143 | +#define HFI1_CMD_EP_WRITE_RANGE 77 /* write EPROM range */ | |
| 144 | + | |
| 145 | +#define _HFI1_EVENT_FROZEN_BIT 0 | |
| 146 | +#define _HFI1_EVENT_LINKDOWN_BIT 1 | |
| 147 | +#define _HFI1_EVENT_LID_CHANGE_BIT 2 | |
| 148 | +#define _HFI1_EVENT_LMC_CHANGE_BIT 3 | |
| 149 | +#define _HFI1_EVENT_SL2VL_CHANGE_BIT 4 | |
| 152 | 150 | #define _HFI1_MAX_EVENT_BIT _HFI1_EVENT_SL2VL_CHANGE_BIT |
| 153 | 151 | |
| 154 | −#define HFI1_EVENT_FROZEN (1UL << _HFI1_EVENT_FROZEN_BIT) | |
| 155 | −#define HFI1_EVENT_LINKDOWN_BIT (1UL << _HFI1_EVENT_LINKDOWN_BIT) | |
| 156 | −#define HFI1_EVENT_LID_CHANGE_BIT (1UL << _HFI1_EVENT_LID_CHANGE_BIT) | |
| 157 | −#define HFI1_EVENT_LMC_CHANGE_BIT (1UL << _HFI1_EVENT_LMC_CHANGE_BIT) | |
| 158 | −#define HFI1_EVENT_SL2VL_CHANGE_BIT (1UL << _HFI1_EVENT_SL2VL_CHANGE_BIT) | |
| 152 | +#define HFI1_EVENT_FROZEN (1UL << _HFI1_EVENT_FROZEN_BIT) | |
| 153 | +#define HFI1_EVENT_LINKDOWN (1UL << _HFI1_EVENT_LINKDOWN_BIT) | |
| 154 | +#define HFI1_EVENT_LID_CHANGE (1UL << _HFI1_EVENT_LID_CHANGE_BIT) | |
| 155 | +#define HFI1_EVENT_LMC_CHANGE (1UL << _HFI1_EVENT_LMC_CHANGE_BIT) | |
| 156 | +#define HFI1_EVENT_SL2VL_CHANGE (1UL << _HFI1_EVENT_SL2VL_CHANGE_BIT) | |
| 159 | 157 | |
| 160 | 158 | /* |
| 161 | 159 | * These are the status bits readable (in ASCII form, 64bit value) |