aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Romer <benjamin.romer@unisys.com>2014-07-31 12:00:50 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-01 17:38:44 -0400
commitb3c55b13a1e458878e813c4fe2cccfa97c75f884 (patch)
tree9afe081bfacb7678eb91dbe86a2f6bb62869c8d4
parentb06bdf7d5bd4f817b481674d69a63174279e6662 (diff)
staging: unisys: remove U32 type
This patch switches all use of the U32 typedef to use the kernel's u32 type instead. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--drivers/staging/unisys/channels/channel.c8
-rw-r--r--drivers/staging/unisys/channels/chanstub.c4
-rw-r--r--drivers/staging/unisys/channels/chanstub.h4
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/channel.h52
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/controlframework.h2
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h158
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/diagchannel.h20
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/iochannel.h58
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/vbuschannel.h12
-rw-r--r--drivers/staging/unisys/common-spar/include/vmcallinterface.h6
-rw-r--r--drivers/staging/unisys/include/commontypes.h7
-rw-r--r--drivers/staging/unisys/include/uisqueue.h52
-rw-r--r--drivers/staging/unisys/include/uisutils.h48
-rw-r--r--drivers/staging/unisys/uislib/uislib.c56
-rw-r--r--drivers/staging/unisys/uislib/uisutils.c4
-rw-r--r--drivers/staging/unisys/virthba/virthba.c6
-rw-r--r--drivers/staging/unisys/virtpci/virtpci.h4
-rw-r--r--drivers/staging/unisys/visorchannel/visorchannel.h10
-rw-r--r--drivers/staging/unisys/visorchannel/visorchannel_funcs.c30
-rw-r--r--drivers/staging/unisys/visorchipset/parser.c6
-rw-r--r--drivers/staging/unisys/visorchipset/parser.h4
-rw-r--r--drivers/staging/unisys/visorchipset/visorchipset.h50
-rw-r--r--drivers/staging/unisys/visorchipset/visorchipset_main.c30
23 files changed, 315 insertions, 316 deletions
diff --git a/drivers/staging/unisys/channels/channel.c b/drivers/staging/unisys/channels/channel.c
index 7223a14082ba..b9bf8e81677c 100644
--- a/drivers/staging/unisys/channels/channel.c
+++ b/drivers/staging/unisys/channels/channel.c
@@ -44,7 +44,7 @@
44 * 1 if the insertion succeeds, 0 if the queue was full. 44 * 1 if the insertion succeeds, 0 if the queue was full.
45 */ 45 */
46unsigned char 46unsigned char
47visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, U32 Queue, void *pSignal) 47visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, u32 Queue, void *pSignal)
48{ 48{
49 void __iomem *psignal; 49 void __iomem *psignal;
50 unsigned int head, tail, nof; 50 unsigned int head, tail, nof;
@@ -102,7 +102,7 @@ EXPORT_SYMBOL_GPL(visor_signal_insert);
102 * 1 if the removal succeeds, 0 if the queue was empty. 102 * 1 if the removal succeeds, 0 if the queue was empty.
103 */ 103 */
104unsigned char 104unsigned char
105visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, U32 Queue, void *pSignal) 105visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, u32 Queue, void *pSignal)
106{ 106{
107 void __iomem *psource; 107 void __iomem *psource;
108 unsigned int head, tail; 108 unsigned int head, tail;
@@ -157,7 +157,7 @@ EXPORT_SYMBOL_GPL(visor_signal_remove);
157 * # of signals copied. 157 * # of signals copied.
158 */ 158 */
159unsigned int 159unsigned int
160SignalRemoveAll(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal) 160SignalRemoveAll(pCHANNEL_HEADER pChannel, u32 Queue, void *pSignal)
161{ 161{
162 void *psource; 162 void *psource;
163 unsigned int head, tail, signalCount = 0; 163 unsigned int head, tail, signalCount = 0;
@@ -208,7 +208,7 @@ SignalRemoveAll(pCHANNEL_HEADER pChannel, U32 Queue, void *pSignal)
208 * 1 if the signal queue is empty, 0 otherwise. 208 * 1 if the signal queue is empty, 0 otherwise.
209 */ 209 */
210unsigned char 210unsigned char
211visor_signalqueue_empty(CHANNEL_HEADER __iomem *pChannel, U32 Queue) 211visor_signalqueue_empty(CHANNEL_HEADER __iomem *pChannel, u32 Queue)
212{ 212{
213 SIGNAL_QUEUE_HEADER __iomem *pqhdr = 213 SIGNAL_QUEUE_HEADER __iomem *pqhdr =
214 (SIGNAL_QUEUE_HEADER __iomem *) ((char __iomem *) pChannel + 214 (SIGNAL_QUEUE_HEADER __iomem *) ((char __iomem *) pChannel +
diff --git a/drivers/staging/unisys/channels/chanstub.c b/drivers/staging/unisys/channels/chanstub.c
index 1e7d6a78602d..7f36d9adac55 100644
--- a/drivers/staging/unisys/channels/chanstub.c
+++ b/drivers/staging/unisys/channels/chanstub.c
@@ -42,7 +42,7 @@ channel_mod_exit(void)
42} 42}
43 43
44unsigned char 44unsigned char
45SignalInsert_withLock(CHANNEL_HEADER __iomem *pChannel, U32 Queue, 45SignalInsert_withLock(CHANNEL_HEADER __iomem *pChannel, u32 Queue,
46 void *pSignal, spinlock_t *lock) 46 void *pSignal, spinlock_t *lock)
47{ 47{
48 unsigned char result; 48 unsigned char result;
@@ -54,7 +54,7 @@ SignalInsert_withLock(CHANNEL_HEADER __iomem *pChannel, U32 Queue,
54} 54}
55 55
56unsigned char 56unsigned char
57SignalRemove_withLock(CHANNEL_HEADER __iomem *pChannel, U32 Queue, 57SignalRemove_withLock(CHANNEL_HEADER __iomem *pChannel, u32 Queue,
58 void *pSignal, spinlock_t *lock) 58 void *pSignal, spinlock_t *lock)
59{ 59{
60 unsigned char result; 60 unsigned char result;
diff --git a/drivers/staging/unisys/channels/chanstub.h b/drivers/staging/unisys/channels/chanstub.h
index bdee5d529f6b..d08e2c69d2ad 100644
--- a/drivers/staging/unisys/channels/chanstub.h
+++ b/drivers/staging/unisys/channels/chanstub.h
@@ -15,9 +15,9 @@
15 15
16#ifndef __CHANSTUB_H__ 16#ifndef __CHANSTUB_H__
17#define __CHANSTUB_H__ 17#define __CHANSTUB_H__
18unsigned char SignalInsert_withLock(CHANNEL_HEADER __iomem *pChannel, U32 Queue, 18unsigned char SignalInsert_withLock(CHANNEL_HEADER __iomem *pChannel, u32 Queue,
19 void *pSignal, spinlock_t *lock); 19 void *pSignal, spinlock_t *lock);
20unsigned char SignalRemove_withLock(CHANNEL_HEADER __iomem *pChannel, U32 Queue, 20unsigned char SignalRemove_withLock(CHANNEL_HEADER __iomem *pChannel, u32 Queue,
21 void *pSignal, spinlock_t *lock); 21 void *pSignal, spinlock_t *lock);
22 22
23#endif 23#endif
diff --git a/drivers/staging/unisys/common-spar/include/channels/channel.h b/drivers/staging/unisys/common-spar/include/channels/channel.h
index 8f3aec9b61a8..f18da904b708 100644
--- a/drivers/staging/unisys/common-spar/include/channels/channel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/channel.h
@@ -71,7 +71,7 @@ typedef enum {
71 * access channel anytime */ 71 * access channel anytime */
72} CHANNEL_CLIENTSTATE; 72} CHANNEL_CLIENTSTATE;
73static inline const u8 * 73static inline const u8 *
74ULTRA_CHANNELCLI_STRING(U32 v) 74ULTRA_CHANNELCLI_STRING(u32 v)
75{ 75{
76 switch (v) { 76 switch (v) {
77 case CHANNELCLI_DETACHED: 77 case CHANNELCLI_DETACHED:
@@ -210,33 +210,33 @@ ULTRA_CHANNELCLI_STRING(U32 v)
210/* Common Channel Header */ 210/* Common Channel Header */
211typedef struct _CHANNEL_HEADER { 211typedef struct _CHANNEL_HEADER {
212 U64 Signature; /* Signature */ 212 U64 Signature; /* Signature */
213 U32 LegacyState; /* DEPRECATED - being replaced by */ 213 u32 LegacyState; /* DEPRECATED - being replaced by */
214 /* / SrvState, CliStateBoot, and CliStateOS below */ 214 /* / SrvState, CliStateBoot, and CliStateOS below */
215 U32 HeaderSize; /* sizeof(CHANNEL_HEADER) */ 215 u32 HeaderSize; /* sizeof(CHANNEL_HEADER) */
216 U64 Size; /* Total size of this channel in bytes */ 216 U64 Size; /* Total size of this channel in bytes */
217 U64 Features; /* Flags to modify behavior */ 217 U64 Features; /* Flags to modify behavior */
218 uuid_le Type; /* Channel type: data, bus, control, etc. */ 218 uuid_le Type; /* Channel type: data, bus, control, etc. */
219 U64 PartitionHandle; /* ID of guest partition */ 219 U64 PartitionHandle; /* ID of guest partition */
220 U64 Handle; /* Device number of this channel in client */ 220 U64 Handle; /* Device number of this channel in client */
221 U64 oChannelSpace; /* Offset in bytes to channel specific area */ 221 U64 oChannelSpace; /* Offset in bytes to channel specific area */
222 U32 VersionId; /* CHANNEL_HEADER Version ID */ 222 u32 VersionId; /* CHANNEL_HEADER Version ID */
223 U32 PartitionIndex; /* Index of guest partition */ 223 u32 PartitionIndex; /* Index of guest partition */
224 uuid_le ZoneGuid; /* Guid of Channel's zone */ 224 uuid_le ZoneGuid; /* Guid of Channel's zone */
225 U32 oClientString; /* offset from channel header to 225 u32 oClientString; /* offset from channel header to
226 * nul-terminated ClientString (0 if 226 * nul-terminated ClientString (0 if
227 * ClientString not present) */ 227 * ClientString not present) */
228 U32 CliStateBoot; /* CHANNEL_CLIENTSTATE of pre-boot 228 u32 CliStateBoot; /* CHANNEL_CLIENTSTATE of pre-boot
229 * EFI client of this channel */ 229 * EFI client of this channel */
230 U32 CmdStateCli; /* CHANNEL_COMMANDSTATE (overloaded in 230 u32 CmdStateCli; /* CHANNEL_COMMANDSTATE (overloaded in
231 * Windows drivers, see ServerStateUp, 231 * Windows drivers, see ServerStateUp,
232 * ServerStateDown, etc) */ 232 * ServerStateDown, etc) */
233 U32 CliStateOS; /* CHANNEL_CLIENTSTATE of Guest OS 233 u32 CliStateOS; /* CHANNEL_CLIENTSTATE of Guest OS
234 * client of this channel */ 234 * client of this channel */
235 U32 ChannelCharacteristics; /* CHANNEL_CHARACTERISTIC_<xxx> */ 235 u32 ChannelCharacteristics; /* CHANNEL_CHARACTERISTIC_<xxx> */
236 U32 CmdStateSrv; /* CHANNEL_COMMANDSTATE (overloaded in 236 u32 CmdStateSrv; /* CHANNEL_COMMANDSTATE (overloaded in
237 * Windows drivers, see ServerStateUp, 237 * Windows drivers, see ServerStateUp,
238 * ServerStateDown, etc) */ 238 * ServerStateDown, etc) */
239 U32 SrvState; /* CHANNEL_SERVERSTATE */ 239 u32 SrvState; /* CHANNEL_SERVERSTATE */
240 u8 CliErrorBoot; /* bits to indicate err states for 240 u8 CliErrorBoot; /* bits to indicate err states for
241 * boot clients, so err messages can 241 * boot clients, so err messages can
242 * be throttled */ 242 * be throttled */
@@ -253,25 +253,25 @@ typedef struct _CHANNEL_HEADER {
253/* Subheader for the Signal Type variation of the Common Channel */ 253/* Subheader for the Signal Type variation of the Common Channel */
254typedef struct _SIGNAL_QUEUE_HEADER { 254typedef struct _SIGNAL_QUEUE_HEADER {
255 /* 1st cache line */ 255 /* 1st cache line */
256 U32 VersionId; /* SIGNAL_QUEUE_HEADER Version ID */ 256 u32 VersionId; /* SIGNAL_QUEUE_HEADER Version ID */
257 U32 Type; /* Queue type: storage, network */ 257 u32 Type; /* Queue type: storage, network */
258 U64 Size; /* Total size of this queue in bytes */ 258 U64 Size; /* Total size of this queue in bytes */
259 U64 oSignalBase; /* Offset to signal queue area */ 259 U64 oSignalBase; /* Offset to signal queue area */
260 U64 FeatureFlags; /* Flags to modify behavior */ 260 U64 FeatureFlags; /* Flags to modify behavior */
261 U64 NumSignalsSent; /* Total # of signals placed in this queue */ 261 U64 NumSignalsSent; /* Total # of signals placed in this queue */
262 U64 NumOverflows; /* Total # of inserts failed due to 262 U64 NumOverflows; /* Total # of inserts failed due to
263 * full queue */ 263 * full queue */
264 U32 SignalSize; /* Total size of a signal for this queue */ 264 u32 SignalSize; /* Total size of a signal for this queue */
265 U32 MaxSignalSlots; /* Max # of slots in queue, 1 slot is 265 u32 MaxSignalSlots; /* Max # of slots in queue, 1 slot is
266 * always empty */ 266 * always empty */
267 U32 MaxSignals; /* Max # of signals in queue 267 u32 MaxSignals; /* Max # of signals in queue
268 * (MaxSignalSlots-1) */ 268 * (MaxSignalSlots-1) */
269 U32 Head; /* Queue head signal # */ 269 u32 Head; /* Queue head signal # */
270 /* 2nd cache line */ 270 /* 2nd cache line */
271 U64 NumSignalsReceived; /* Total # of signals removed from this queue */ 271 U64 NumSignalsReceived; /* Total # of signals removed from this queue */
272 U32 Tail; /* Queue tail signal # (on separate 272 u32 Tail; /* Queue tail signal # (on separate
273 * cache line) */ 273 * cache line) */
274 U32 Reserved1; /* Reserved field */ 274 u32 Reserved1; /* Reserved field */
275 U64 Reserved2; /* Resrved field */ 275 U64 Reserved2; /* Resrved field */
276 U64 ClientQueue; 276 U64 ClientQueue;
277 U64 NumInterruptsReceived; /* Total # of Interrupts received. This 277 U64 NumInterruptsReceived; /* Total # of Interrupts received. This
@@ -280,7 +280,7 @@ typedef struct _SIGNAL_QUEUE_HEADER {
280 U64 NumEmptyCnt; /* Number of times that visor_signal_remove 280 U64 NumEmptyCnt; /* Number of times that visor_signal_remove
281 * is called and returned Empty 281 * is called and returned Empty
282 * Status. */ 282 * Status. */
283 U32 ErrorFlags; /* Error bits set during SignalReinit 283 u32 ErrorFlags; /* Error bits set during SignalReinit
284 * to denote trouble with client's 284 * to denote trouble with client's
285 * fields */ 285 * fields */
286 u8 Filler[12]; /* Pad out to 64 byte cacheline */ 286 u8 Filler[12]; /* Pad out to 64 byte cacheline */
@@ -312,7 +312,7 @@ ULTRA_check_channel_client(void __iomem *pChannel,
312 uuid_le expectedTypeGuid, 312 uuid_le expectedTypeGuid,
313 char *channelName, 313 char *channelName,
314 U64 expectedMinBytes, 314 U64 expectedMinBytes,
315 U32 expectedVersionId, 315 u32 expectedVersionId,
316 U64 expectedSignature, 316 U64 expectedSignature,
317 char *fileName, int lineNumber, void *logCtx) 317 char *fileName, int lineNumber, void *logCtx)
318{ 318{
@@ -588,7 +588,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId,
588* full. 588* full.
589*/ 589*/
590 590
591unsigned char visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, U32 Queue, 591unsigned char visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, u32 Queue,
592 void *pSignal); 592 void *pSignal);
593 593
594/* 594/*
@@ -610,7 +610,7 @@ unsigned char visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, U32 Queue,
610* empty. 610* empty.
611*/ 611*/
612 612
613unsigned char visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, U32 Queue, 613unsigned char visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, u32 Queue,
614 void *pSignal); 614 void *pSignal);
615 615
616/* 616/*
@@ -632,7 +632,7 @@ unsigned char visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, U32 Queue,
632* Return value: 632* Return value:
633* # of signals copied. 633* # of signals copied.
634*/ 634*/
635unsigned int SignalRemoveAll(pCHANNEL_HEADER pChannel, U32 Queue, 635unsigned int SignalRemoveAll(pCHANNEL_HEADER pChannel, u32 Queue,
636 void *pSignal); 636 void *pSignal);
637 637
638/* 638/*
@@ -647,6 +647,6 @@ unsigned int SignalRemoveAll(pCHANNEL_HEADER pChannel, U32 Queue,
647* 1 if the signal queue is empty, 0 otherwise. 647* 1 if the signal queue is empty, 0 otherwise.
648*/ 648*/
649unsigned char visor_signalqueue_empty(CHANNEL_HEADER __iomem *pChannel, 649unsigned char visor_signalqueue_empty(CHANNEL_HEADER __iomem *pChannel,
650 U32 Queue); 650 u32 Queue);
651 651
652#endif 652#endif
diff --git a/drivers/staging/unisys/common-spar/include/channels/controlframework.h b/drivers/staging/unisys/common-spar/include/channels/controlframework.h
index 4e361b20ed89..a6c1ac2b40aa 100644
--- a/drivers/staging/unisys/common-spar/include/channels/controlframework.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlframework.h
@@ -70,7 +70,7 @@ typedef union {
70 * increment thereafter */ 70 * increment thereafter */
71 u8 Minor; 71 u8 Minor;
72 u16 Maintenance; 72 u16 Maintenance;
73 U32 Revision; /* Subversion revision */ 73 u32 Revision; /* Subversion revision */
74 } Part; 74 } Part;
75} ULTRA_COMPONENT_VERSION; 75} ULTRA_COMPONENT_VERSION;
76 76
diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
index 051ef358e1c8..ba2edd05c861 100644
--- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
@@ -137,7 +137,7 @@ struct InterruptInfo {
137 /**< specifies interrupt vector. It, interrupt pin, and shared are 137 /**< specifies interrupt vector. It, interrupt pin, and shared are
138 * used to connect to the corresponding interrupt. Used by 138 * used to connect to the corresponding interrupt. Used by
139 * IOPart-GP only. */ 139 * IOPart-GP only. */
140 U32 recvInterruptVector; 140 u32 recvInterruptVector;
141 141
142 /**< specifies if the recvInterrupt is shared. It, interrupt pin 142 /**< specifies if the recvInterrupt is shared. It, interrupt pin
143 * and vector are used to connect to 0 = not shared; 1 = shared. 143 * and vector are used to connect to 0 = not shared; 1 = shared.
@@ -159,33 +159,33 @@ struct PciConfigHdr {
159 u16 SubSysVendor; 159 u16 SubSysVendor;
160 u16 DeviceId; 160 u16 DeviceId;
161 u16 SubSysDevice; 161 u16 SubSysDevice;
162 U32 ClassCode; 162 u32 ClassCode;
163 U32 Reserved; /* Natural alignment purposes */ 163 u32 Reserved; /* Natural alignment purposes */
164}; 164};
165 165
166struct ScsiId { 166struct ScsiId {
167 U32 Bus; 167 u32 Bus;
168 U32 Target; 168 u32 Target;
169 U32 Lun; 169 u32 Lun;
170 U32 Host; /* Command should ignore this for * 170 u32 Host; /* Command should ignore this for *
171 * DiskArrival/RemovalEvents */ 171 * DiskArrival/RemovalEvents */
172}; 172};
173 173
174struct WWID { 174struct WWID {
175 U32 wwid1; 175 u32 wwid1;
176 U32 wwid2; 176 u32 wwid2;
177}; 177};
178 178
179struct virtDiskInfo { 179struct virtDiskInfo {
180 U32 switchNo; /* defined by SWITCH_CREATE */ 180 u32 switchNo; /* defined by SWITCH_CREATE */
181 U32 externalPortNo; /* 0 for SAS RAID provided (external) 181 u32 externalPortNo; /* 0 for SAS RAID provided (external)
182 * virtual disks, 1 for virtual disk 182 * virtual disks, 1 for virtual disk
183 * images, 2 for gold disk images */ 183 * images, 2 for gold disk images */
184 u16 VirtualDiskIndex; /* Index of disk descriptor in the 184 u16 VirtualDiskIndex; /* Index of disk descriptor in the
185 * VirtualDisk segment associated with 185 * VirtualDisk segment associated with
186 * externalPortNo */ 186 * externalPortNo */
187 u16 Reserved1; 187 u16 Reserved1;
188 U32 Reserved2; 188 u32 Reserved2;
189}; 189};
190 190
191typedef enum { 191typedef enum {
@@ -237,59 +237,59 @@ typedef enum {
237 * looking at the flags.response field. 237 * looking at the flags.response field.
238 */ 238 */
239typedef struct _CONTROLVM_MESSAGE_HEADER { 239typedef struct _CONTROLVM_MESSAGE_HEADER {
240 U32 Id; /* See CONTROLVM_ID. */ 240 u32 Id; /* See CONTROLVM_ID. */
241 /* For requests, indicates the message type. */ 241 /* For requests, indicates the message type. */
242 /* For responses, indicates the type of message we are responding to. */ 242 /* For responses, indicates the type of message we are responding to. */
243 243
244 U32 MessageSize; /* Includes size of this struct + size 244 u32 MessageSize; /* Includes size of this struct + size
245 * of message */ 245 * of message */
246 U32 SegmentIndex; /* Index of segment containing Vm 246 u32 SegmentIndex; /* Index of segment containing Vm
247 * message/information */ 247 * message/information */
248 U32 CompletionStatus; /* Error status code or result of 248 u32 CompletionStatus; /* Error status code or result of
249 * message completion */ 249 * message completion */
250 struct { 250 struct {
251 U32 failed:1; /**< =1 in a response to * signify 251 u32 failed:1; /**< =1 in a response to * signify
252 * failure */ 252 * failure */
253 U32 responseExpected:1; /**< =1 in all messages that expect a 253 u32 responseExpected:1; /**< =1 in all messages that expect a
254 * response (Control ignores this 254 * response (Control ignores this
255 * bit) */ 255 * bit) */
256 U32 server:1; /**< =1 in all bus & device-related 256 u32 server:1; /**< =1 in all bus & device-related
257 * messages where the message 257 * messages where the message
258 * receiver is to act as the bus or 258 * receiver is to act as the bus or
259 * device server */ 259 * device server */
260 U32 testMessage:1; /**< =1 for testing use only 260 u32 testMessage:1; /**< =1 for testing use only
261 * (Control and Command ignore this 261 * (Control and Command ignore this
262 * bit) */ 262 * bit) */
263 U32 partialCompletion:1; /**< =1 if there are forthcoming 263 u32 partialCompletion:1; /**< =1 if there are forthcoming
264 * responses/acks associated 264 * responses/acks associated
265 * with this message */ 265 * with this message */
266 U32 preserve:1; /**< =1 this is to let us know to 266 u32 preserve:1; /**< =1 this is to let us know to
267 * preserve channel contents 267 * preserve channel contents
268 * (for running guests)*/ 268 * (for running guests)*/
269 U32 writerInDiag:1; /**< =1 the DiagWriter is active in the 269 u32 writerInDiag:1; /**< =1 the DiagWriter is active in the
270 * Diagnostic Partition*/ 270 * Diagnostic Partition*/
271 271
272 /* remaining bits in this 32-bit word are available */ 272 /* remaining bits in this 32-bit word are available */
273 } Flags; 273 } Flags;
274 U32 Reserved; /* Natural alignment */ 274 u32 Reserved; /* Natural alignment */
275 U64 MessageHandle; /* Identifies the particular message instance, 275 U64 MessageHandle; /* Identifies the particular message instance,
276 * and is used to match particular */ 276 * and is used to match particular */
277 /* request instances with the corresponding response instance. */ 277 /* request instances with the corresponding response instance. */
278 U64 PayloadVmOffset; /* Offset of payload area from start of this 278 U64 PayloadVmOffset; /* Offset of payload area from start of this
279 * instance of ControlVm segment */ 279 * instance of ControlVm segment */
280 U32 PayloadMaxBytes; /* Maximum bytes allocated in payload 280 u32 PayloadMaxBytes; /* Maximum bytes allocated in payload
281 * area of ControlVm segment */ 281 * area of ControlVm segment */
282 U32 PayloadBytes; /* Actual number of bytes of payload 282 u32 PayloadBytes; /* Actual number of bytes of payload
283 * area to copy between IO/Command; */ 283 * area to copy between IO/Command; */
284 /* if non-zero, there is a payload to copy. */ 284 /* if non-zero, there is a payload to copy. */
285} CONTROLVM_MESSAGE_HEADER; 285} CONTROLVM_MESSAGE_HEADER;
286 286
287typedef struct _CONTROLVM_PACKET_DEVICE_CREATE { 287typedef struct _CONTROLVM_PACKET_DEVICE_CREATE {
288 U32 busNo; /**< bus # (0..n-1) from the msg receiver's 288 u32 busNo; /**< bus # (0..n-1) from the msg receiver's
289 * perspective */ 289 * perspective */
290 290
291 /* Control uses header SegmentIndex field to access bus number... */ 291 /* Control uses header SegmentIndex field to access bus number... */
292 U32 devNo; /**< bus-relative (0..n-1) device number */ 292 u32 devNo; /**< bus-relative (0..n-1) device number */
293 U64 channelAddr; /**< Guest physical address of the channel, which 293 U64 channelAddr; /**< Guest physical address of the channel, which
294 * can be dereferenced by the receiver 294 * can be dereferenced by the receiver
295 * of this ControlVm command */ 295 * of this ControlVm command */
@@ -300,11 +300,11 @@ typedef struct _CONTROLVM_PACKET_DEVICE_CREATE {
300} CONTROLVM_PACKET_DEVICE_CREATE; /* for CONTROLVM_DEVICE_CREATE */ 300} CONTROLVM_PACKET_DEVICE_CREATE; /* for CONTROLVM_DEVICE_CREATE */
301 301
302typedef struct _CONTROLVM_PACKET_DEVICE_CONFIGURE { 302typedef struct _CONTROLVM_PACKET_DEVICE_CONFIGURE {
303 U32 busNo; /**< bus # (0..n-1) from the msg 303 u32 busNo; /**< bus # (0..n-1) from the msg
304 * receiver's perspective */ 304 * receiver's perspective */
305 305
306 /* Control uses header SegmentIndex field to access bus number... */ 306 /* Control uses header SegmentIndex field to access bus number... */
307 U32 devNo; /**< bus-relative (0..n-1) device number */ 307 u32 devNo; /**< bus-relative (0..n-1) device number */
308} CONTROLVM_PACKET_DEVICE_CONFIGURE; /* for CONTROLVM_DEVICE_CONFIGURE */ 308} CONTROLVM_PACKET_DEVICE_CONFIGURE; /* for CONTROLVM_DEVICE_CONFIGURE */
309 309
310typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE { 310typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE {
@@ -323,11 +323,11 @@ typedef struct _CONTROLVM_MESSAGE_PACKET {
323 323
324 /* BEGIN Request messages */ 324 /* BEGIN Request messages */
325 struct { 325 struct {
326 U32 busNo; /*< bus # (0..n-1) from the msg 326 u32 busNo; /*< bus # (0..n-1) from the msg
327 * receiver's perspective */ 327 * receiver's perspective */
328 328
329 /* Control uses header SegmentIndex field to access bus number... */ 329 /* Control uses header SegmentIndex field to access bus number... */
330 U32 deviceCount; /*< indicates the max number of 330 u32 deviceCount; /*< indicates the max number of
331 * devices on this bus */ 331 * devices on this bus */
332 U64 channelAddr; /*< Guest physical address of the 332 U64 channelAddr; /*< Guest physical address of the
333 * channel, which can be 333 * channel, which can be
@@ -339,19 +339,19 @@ typedef struct _CONTROLVM_MESSAGE_PACKET {
339 uuid_le busInstGuid; /*< instance guid for the bus */ 339 uuid_le busInstGuid; /*< instance guid for the bus */
340 } createBus; /* for CONTROLVM_BUS_CREATE */ 340 } createBus; /* for CONTROLVM_BUS_CREATE */
341 struct { 341 struct {
342 U32 busNo; /*< bus # (0..n-1) from the msg 342 u32 busNo; /*< bus # (0..n-1) from the msg
343 * receiver's perspective */ 343 * receiver's perspective */
344 344
345 /* Control uses header SegmentIndex field to access bus number... */ 345 /* Control uses header SegmentIndex field to access bus number... */
346 U32 reserved; /* Natural alignment purposes */ 346 u32 reserved; /* Natural alignment purposes */
347 } destroyBus; /* for CONTROLVM_BUS_DESTROY */ 347 } destroyBus; /* for CONTROLVM_BUS_DESTROY */
348 struct { 348 struct {
349 U32 busNo; /*< bus # (0..n-1) from the 349 u32 busNo; /*< bus # (0..n-1) from the
350 * msg receiver's 350 * msg receiver's
351 * perspective */ 351 * perspective */
352 352
353 /* Control uses header SegmentIndex field to access bus number... */ 353 /* Control uses header SegmentIndex field to access bus number... */
354 U32 reserved1; /* for alignment purposes */ 354 u32 reserved1; /* for alignment purposes */
355 U64 guestHandle; /* This is used to convert 355 U64 guestHandle; /* This is used to convert
356 * guest physical address to real 356 * guest physical address to real
357 * physical address for DMA, for ex. */ 357 * physical address for DMA, for ex. */
@@ -368,57 +368,57 @@ typedef struct _CONTROLVM_MESSAGE_PACKET {
368 /* for CONTROLVM_DEVICE_CREATE */ 368 /* for CONTROLVM_DEVICE_CREATE */
369 CONTROLVM_PACKET_DEVICE_CREATE createDevice; 369 CONTROLVM_PACKET_DEVICE_CREATE createDevice;
370 struct { 370 struct {
371 U32 busNo; /*< bus # (0..n-1) from the msg 371 u32 busNo; /*< bus # (0..n-1) from the msg
372 * receiver's perspective */ 372 * receiver's perspective */
373 373
374 /* Control uses header SegmentIndex field to access bus number... */ 374 /* Control uses header SegmentIndex field to access bus number... */
375 U32 devNo; /*< bus-relative (0..n-1) device 375 u32 devNo; /*< bus-relative (0..n-1) device
376 * number */ 376 * number */
377 } destroyDevice; /* for CONTROLVM_DEVICE_DESTROY */ 377 } destroyDevice; /* for CONTROLVM_DEVICE_DESTROY */
378 378
379 /* for CONTROLVM_DEVICE_CONFIGURE */ 379 /* for CONTROLVM_DEVICE_CONFIGURE */
380 CONTROLVM_PACKET_DEVICE_CONFIGURE configureDevice; 380 CONTROLVM_PACKET_DEVICE_CONFIGURE configureDevice;
381 struct { 381 struct {
382 U32 busNo; /*< bus # (0..n-1) from the msg 382 u32 busNo; /*< bus # (0..n-1) from the msg
383 * receiver's perspective */ 383 * receiver's perspective */
384 384
385 /* Control uses header SegmentIndex field to access bus number... */ 385 /* Control uses header SegmentIndex field to access bus number... */
386 U32 devNo; /*< bus-relative (0..n-1) device 386 u32 devNo; /*< bus-relative (0..n-1) device
387 * number */ 387 * number */
388 } reconfigureDevice; /* for CONTROLVM_DEVICE_RECONFIGURE */ 388 } reconfigureDevice; /* for CONTROLVM_DEVICE_RECONFIGURE */
389 struct { 389 struct {
390 U32 busNo; 390 u32 busNo;
391 ULTRA_SEGMENT_STATE state; 391 ULTRA_SEGMENT_STATE state;
392 u8 reserved[2]; /* Natural alignment purposes */ 392 u8 reserved[2]; /* Natural alignment purposes */
393 } busChangeState; /* for CONTROLVM_BUS_CHANGESTATE */ 393 } busChangeState; /* for CONTROLVM_BUS_CHANGESTATE */
394 struct { 394 struct {
395 U32 busNo; 395 u32 busNo;
396 U32 devNo; 396 u32 devNo;
397 ULTRA_SEGMENT_STATE state; 397 ULTRA_SEGMENT_STATE state;
398 struct { 398 struct {
399 U32 physicalDevice:1; /* =1 if message is for 399 u32 physicalDevice:1; /* =1 if message is for
400 * a physical device */ 400 * a physical device */
401 /* remaining bits in this 32-bit word are available */ 401 /* remaining bits in this 32-bit word are available */
402 } flags; 402 } flags;
403 u8 reserved[2]; /* Natural alignment purposes */ 403 u8 reserved[2]; /* Natural alignment purposes */
404 } deviceChangeState; /* for CONTROLVM_DEVICE_CHANGESTATE */ 404 } deviceChangeState; /* for CONTROLVM_DEVICE_CHANGESTATE */
405 struct { 405 struct {
406 U32 busNo; 406 u32 busNo;
407 U32 devNo; 407 u32 devNo;
408 ULTRA_SEGMENT_STATE state; 408 ULTRA_SEGMENT_STATE state;
409 u8 reserved[6]; /* Natural alignment purposes */ 409 u8 reserved[6]; /* Natural alignment purposes */
410 } deviceChangeStateEvent; /* for CONTROLVM_DEVICE_CHANGESTATE_EVENT */ 410 } deviceChangeStateEvent; /* for CONTROLVM_DEVICE_CHANGESTATE_EVENT */
411 struct { 411 struct {
412 U32 busCount; /*< indicates the max number of busses */ 412 u32 busCount; /*< indicates the max number of busses */
413 U32 switchCount; /*< indicates the max number of 413 u32 switchCount; /*< indicates the max number of
414 * switches (applicable for service 414 * switches (applicable for service
415 * partition only) */ 415 * partition only) */
416 ULTRA_CHIPSET_FEATURE features; 416 ULTRA_CHIPSET_FEATURE features;
417 U32 platformNumber; /* Platform Number */ 417 u32 platformNumber; /* Platform Number */
418 } initChipset; /* for CONTROLVM_CHIPSET_INIT */ 418 } initChipset; /* for CONTROLVM_CHIPSET_INIT */
419 struct { 419 struct {
420 U32 Options; /*< reserved */ 420 u32 Options; /*< reserved */
421 U32 Test; /*< bit 0 set to run embedded selftest */ 421 u32 Test; /*< bit 0 set to run embedded selftest */
422 } chipsetSelftest; /* for CONTROLVM_CHIPSET_SELFTEST */ 422 } chipsetSelftest; /* for CONTROLVM_CHIPSET_SELFTEST */
423 423
424 /* END Request messages */ 424 /* END Request messages */
@@ -452,8 +452,8 @@ typedef struct _CONTROLVM_MESSAGE {
452typedef struct _DEVICE_MAP { 452typedef struct _DEVICE_MAP {
453 GUEST_PHYSICAL_ADDRESS DeviceChannelAddress; 453 GUEST_PHYSICAL_ADDRESS DeviceChannelAddress;
454 U64 DeviceChannelSize; 454 U64 DeviceChannelSize;
455 U32 CA_Index; 455 u32 CA_Index;
456 U32 Reserved; /* natural alignment */ 456 u32 Reserved; /* natural alignment */
457 U64 Reserved2; /* Align structure on 32-byte boundary */ 457 U64 Reserved2; /* Align structure on 32-byte boundary */
458} DEVICE_MAP; 458} DEVICE_MAP;
459 459
@@ -463,8 +463,8 @@ typedef struct _GUEST_DEVICES {
463 DEVICE_MAP NetworkChannel; 463 DEVICE_MAP NetworkChannel;
464 DEVICE_MAP StorageChannel; 464 DEVICE_MAP StorageChannel;
465 DEVICE_MAP ConsoleChannel; 465 DEVICE_MAP ConsoleChannel;
466 U32 PartitionIndex; 466 u32 PartitionIndex;
467 U32 Pad; 467 u32 Pad;
468} GUEST_DEVICES; 468} GUEST_DEVICES;
469 469
470typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { 470typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
@@ -489,13 +489,13 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
489 * channel */ 489 * channel */
490 U64 RequestPayloadOffset; /* Offset to request payload area */ 490 U64 RequestPayloadOffset; /* Offset to request payload area */
491 U64 EventPayloadOffset; /* Offset to event payload area */ 491 U64 EventPayloadOffset; /* Offset to event payload area */
492 U32 RequestPayloadBytes; /* Bytes available in request payload 492 u32 RequestPayloadBytes; /* Bytes available in request payload
493 * area */ 493 * area */
494 U32 EventPayloadBytes; /* Bytes available in event payload area */ 494 u32 EventPayloadBytes; /* Bytes available in event payload area */
495 U32 ControlChannelBytes; 495 u32 ControlChannelBytes;
496 U32 NvramChannelBytes; /* Bytes in PartitionNvram segment */ 496 u32 NvramChannelBytes; /* Bytes in PartitionNvram segment */
497 U32 MessageBytes; /* sizeof(CONTROLVM_MESSAGE) */ 497 u32 MessageBytes; /* sizeof(CONTROLVM_MESSAGE) */
498 U32 MessageCount; /* CONTROLVM_MESSAGE_MAX */ 498 u32 MessageCount; /* CONTROLVM_MESSAGE_MAX */
499 GUEST_PHYSICAL_ADDRESS gpSmbiosTable; /* guest phys addr of SMBIOS 499 GUEST_PHYSICAL_ADDRESS gpSmbiosTable; /* guest phys addr of SMBIOS
500 * tables */ 500 * tables */
501 GUEST_PHYSICAL_ADDRESS gpPhysicalSmbiosTable; /* guest phys addr of 501 GUEST_PHYSICAL_ADDRESS gpPhysicalSmbiosTable; /* guest phys addr of
@@ -525,11 +525,11 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
525 * is running in dump mode */ 525 * is running in dump mode */
526 u16 NvramFailCount; 526 u16 NvramFailCount;
527 u16 SavedCrashMsgCount; /* = CONTROLVM_CRASHMSG_MAX */ 527 u16 SavedCrashMsgCount; /* = CONTROLVM_CRASHMSG_MAX */
528 U32 SavedCrashMsgOffset; /* Offset to request payload area needed 528 u32 SavedCrashMsgOffset; /* Offset to request payload area needed
529 * for crash dump */ 529 * for crash dump */
530 U32 InstallationError; /* Type of error encountered during 530 u32 InstallationError; /* Type of error encountered during
531 * installation */ 531 * installation */
532 U32 InstallationTextId; /* Id of string to display */ 532 u32 InstallationTextId; /* Id of string to display */
533 u16 InstallationRemainingSteps; /* Number of remaining installation 533 u16 InstallationRemainingSteps; /* Number of remaining installation
534 * steps (for progress bars) */ 534 * steps (for progress bars) */
535 u8 ToolAction; /* ULTRA_TOOL_ACTIONS Installation Action 535 u8 ToolAction; /* ULTRA_TOOL_ACTIONS Installation Action
@@ -537,7 +537,7 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
537 u8 Reserved; /* alignment */ 537 u8 Reserved; /* alignment */
538 ULTRA_EFI_SPAR_INDICATION EfiSparIndication; 538 ULTRA_EFI_SPAR_INDICATION EfiSparIndication;
539 ULTRA_EFI_SPAR_INDICATION EfiSparIndicationSupported; 539 ULTRA_EFI_SPAR_INDICATION EfiSparIndicationSupported;
540 U32 SPReserved; 540 u32 SPReserved;
541 u8 Reserved2[28]; /* Force signals to begin on 128-byte cache 541 u8 Reserved2[28]; /* Force signals to begin on 128-byte cache
542 * line */ 542 * line */
543 SIGNAL_QUEUE_HEADER RequestQueue; /* Service or guest partition 543 SIGNAL_QUEUE_HEADER RequestQueue; /* Service or guest partition
@@ -600,21 +600,21 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
600 * https://ustr-linux-1.na.uis.unisys.com/spar/index.php/ControlVm_Parameters_Area 600 * https://ustr-linux-1.na.uis.unisys.com/spar/index.php/ControlVm_Parameters_Area
601 */ 601 */
602typedef struct _ULTRA_CONTROLVM_PARAMETERS_HEADER { 602typedef struct _ULTRA_CONTROLVM_PARAMETERS_HEADER {
603 U32 TotalLength; 603 u32 TotalLength;
604 U32 HeaderLength; 604 u32 HeaderLength;
605 U32 ConnectionOffset; 605 u32 ConnectionOffset;
606 U32 ConnectionLength; 606 u32 ConnectionLength;
607 U32 InitiatorOffset; 607 u32 InitiatorOffset;
608 U32 InitiatorLength; 608 u32 InitiatorLength;
609 U32 TargetOffset; 609 u32 TargetOffset;
610 U32 TargetLength; 610 u32 TargetLength;
611 U32 ClientOffset; 611 u32 ClientOffset;
612 U32 ClientLength; 612 u32 ClientLength;
613 U32 NameOffset; 613 u32 NameOffset;
614 U32 NameLength; 614 u32 NameLength;
615 uuid_le Id; 615 uuid_le Id;
616 U32 Revision; 616 u32 Revision;
617 U32 Reserved; /* Natural alignment */ 617 u32 Reserved; /* Natural alignment */
618} ULTRA_CONTROLVM_PARAMETERS_HEADER; 618} ULTRA_CONTROLVM_PARAMETERS_HEADER;
619 619
620#endif /* __CONTROLVMCHANNEL_H__ */ 620#endif /* __CONTROLVMCHANNEL_H__ */
diff --git a/drivers/staging/unisys/common-spar/include/channels/diagchannel.h b/drivers/staging/unisys/common-spar/include/channels/diagchannel.h
index bac81cf3eee9..ccced6dd2956 100644
--- a/drivers/staging/unisys/common-spar/include/channels/diagchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/diagchannel.h
@@ -113,7 +113,7 @@ typedef struct _DIAG_EFI_TIME {
113 u8 Minute; /* 0 - 59 */ 113 u8 Minute; /* 0 - 59 */
114 u8 Second; /* 0 - 59 */ 114 u8 Second; /* 0 - 59 */
115 u8 Pad1; 115 u8 Pad1;
116 U32 Nanosecond; /* 0 - 999, 999, 999 */ 116 u32 Nanosecond; /* 0 - 999, 999, 999 */
117 S16 TimeZone; /* -1440 to 1440 or 2047 */ 117 S16 TimeZone; /* -1440 to 1440 or 2047 */
118 u8 Daylight; 118 u8 Daylight;
119 u8 Pad2; 119 u8 Pad2;
@@ -156,24 +156,24 @@ typedef enum {
156 * AdditionalInfo: Array of characters for additional event info (may be 156 * AdditionalInfo: Array of characters for additional event info (may be
157 * empty). */ 157 * empty). */
158typedef struct _DIAG_CHANNEL_EVENT { 158typedef struct _DIAG_CHANNEL_EVENT {
159 U32 EventId; 159 u32 EventId;
160 U32 Severity; 160 u32 Severity;
161 u8 ModuleName[MAX_MODULE_NAME_SIZE]; 161 u8 ModuleName[MAX_MODULE_NAME_SIZE];
162 U32 LineNumber; 162 u32 LineNumber;
163 DIAG_EFI_TIME Timestamp; /* Size = 16 bytes */ 163 DIAG_EFI_TIME Timestamp; /* Size = 16 bytes */
164 U32 PartitionNumber; /* Filled in by Diag Switch as pool blocks are 164 u32 PartitionNumber; /* Filled in by Diag Switch as pool blocks are
165 * filled */ 165 * filled */
166 u16 VirtualProcessorNumber; 166 u16 VirtualProcessorNumber;
167 u16 LogicalProcessorNumber; 167 u16 LogicalProcessorNumber;
168 u8 ComponentType; /* ULTRA_COMPONENT_TYPES */ 168 u8 ComponentType; /* ULTRA_COMPONENT_TYPES */
169 u8 Subsystem; 169 u8 Subsystem;
170 u16 Reserved0; /* pad to U64 alignment */ 170 u16 Reserved0; /* pad to U64 alignment */
171 U32 BlockNumber; /* filled in by DiagSwitch as pool blocks are 171 u32 BlockNumber; /* filled in by DiagSwitch as pool blocks are
172 * filled */ 172 * filled */
173 U32 BlockNumberHigh; 173 u32 BlockNumberHigh;
174 U32 EventNumber; /* filled in by DiagSwitch as pool blocks are 174 u32 EventNumber; /* filled in by DiagSwitch as pool blocks are
175 * filled */ 175 * filled */
176 U32 EventNumberHigh; 176 u32 EventNumberHigh;
177 177
178 /* The BlockNumber and EventNumber fields are set only by DiagSwitch 178 /* The BlockNumber and EventNumber fields are set only by DiagSwitch
179 * and referenced only by WinDiagDisplay formatting tool as 179 * and referenced only by WinDiagDisplay formatting tool as
@@ -363,7 +363,7 @@ typedef enum {
363 * particular subsystem below this level will be discarded. 363 * particular subsystem below this level will be discarded.
364 */ 364 */
365typedef struct _DIAG_CHANNEL_PROTOCOL_HEADER { 365typedef struct _DIAG_CHANNEL_PROTOCOL_HEADER {
366 volatile U32 DiagLock; 366 volatile u32 DiagLock;
367 u8 IsChannelInitialized; 367 u8 IsChannelInitialized;
368 u8 Reserved[3]; 368 u8 Reserved[3];
369 u8 SubsystemSeverityFilter[64]; 369 u8 SubsystemSeverityFilter[64];
diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
index a95add766fc3..26457c3c112f 100644
--- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
@@ -257,28 +257,28 @@ struct guest_phys_info {
257#define GPI_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(struct guest_phys_info)) 257#define GPI_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(struct guest_phys_info))
258 258
259struct uisscsi_dest { 259struct uisscsi_dest {
260 U32 channel; /* channel == bus number */ 260 u32 channel; /* channel == bus number */
261 U32 id; /* id == target number */ 261 u32 id; /* id == target number */
262 U32 lun; /* lun == logical unit number */ 262 u32 lun; /* lun == logical unit number */
263}; 263};
264 264
265struct vhba_wwnn { 265struct vhba_wwnn {
266 U32 wwnn1; 266 u32 wwnn1;
267 U32 wwnn2; 267 u32 wwnn2;
268}; 268};
269 269
270/* WARNING: Values stired in this structure must contain maximum counts (not 270/* WARNING: Values stired in this structure must contain maximum counts (not
271 * maximum values). */ 271 * maximum values). */
272struct vhba_config_max { /* 20 bytes */ 272struct vhba_config_max { /* 20 bytes */
273 U32 max_channel; /* maximum channel for devices attached to this 273 u32 max_channel; /* maximum channel for devices attached to this
274 * bus */ 274 * bus */
275 U32 max_id; /* maximum SCSI ID for devices attached to this 275 u32 max_id; /* maximum SCSI ID for devices attached to this
276 * bus */ 276 * bus */
277 U32 max_lun; /* maximum SCSI LUN for devices attached to this 277 u32 max_lun; /* maximum SCSI LUN for devices attached to this
278 * bus */ 278 * bus */
279 U32 cmd_per_lun; /* maximum number of outstanding commands per 279 u32 cmd_per_lun; /* maximum number of outstanding commands per
280 * lun that are allowed at one time */ 280 * lun that are allowed at one time */
281 U32 max_io_size; /* maximum io size for devices attached to this 281 u32 max_io_size; /* maximum io size for devices attached to this
282 * bus */ 282 * bus */
283 /* max io size is often determined by the resource of the hba. e.g */ 283 /* max io size is often determined by the resource of the hba. e.g */
284 /* max scatter gather list length * page size / sector size */ 284 /* max scatter gather list length * page size / sector size */
@@ -288,7 +288,7 @@ struct uiscmdrsp_scsi {
288 void *scsicmd; /* the handle to the cmd that was received - 288 void *scsicmd; /* the handle to the cmd that was received -
289 * send it back as is in the rsp packet. */ 289 * send it back as is in the rsp packet. */
290 u8 cmnd[MAX_CMND_SIZE]; /* the cdb for the command */ 290 u8 cmnd[MAX_CMND_SIZE]; /* the cdb for the command */
291 U32 bufflen; /* length of data to be transferred out or in */ 291 u32 bufflen; /* length of data to be transferred out or in */
292 u16 guest_phys_entries; /* Number of entries in scatter-gather (sg) 292 u16 guest_phys_entries; /* Number of entries in scatter-gather (sg)
293 * list */ 293 * list */
294 struct guest_phys_info gpi_list[MAX_PHYS_INFO]; /* physical address 294 struct guest_phys_info gpi_list[MAX_PHYS_INFO]; /* physical address
@@ -492,10 +492,10 @@ struct net_pkt_xmt {
492 u8 hrawoffv; /* 1 = hwrafoff is valid */ 492 u8 hrawoffv; /* 1 = hwrafoff is valid */
493 u8 nhrawoffv; /* 1 = nhwrafoff is valid */ 493 u8 nhrawoffv; /* 1 = nhwrafoff is valid */
494 u16 protocol; /* specifies packet protocol */ 494 u16 protocol; /* specifies packet protocol */
495 U32 csum; /* value used to set skb->csum at IOPart */ 495 u32 csum; /* value used to set skb->csum at IOPart */
496 U32 hrawoff; /* value used to set skb->h.raw at IOPart */ 496 u32 hrawoff; /* value used to set skb->h.raw at IOPart */
497 /* hrawoff points to the start of the TRANSPORT LAYER HEADER */ 497 /* hrawoff points to the start of the TRANSPORT LAYER HEADER */
498 U32 nhrawoff; /* value used to set skb->nh.raw at IOPart */ 498 u32 nhrawoff; /* value used to set skb->nh.raw at IOPart */
499 /* nhrawoff points to the start of the NETWORK LAYER HEADER */ 499 /* nhrawoff points to the start of the NETWORK LAYER HEADER */
500 } lincsum; 500 } lincsum;
501 501
@@ -508,7 +508,7 @@ struct net_pkt_xmt {
508}; 508};
509 509
510struct net_pkt_xmtdone { 510struct net_pkt_xmtdone {
511 U32 xmt_done_result; /* result of NET_XMIT */ 511 u32 xmt_done_result; /* result of NET_XMIT */
512#define XMIT_SUCCESS 0 512#define XMIT_SUCCESS 0
513#define XMIT_FAILED 1 513#define XMIT_FAILED 1
514}; 514};
@@ -538,7 +538,7 @@ struct net_pkt_rcv {
538 538
539 /* the number of receive buffers that can be chained */ 539 /* the number of receive buffers that can be chained */
540 /* is based on max mtu and size of each rcv buf */ 540 /* is based on max mtu and size of each rcv buf */
541 U32 rcv_done_len; /* length of received data */ 541 u32 rcv_done_len; /* length of received data */
542 u8 numrcvbufs; /* number of receive buffers that contain the */ 542 u8 numrcvbufs; /* number of receive buffers that contain the */
543 /* incoming data; guest end MUST chain these together. */ 543 /* incoming data; guest end MUST chain these together. */
544 void *rcvbuf[MAX_NET_RCV_CHAIN]; /* the list of receive buffers 544 void *rcvbuf[MAX_NET_RCV_CHAIN]; /* the list of receive buffers
@@ -546,7 +546,7 @@ struct net_pkt_rcv {
546 /* each entry is a receive buffer provided by NET_RCV_POST. */ 546 /* each entry is a receive buffer provided by NET_RCV_POST. */
547 /* NOTE: first rcvbuf in the chain will also be provided in net.buf. */ 547 /* NOTE: first rcvbuf in the chain will also be provided in net.buf. */
548 U64 UniqueNum; 548 U64 UniqueNum;
549 U32 RcvsDroppedDelta; 549 u32 RcvsDroppedDelta;
550}; 550};
551 551
552struct net_pkt_enbdis { 552struct net_pkt_enbdis {
@@ -618,7 +618,7 @@ struct uiscmdrsp_disknotify {
618 u8 add; /* 0-remove, 1-add */ 618 u8 add; /* 0-remove, 1-add */
619 void *vHba; /* Pointer to vhba_info for channel info to 619 void *vHba; /* Pointer to vhba_info for channel info to
620 * route msg */ 620 * route msg */
621 U32 channel, id, lun; /* SCSI Path of Disk to added or removed */ 621 u32 channel, id, lun; /* SCSI Path of Disk to added or removed */
622}; 622};
623 623
624/* The following is used by virthba/vSCSI to send the Acquire/Release commands 624/* The following is used by virthba/vSCSI to send the Acquire/Release commands
@@ -696,8 +696,8 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
696 } vhba; /* 28 */ 696 } vhba; /* 28 */
697 struct { 697 struct {
698 u8 macaddr[MAX_MACADDR_LEN]; /* 6 bytes */ 698 u8 macaddr[MAX_MACADDR_LEN]; /* 6 bytes */
699 U32 num_rcv_bufs; /* 4 */ 699 u32 num_rcv_bufs; /* 4 */
700 U32 mtu; /* 4 */ 700 u32 mtu; /* 4 */
701 uuid_le zoneGuid; /* 16 */ 701 uuid_le zoneGuid; /* 16 */
702 } vnic; /* total 30 */ 702 } vnic; /* total 30 */
703 }; 703 };
@@ -777,9 +777,9 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
777 OFFSETOF(type, clientString); \ 777 OFFSETOF(type, clientString); \
778 MEMCPY(chan->clientString, clientStr, \ 778 MEMCPY(chan->clientString, clientStr, \
779 MINNUM(clientStrLen, \ 779 MINNUM(clientStrLen, \
780 (U32) (MAX_CLIENTSTRING_LEN - 1))); \ 780 (u32) (MAX_CLIENTSTRING_LEN - 1))); \
781 chan->clientString[MINNUM(clientStrLen, \ 781 chan->clientString[MINNUM(clientStrLen, \
782 (U32) (MAX_CLIENTSTRING_LEN \ 782 (u32) (MAX_CLIENTSTRING_LEN \
783 - 1))] \ 783 - 1))] \
784 = '\0'; \ 784 = '\0'; \
785 } \ 785 } \
@@ -801,7 +801,7 @@ static inline int ULTRA_VHBA_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
801 struct vhba_wwnn *wwnn, 801 struct vhba_wwnn *wwnn,
802 struct vhba_config_max *max, 802 struct vhba_config_max *max,
803 unsigned char *clientStr, 803 unsigned char *clientStr,
804 U32 clientStrLen, U64 bytes) { 804 u32 clientStrLen, U64 bytes) {
805 MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL)); 805 MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL));
806 x->ChannelHeader.VersionId = ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID; 806 x->ChannelHeader.VersionId = ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID;
807 x->ChannelHeader.Signature = ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE; 807 x->ChannelHeader.Signature = ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE;
@@ -833,10 +833,10 @@ static inline void ULTRA_VHBA_set_max(ULTRA_IO_CHANNEL_PROTOCOL *x,
833 833
834static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x, 834static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
835 unsigned char *macaddr, 835 unsigned char *macaddr,
836 U32 num_rcv_bufs, U32 mtu, 836 u32 num_rcv_bufs, u32 mtu,
837 uuid_le zoneGuid, 837 uuid_le zoneGuid,
838 unsigned char *clientStr, 838 unsigned char *clientStr,
839 U32 clientStrLen, 839 u32 clientStrLen,
840 U64 bytes) { 840 U64 bytes) {
841 MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL)); 841 MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL));
842 x->ChannelHeader.VersionId = ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID; 842 x->ChannelHeader.VersionId = ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID;
@@ -883,11 +883,11 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
883 * room) 883 * room)
884 */ 884 */
885static INLINE u16 885static INLINE u16
886add_physinfo_entries(U32 inp_pfn, /* input - specifies the pfn to be used 886add_physinfo_entries(u32 inp_pfn, /* input - specifies the pfn to be used
887 * to add entries */ 887 * to add entries */
888 u16 inp_off, /* input - specifies the off to be used 888 u16 inp_off, /* input - specifies the off to be used
889 * to add entries */ 889 * to add entries */
890 U32 inp_len, /* input - specifies the len to be used 890 u32 inp_len, /* input - specifies the len to be used
891 * to add entries */ 891 * to add entries */
892 u16 index, /* input - index in array at which new 892 u16 index, /* input - index in array at which new
893 * entries are added */ 893 * entries are added */
@@ -896,7 +896,7 @@ add_physinfo_entries(U32 inp_pfn, /* input - specifies the pfn to be used
896 struct phys_info pi_arr[]) /* input & output - array to 896 struct phys_info pi_arr[]) /* input & output - array to
897 * which entries are added */ 897 * which entries are added */
898{ 898{
899 U32 len; 899 u32 len;
900 u16 i, firstlen; 900 u16 i, firstlen;
901 901
902 firstlen = PI_PAGE_SIZE - inp_off; 902 firstlen = PI_PAGE_SIZE - inp_off;
@@ -925,7 +925,7 @@ add_physinfo_entries(U32 inp_pfn, /* input - specifies the pfn to be used
925 else { 925 else {
926 pi_arr[index + i].pi_off = 0; 926 pi_arr[index + i].pi_off = 0;
927 pi_arr[index + i].pi_len = 927 pi_arr[index + i].pi_len =
928 (u16) MINNUM(len, (U32) PI_PAGE_SIZE); 928 (u16) MINNUM(len, (u32) PI_PAGE_SIZE);
929 } 929 }
930 930
931 } 931 }
diff --git a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
index cd94c8f91780..8facb51143ae 100644
--- a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
@@ -63,15 +63,15 @@ static const uuid_le UltraVbusChannelProtocolGuid =
63 63
64#pragma pack(push, 1) /* both GCC and VC now allow this pragma */ 64#pragma pack(push, 1) /* both GCC and VC now allow this pragma */
65typedef struct _ULTRA_VBUS_HEADERINFO { 65typedef struct _ULTRA_VBUS_HEADERINFO {
66 U32 structBytes; /* size of this struct in bytes */ 66 u32 structBytes; /* size of this struct in bytes */
67 U32 deviceInfoStructBytes; /* sizeof(ULTRA_VBUS_DEVICEINFO) */ 67 u32 deviceInfoStructBytes; /* sizeof(ULTRA_VBUS_DEVICEINFO) */
68 U32 devInfoCount; /* num of items in DevInfo member */ 68 u32 devInfoCount; /* num of items in DevInfo member */
69 /* (this is the allocated size) */ 69 /* (this is the allocated size) */
70 U32 chpInfoByteOffset; /* byte offset from beginning of this struct */ 70 u32 chpInfoByteOffset; /* byte offset from beginning of this struct */
71 /* to the the ChpInfo struct (below) */ 71 /* to the the ChpInfo struct (below) */
72 U32 busInfoByteOffset; /* byte offset from beginning of this struct */ 72 u32 busInfoByteOffset; /* byte offset from beginning of this struct */
73 /* to the the BusInfo struct (below) */ 73 /* to the the BusInfo struct (below) */
74 U32 devInfoByteOffset; /* byte offset from beginning of this struct */ 74 u32 devInfoByteOffset; /* byte offset from beginning of this struct */
75 /* to the the DevInfo array (below) */ 75 /* to the the DevInfo array (below) */
76 u8 reserved[104]; 76 u8 reserved[104];
77} ULTRA_VBUS_HEADERINFO; 77} ULTRA_VBUS_HEADERINFO;
diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
index a8ecb0b38922..e98616468173 100644
--- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/drivers/staging/unisys/common-spar/include/vmcallinterface.h
@@ -88,7 +88,7 @@ typedef enum { /* VMCALL identification tuples */
88 * not used much */ 88 * not used much */
89#define ISSUE_IO_VMCALL_POSTCODE_SEVERITY(postcode, severity) \ 89#define ISSUE_IO_VMCALL_POSTCODE_SEVERITY(postcode, severity) \
90do { \ 90do { \
91 U32 _tempresult = VMCALL_SUCCESS; \ 91 u32 _tempresult = VMCALL_SUCCESS; \
92 ISSUE_IO_EXTENDED_VMCALL(VMCALL_POST_CODE_LOGEVENT, severity, \ 92 ISSUE_IO_EXTENDED_VMCALL(VMCALL_POST_CODE_LOGEVENT, severity, \
93 MDS_APPOS, postcode, _tempresult); \ 93 MDS_APPOS, postcode, _tempresult); \
94} while (0) 94} while (0)
@@ -119,7 +119,7 @@ typedef struct _VMCALL_IO_CONTROLVM_ADDR_PARAMS {
119 U64 ChannelAddress; /* contents provided by this VMCALL (OUT) */ 119 U64 ChannelAddress; /* contents provided by this VMCALL (OUT) */
120 /* the size of the ControlVm channel in bytes This VMCall fills this 120 /* the size of the ControlVm channel in bytes This VMCall fills this
121 * in with the appropriate address. */ 121 * in with the appropriate address. */
122 U32 ChannelBytes; /* contents provided by this VMCALL (OUT) */ 122 u32 ChannelBytes; /* contents provided by this VMCALL (OUT) */
123 u8 Unused[4]; /* Unused Bytes in the 64-Bit Aligned Struct */ 123 u8 Unused[4]; /* Unused Bytes in the 64-Bit Aligned Struct */
124} VMCALL_IO_CONTROLVM_ADDR_PARAMS; 124} VMCALL_IO_CONTROLVM_ADDR_PARAMS;
125 125
@@ -159,7 +159,7 @@ typedef struct _VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS {
159 * (IN) */ 159 * (IN) */
160 u8 ItemName[32]; /* Null terminated string giving name of 160 u8 ItemName[32]; /* Null terminated string giving name of
161 * mismatched item (IN) */ 161 * mismatched item (IN) */
162 U32 SourceLineNumber; /* line# where invoked. (IN) */ 162 u32 SourceLineNumber; /* line# where invoked. (IN) */
163 u8 SourceFileName[36]; /* source code where invoked - Null terminated 163 u8 SourceFileName[36]; /* source code where invoked - Null terminated
164 * string (IN) */ 164 * string (IN) */
165} VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS; 165} VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS;
diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h
index 2c49b9d01694..48da47fcd8d1 100644
--- a/drivers/staging/unisys/include/commontypes.h
+++ b/drivers/staging/unisys/include/commontypes.h
@@ -30,7 +30,6 @@
30#include <syslog.h> 30#include <syslog.h>
31#endif 31#endif
32 32
33#define U32 uint32_t
34#define U64 uint64_t 33#define U64 uint64_t
35#define S8 int8_t 34#define S8 int8_t
36#define S16 int16_t 35#define S16 int16_t
@@ -40,7 +39,7 @@
40#ifdef __KERNEL__ 39#ifdef __KERNEL__
41 40
42#ifdef CONFIG_X86_32 41#ifdef CONFIG_X86_32
43#define UINTN U32 42#define UINTN u32
44#else 43#else
45#define UINTN U64 44#define UINTN U64
46#endif 45#endif
@@ -49,7 +48,7 @@
49 48
50#include <stdint.h> 49#include <stdint.h>
51#if __WORDSIZE == 32 50#if __WORDSIZE == 32
52#define UINTN U32 51#define UINTN u32
53#elif __WORDSIZE == 64 52#elif __WORDSIZE == 64
54#define UINTN U64 53#define UINTN U64
55#else 54#else
@@ -121,7 +120,7 @@ typedef U64 GUEST_PHYSICAL_ADDRESS;
121 fil, lin); \ 120 fil, lin); \
122 } while (0) 121 } while (0)
123 122
124#define CHANNEL_U32_MISMATCH(chType, chName, field, expected, actual, fil, \ 123#define CHANNEL_u32_MISMATCH(chType, chName, field, expected, actual, fil, \
125 lin, logCtx) \ 124 lin, logCtx) \
126 do { \ 125 do { \
127 syslog(LOG_USER | LOG_ERR, \ 126 syslog(LOG_USER | LOG_ERR, \
diff --git a/drivers/staging/unisys/include/uisqueue.h b/drivers/staging/unisys/include/uisqueue.h
index 6dc473bf76db..56cc828858ca 100644
--- a/drivers/staging/unisys/include/uisqueue.h
+++ b/drivers/staging/unisys/include/uisqueue.h
@@ -112,7 +112,7 @@ struct extport_info {
112 /* if 1, indicates this extport slot is occupied 112 /* if 1, indicates this extport slot is occupied
113 * if 0, indicates that extport slot is unoccupied */ 113 * if 0, indicates that extport slot is unoccupied */
114 114
115 U32 num_devs_using; 115 u32 num_devs_using;
116 /* When extport is added, this is set to 0. For exports 116 /* When extport is added, this is set to 0. For exports
117 * located in NETWORK switches: 117 * located in NETWORK switches:
118 * Each time a VNIC, i.e., intport, is added to the switch this 118 * Each time a VNIC, i.e., intport, is added to the switch this
@@ -144,8 +144,8 @@ struct device_info {
144 char devid[30]; /* "vbus<busno>:dev<devno>" */ 144 char devid[30]; /* "vbus<busno>:dev<devno>" */
145 u16 polling; 145 u16 polling;
146 struct semaphore interrupt_callback_lock; 146 struct semaphore interrupt_callback_lock;
147 U32 busNo; 147 u32 busNo;
148 U32 devNo; 148 u32 devNo;
149 int (*interrupt)(void *); 149 int (*interrupt)(void *);
150 void *interrupt_context; 150 void *interrupt_context;
151 void *private_data; 151 void *private_data;
@@ -161,7 +161,7 @@ typedef enum {
161} SWITCH_TYPE; 161} SWITCH_TYPE;
162 162
163struct bus_info { 163struct bus_info {
164 U32 busNo, deviceCount; 164 u32 busNo, deviceCount;
165 struct device_info **device; 165 struct device_info **device;
166 U64 guestHandle, recvBusInterruptHandle; 166 U64 guestHandle, recvBusInterruptHandle;
167 uuid_le busInstGuid; 167 uuid_le busInstGuid;
@@ -190,12 +190,12 @@ struct sn_list_entry {
190}; 190};
191 191
192struct networkPolicy { 192struct networkPolicy {
193 U32 promiscuous:1; 193 u32 promiscuous:1;
194 U32 macassign:1; 194 u32 macassign:1;
195 U32 peerforwarding:1; 195 u32 peerforwarding:1;
196 U32 nonotify:1; 196 u32 nonotify:1;
197 U32 standby:1; 197 u32 standby:1;
198 U32 callhome:2; 198 u32 callhome:2;
199 char ip_addr[30]; 199 char ip_addr[30];
200}; 200};
201 201
@@ -251,8 +251,8 @@ struct add_virt_iopart {
251 * needs to use G2G copy. */ 251 * needs to use G2G copy. */
252 u8 Filler[7]; 252 u8 Filler[7];
253 253
254 U32 busNo; 254 u32 busNo;
255 U32 devNo; 255 u32 devNo;
256 char *params; 256 char *params;
257 ulong params_bytes; 257 ulong params_bytes;
258 258
@@ -264,22 +264,22 @@ struct add_vdisk_iopart {
264 struct uisscsi_dest vdest; /* scsi bus, target, lun for virt disk */ 264 struct uisscsi_dest vdest; /* scsi bus, target, lun for virt disk */
265 struct uisscsi_dest pdest; /* scsi bus, target, lun for phys disk */ 265 struct uisscsi_dest pdest; /* scsi bus, target, lun for phys disk */
266 u8 sernum[MAX_SERIAL_NUM]; /* serial num of physical disk */ 266 u8 sernum[MAX_SERIAL_NUM]; /* serial num of physical disk */
267 U32 serlen; /* length of serial num */ 267 u32 serlen; /* length of serial num */
268 U32 busNo; 268 u32 busNo;
269 U32 devNo; 269 u32 devNo;
270}; 270};
271 271
272struct del_vdisk_iopart { 272struct del_vdisk_iopart {
273 void *chanptr; /* pointer to data channel */ 273 void *chanptr; /* pointer to data channel */
274 struct uisscsi_dest vdest; /* scsi bus, target, lun for virt disk */ 274 struct uisscsi_dest vdest; /* scsi bus, target, lun for virt disk */
275 U32 busNo; 275 u32 busNo;
276 U32 devNo; 276 u32 devNo;
277}; 277};
278 278
279struct del_virt_iopart { 279struct del_virt_iopart {
280 void *chanptr; /* pointer to data channel */ 280 void *chanptr; /* pointer to data channel */
281 U32 busNo; 281 u32 busNo;
282 U32 devNo; 282 u32 devNo;
283}; 283};
284 284
285struct det_virt_iopart { /* detach internal port */ 285struct det_virt_iopart { /* detach internal port */
@@ -355,14 +355,14 @@ typedef enum {
355struct add_vbus_guestpart { 355struct add_vbus_guestpart {
356 void __iomem *chanptr; /* pointer to data channel for bus - 356 void __iomem *chanptr; /* pointer to data channel for bus -
357 * NOT YET USED */ 357 * NOT YET USED */
358 U32 busNo; /* bus number to be created/deleted */ 358 u32 busNo; /* bus number to be created/deleted */
359 U32 deviceCount; /* max num of devices on bus */ 359 u32 deviceCount; /* max num of devices on bus */
360 uuid_le busTypeGuid; /* indicates type of bus */ 360 uuid_le busTypeGuid; /* indicates type of bus */
361 uuid_le busInstGuid; /* instance guid for device */ 361 uuid_le busInstGuid; /* instance guid for device */
362}; 362};
363 363
364struct del_vbus_guestpart { 364struct del_vbus_guestpart {
365 U32 busNo; /* bus number to be deleted */ 365 u32 busNo; /* bus number to be deleted */
366 /* once we start using the bus's channel, add can dump busNo 366 /* once we start using the bus's channel, add can dump busNo
367 * into the channel header and then delete will need only one 367 * into the channel header and then delete will need only one
368 * parameter, chanptr. */ 368 * parameter, chanptr. */
@@ -370,8 +370,8 @@ struct del_vbus_guestpart {
370 370
371struct add_virt_guestpart { 371struct add_virt_guestpart {
372 void __iomem *chanptr; /* pointer to data channel */ 372 void __iomem *chanptr; /* pointer to data channel */
373 U32 busNo; /* bus number for the operation */ 373 u32 busNo; /* bus number for the operation */
374 U32 deviceNo; /* number of device on the bus */ 374 u32 deviceNo; /* number of device on the bus */
375 uuid_le devInstGuid; /* instance guid for device */ 375 uuid_le devInstGuid; /* instance guid for device */
376 struct InterruptInfo intr; /* recv/send interrupt info */ 376 struct InterruptInfo intr; /* recv/send interrupt info */
377 /* recvInterruptHandle contains info needed in order to 377 /* recvInterruptHandle contains info needed in order to
@@ -395,8 +395,8 @@ struct del_virt_guestpart {
395}; 395};
396 396
397struct init_chipset_guestpart { 397struct init_chipset_guestpart {
398 U32 busCount; /* indicates the max number of busses */ 398 u32 busCount; /* indicates the max number of busses */
399 U32 switchCount; /* indicates the max number of switches */ 399 u32 switchCount; /* indicates the max number of switches */
400}; 400};
401 401
402struct guest_msgs { 402struct guest_msgs {
diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h
index 14d5cbda594a..947f132f1f0e 100644
--- a/drivers/staging/unisys/include/uisutils.h
+++ b/drivers/staging/unisys/include/uisutils.h
@@ -60,7 +60,7 @@ typedef struct ReqHandlerInfo_struct {
60 unsigned long min_channel_bytes; 60 unsigned long min_channel_bytes;
61 int (*Server_Channel_Ok)(unsigned long channelBytes); 61 int (*Server_Channel_Ok)(unsigned long channelBytes);
62 int (*Server_Channel_Init) 62 int (*Server_Channel_Init)
63 (void *x, unsigned char *clientStr, U32 clientStrLen, U64 bytes); 63 (void *x, unsigned char *clientStr, u32 clientStrLen, U64 bytes);
64 char switch_type_name[99]; 64 char switch_type_name[99];
65 struct list_head list_link; /* links into ReqHandlerInfo_list */ 65 struct list_head list_link; /* links into ReqHandlerInfo_list */
66} ReqHandlerInfo_t; 66} ReqHandlerInfo_t;
@@ -73,7 +73,7 @@ ReqHandlerInfo_t *ReqHandlerAdd(uuid_le switchTypeGuid,
73 channelBytes), 73 channelBytes),
74 int (*Server_Channel_Init) 74 int (*Server_Channel_Init)
75 (void *x, unsigned char *clientStr, 75 (void *x, unsigned char *clientStr,
76 U32 clientStrLen, U64 bytes)); 76 u32 clientStrLen, U64 bytes));
77ReqHandlerInfo_t *ReqHandlerFind(uuid_le switchTypeGuid); 77ReqHandlerInfo_t *ReqHandlerFind(uuid_le switchTypeGuid);
78int ReqHandlerDel(uuid_le switchTypeGuid); 78int ReqHandlerDel(uuid_le switchTypeGuid);
79 79
@@ -121,7 +121,7 @@ int uisctrl_register_req_handler_ex(uuid_le switchTypeGuid,
121 channelBytes), 121 channelBytes),
122 int (*Server_Channel_Init) 122 int (*Server_Channel_Init)
123 (void *x, unsigned char *clientStr, 123 (void *x, unsigned char *clientStr,
124 U32 clientStrLen, U64 bytes), 124 u32 clientStrLen, U64 bytes),
125 ULTRA_VBUS_DEVICEINFO *chipset_DriverInfo); 125 ULTRA_VBUS_DEVICEINFO *chipset_DriverInfo);
126 126
127int uisctrl_unregister_req_handler_ex(uuid_le switchTypeGuid); 127int uisctrl_unregister_req_handler_ex(uuid_le switchTypeGuid);
@@ -129,29 +129,29 @@ unsigned char *util_map_virt(struct phys_info *sg);
129void util_unmap_virt(struct phys_info *sg); 129void util_unmap_virt(struct phys_info *sg);
130unsigned char *util_map_virt_atomic(struct phys_info *sg); 130unsigned char *util_map_virt_atomic(struct phys_info *sg);
131void util_unmap_virt_atomic(void *buf); 131void util_unmap_virt_atomic(void *buf);
132int uislib_server_inject_add_vnic(U32 switchNo, U32 BusNo, U32 numIntPorts, 132int uislib_server_inject_add_vnic(u32 switchNo, u32 BusNo, u32 numIntPorts,
133 U32 numExtPorts, MACARRAY pmac[], 133 u32 numExtPorts, MACARRAY pmac[],
134 pCHANNEL_HEADER **chan); 134 pCHANNEL_HEADER **chan);
135void uislib_server_inject_del_vnic(U32 switchNo, U32 busNo, U32 numIntPorts, 135void uislib_server_inject_del_vnic(u32 switchNo, u32 busNo, u32 numIntPorts,
136 U32 numExtPorts); 136 u32 numExtPorts);
137int uislib_client_inject_add_bus(U32 busNo, uuid_le instGuid, 137int uislib_client_inject_add_bus(u32 busNo, uuid_le instGuid,
138 U64 channelAddr, ulong nChannelBytes); 138 U64 channelAddr, ulong nChannelBytes);
139int uislib_client_inject_del_bus(U32 busNo); 139int uislib_client_inject_del_bus(u32 busNo);
140 140
141int uislib_client_inject_add_vhba(U32 busNo, U32 devNo, 141int uislib_client_inject_add_vhba(u32 busNo, u32 devNo,
142 U64 phys_chan_addr, U32 chan_bytes, 142 U64 phys_chan_addr, u32 chan_bytes,
143 int is_test_addr, uuid_le instGuid, 143 int is_test_addr, uuid_le instGuid,
144 struct InterruptInfo *intr); 144 struct InterruptInfo *intr);
145int uislib_client_inject_pause_vhba(U32 busNo, U32 devNo); 145int uislib_client_inject_pause_vhba(u32 busNo, u32 devNo);
146int uislib_client_inject_resume_vhba(U32 busNo, U32 devNo); 146int uislib_client_inject_resume_vhba(u32 busNo, u32 devNo);
147int uislib_client_inject_del_vhba(U32 busNo, U32 devNo); 147int uislib_client_inject_del_vhba(u32 busNo, u32 devNo);
148int uislib_client_inject_add_vnic(U32 busNo, U32 devNo, 148int uislib_client_inject_add_vnic(u32 busNo, u32 devNo,
149 U64 phys_chan_addr, U32 chan_bytes, 149 U64 phys_chan_addr, u32 chan_bytes,
150 int is_test_addr, uuid_le instGuid, 150 int is_test_addr, uuid_le instGuid,
151 struct InterruptInfo *intr); 151 struct InterruptInfo *intr);
152int uislib_client_inject_pause_vnic(U32 busNo, U32 devNo); 152int uislib_client_inject_pause_vnic(u32 busNo, u32 devNo);
153int uislib_client_inject_resume_vnic(U32 busNo, U32 devNo); 153int uislib_client_inject_resume_vnic(u32 busNo, u32 devNo);
154int uislib_client_inject_del_vnic(U32 busNo, U32 devNo); 154int uislib_client_inject_del_vnic(u32 busNo, u32 devNo);
155#ifdef STORAGE_CHANNEL 155#ifdef STORAGE_CHANNEL
156U64 uislib_storage_channel(int client_id); 156U64 uislib_storage_channel(int client_id);
157#endif 157#endif
@@ -220,7 +220,7 @@ unsigned int uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx,
220 struct phys_info frags[]); 220 struct phys_info frags[]);
221 221
222static inline unsigned int 222static inline unsigned int
223Issue_VMCALL_IO_CONTROLVM_ADDR(U64 *ControlAddress, U32 *ControlBytes) 223Issue_VMCALL_IO_CONTROLVM_ADDR(U64 *ControlAddress, u32 *ControlBytes)
224{ 224{
225 VMCALL_IO_CONTROLVM_ADDR_PARAMS params; 225 VMCALL_IO_CONTROLVM_ADDR_PARAMS params;
226 int result = VMCALL_SUCCESS; 226 int result = VMCALL_SUCCESS;
@@ -300,7 +300,7 @@ static inline int Issue_VMCALL_UPDATE_PHYSICAL_TIME(U64 adjustment)
300static inline unsigned int 300static inline unsigned int
301Issue_VMCALL_CHANNEL_MISMATCH(const char *ChannelName, 301Issue_VMCALL_CHANNEL_MISMATCH(const char *ChannelName,
302 const char *ItemName, 302 const char *ItemName,
303 U32 SourceLineNumber, const char *path_n_fn) 303 u32 SourceLineNumber, const char *path_n_fn)
304{ 304{
305 VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS params; 305 VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS params;
306 int result = VMCALL_SUCCESS; 306 int result = VMCALL_SUCCESS;
@@ -347,10 +347,10 @@ void uislib_cache_free(struct kmem_cache *cur_pool, void *p, char *fn, int ln);
347#define UISCACHEFREE(cur_pool, p) \ 347#define UISCACHEFREE(cur_pool, p) \
348 uislib_cache_free(cur_pool, p, __FILE__, __LINE__) 348 uislib_cache_free(cur_pool, p, __FILE__, __LINE__)
349 349
350void uislib_enable_channel_interrupts(U32 busNo, U32 devNo, 350void uislib_enable_channel_interrupts(u32 busNo, u32 devNo,
351 int (*interrupt)(void *), 351 int (*interrupt)(void *),
352 void *interrupt_context); 352 void *interrupt_context);
353void uislib_disable_channel_interrupts(U32 busNo, U32 devNo); 353void uislib_disable_channel_interrupts(u32 busNo, u32 devNo);
354void uislib_force_channel_interrupt(U32 busNo, U32 devNo); 354void uislib_force_channel_interrupt(u32 busNo, u32 devNo);
355 355
356#endif /* __UISUTILS__H__ */ 356#endif /* __UISUTILS__H__ */
diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index 5c7bffca005b..4e2777ef405b 100644
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -120,7 +120,7 @@ static const struct file_operations debugfs_info_fops = {
120}; 120};
121 121
122static void 122static void
123init_msg_header(CONTROLVM_MESSAGE *msg, U32 id, uint rsp, uint svr) 123init_msg_header(CONTROLVM_MESSAGE *msg, u32 id, uint rsp, uint svr)
124{ 124{
125 memset(msg, 0, sizeof(CONTROLVM_MESSAGE)); 125 memset(msg, 0, sizeof(CONTROLVM_MESSAGE));
126 msg->hdr.Id = id; 126 msg->hdr.Id = id;
@@ -129,7 +129,7 @@ init_msg_header(CONTROLVM_MESSAGE *msg, U32 id, uint rsp, uint svr)
129} 129}
130 130
131static __iomem void * 131static __iomem void *
132init_vbus_channel(U64 channelAddr, U32 channelBytes) 132init_vbus_channel(U64 channelAddr, u32 channelBytes)
133{ 133{
134 void __iomem *rc = NULL; 134 void __iomem *rc = NULL;
135 void __iomem *pChan = uislib_ioremap_cache(channelAddr, channelBytes); 135 void __iomem *pChan = uislib_ioremap_cache(channelAddr, channelBytes);
@@ -154,7 +154,7 @@ Away:
154static int 154static int
155create_bus(CONTROLVM_MESSAGE *msg, char *buf) 155create_bus(CONTROLVM_MESSAGE *msg, char *buf)
156{ 156{
157 U32 busNo, deviceCount; 157 u32 busNo, deviceCount;
158 struct bus_info *tmp, *bus; 158 struct bus_info *tmp, *bus;
159 size_t size; 159 size_t size;
160 160
@@ -273,7 +273,7 @@ destroy_bus(CONTROLVM_MESSAGE *msg, char *buf)
273{ 273{
274 int i; 274 int i;
275 struct bus_info *bus, *prev = NULL; 275 struct bus_info *bus, *prev = NULL;
276 U32 busNo; 276 u32 busNo;
277 277
278 busNo = msg->cmd.destroyBus.busNo; 278 busNo = msg->cmd.destroyBus.busNo;
279 279
@@ -341,7 +341,7 @@ create_device(CONTROLVM_MESSAGE *msg, char *buf)
341{ 341{
342 struct device_info *dev; 342 struct device_info *dev;
343 struct bus_info *bus; 343 struct bus_info *bus;
344 U32 busNo, devNo; 344 u32 busNo, devNo;
345 int result = CONTROLVM_RESP_SUCCESS; 345 int result = CONTROLVM_RESP_SUCCESS;
346 U64 minSize = MIN_IO_CHANNEL_SIZE; 346 U64 minSize = MIN_IO_CHANNEL_SIZE;
347 ReqHandlerInfo_t *pReqHandler; 347 ReqHandlerInfo_t *pReqHandler;
@@ -535,7 +535,7 @@ Away:
535static int 535static int
536pause_device(CONTROLVM_MESSAGE *msg) 536pause_device(CONTROLVM_MESSAGE *msg)
537{ 537{
538 U32 busNo, devNo; 538 u32 busNo, devNo;
539 struct bus_info *bus; 539 struct bus_info *bus;
540 struct device_info *dev; 540 struct device_info *dev;
541 struct guest_msgs cmd; 541 struct guest_msgs cmd;
@@ -607,7 +607,7 @@ pause_device(CONTROLVM_MESSAGE *msg)
607static int 607static int
608resume_device(CONTROLVM_MESSAGE *msg) 608resume_device(CONTROLVM_MESSAGE *msg)
609{ 609{
610 U32 busNo, devNo; 610 u32 busNo, devNo;
611 struct bus_info *bus; 611 struct bus_info *bus;
612 struct device_info *dev; 612 struct device_info *dev;
613 struct guest_msgs cmd; 613 struct guest_msgs cmd;
@@ -679,7 +679,7 @@ resume_device(CONTROLVM_MESSAGE *msg)
679static int 679static int
680destroy_device(CONTROLVM_MESSAGE *msg, char *buf) 680destroy_device(CONTROLVM_MESSAGE *msg, char *buf)
681{ 681{
682 U32 busNo, devNo; 682 u32 busNo, devNo;
683 struct bus_info *bus; 683 struct bus_info *bus;
684 struct device_info *dev; 684 struct device_info *dev;
685 struct guest_msgs cmd; 685 struct guest_msgs cmd;
@@ -791,7 +791,7 @@ init_chipset(CONTROLVM_MESSAGE *msg, char *buf)
791} 791}
792 792
793static int 793static int
794delete_bus_glue(U32 busNo) 794delete_bus_glue(u32 busNo)
795{ 795{
796 CONTROLVM_MESSAGE msg; 796 CONTROLVM_MESSAGE msg;
797 797
@@ -805,7 +805,7 @@ delete_bus_glue(U32 busNo)
805} 805}
806 806
807static int 807static int
808delete_device_glue(U32 busNo, U32 devNo) 808delete_device_glue(u32 busNo, u32 devNo)
809{ 809{
810 CONTROLVM_MESSAGE msg; 810 CONTROLVM_MESSAGE msg;
811 811
@@ -821,7 +821,7 @@ delete_device_glue(U32 busNo, U32 devNo)
821} 821}
822 822
823int 823int
824uislib_client_inject_add_bus(U32 busNo, uuid_le instGuid, 824uislib_client_inject_add_bus(u32 busNo, uuid_le instGuid,
825 U64 channelAddr, ulong nChannelBytes) 825 U64 channelAddr, ulong nChannelBytes)
826{ 826{
827 CONTROLVM_MESSAGE msg; 827 CONTROLVM_MESSAGE msg;
@@ -872,14 +872,14 @@ EXPORT_SYMBOL_GPL(uislib_client_inject_add_bus);
872 872
873 873
874int 874int
875uislib_client_inject_del_bus(U32 busNo) 875uislib_client_inject_del_bus(u32 busNo)
876{ 876{
877 return delete_bus_glue(busNo); 877 return delete_bus_glue(busNo);
878} 878}
879EXPORT_SYMBOL_GPL(uislib_client_inject_del_bus); 879EXPORT_SYMBOL_GPL(uislib_client_inject_del_bus);
880 880
881int 881int
882uislib_client_inject_pause_vhba(U32 busNo, U32 devNo) 882uislib_client_inject_pause_vhba(u32 busNo, u32 devNo)
883{ 883{
884 CONTROLVM_MESSAGE msg; 884 CONTROLVM_MESSAGE msg;
885 int rc; 885 int rc;
@@ -899,7 +899,7 @@ uislib_client_inject_pause_vhba(U32 busNo, U32 devNo)
899EXPORT_SYMBOL_GPL(uislib_client_inject_pause_vhba); 899EXPORT_SYMBOL_GPL(uislib_client_inject_pause_vhba);
900 900
901int 901int
902uislib_client_inject_resume_vhba(U32 busNo, U32 devNo) 902uislib_client_inject_resume_vhba(u32 busNo, u32 devNo)
903{ 903{
904 CONTROLVM_MESSAGE msg; 904 CONTROLVM_MESSAGE msg;
905 int rc; 905 int rc;
@@ -920,8 +920,8 @@ uislib_client_inject_resume_vhba(U32 busNo, U32 devNo)
920EXPORT_SYMBOL_GPL(uislib_client_inject_resume_vhba); 920EXPORT_SYMBOL_GPL(uislib_client_inject_resume_vhba);
921 921
922int 922int
923uislib_client_inject_add_vhba(U32 busNo, U32 devNo, 923uislib_client_inject_add_vhba(u32 busNo, u32 devNo,
924 U64 phys_chan_addr, U32 chan_bytes, 924 U64 phys_chan_addr, u32 chan_bytes,
925 int is_test_addr, uuid_le instGuid, 925 int is_test_addr, uuid_le instGuid,
926 struct InterruptInfo *intr) 926 struct InterruptInfo *intr)
927{ 927{
@@ -972,15 +972,15 @@ uislib_client_inject_add_vhba(U32 busNo, U32 devNo,
972EXPORT_SYMBOL_GPL(uislib_client_inject_add_vhba); 972EXPORT_SYMBOL_GPL(uislib_client_inject_add_vhba);
973 973
974int 974int
975uislib_client_inject_del_vhba(U32 busNo, U32 devNo) 975uislib_client_inject_del_vhba(u32 busNo, u32 devNo)
976{ 976{
977 return delete_device_glue(busNo, devNo); 977 return delete_device_glue(busNo, devNo);
978} 978}
979EXPORT_SYMBOL_GPL(uislib_client_inject_del_vhba); 979EXPORT_SYMBOL_GPL(uislib_client_inject_del_vhba);
980 980
981int 981int
982uislib_client_inject_add_vnic(U32 busNo, U32 devNo, 982uislib_client_inject_add_vnic(u32 busNo, u32 devNo,
983 U64 phys_chan_addr, U32 chan_bytes, 983 U64 phys_chan_addr, u32 chan_bytes,
984 int is_test_addr, uuid_le instGuid, 984 int is_test_addr, uuid_le instGuid,
985 struct InterruptInfo *intr) 985 struct InterruptInfo *intr)
986{ 986{
@@ -1032,7 +1032,7 @@ uislib_client_inject_add_vnic(U32 busNo, U32 devNo,
1032EXPORT_SYMBOL_GPL(uislib_client_inject_add_vnic); 1032EXPORT_SYMBOL_GPL(uislib_client_inject_add_vnic);
1033 1033
1034int 1034int
1035uislib_client_inject_pause_vnic(U32 busNo, U32 devNo) 1035uislib_client_inject_pause_vnic(u32 busNo, u32 devNo)
1036{ 1036{
1037 CONTROLVM_MESSAGE msg; 1037 CONTROLVM_MESSAGE msg;
1038 int rc; 1038 int rc;
@@ -1052,7 +1052,7 @@ uislib_client_inject_pause_vnic(U32 busNo, U32 devNo)
1052EXPORT_SYMBOL_GPL(uislib_client_inject_pause_vnic); 1052EXPORT_SYMBOL_GPL(uislib_client_inject_pause_vnic);
1053 1053
1054int 1054int
1055uislib_client_inject_resume_vnic(U32 busNo, U32 devNo) 1055uislib_client_inject_resume_vnic(u32 busNo, u32 devNo)
1056{ 1056{
1057 CONTROLVM_MESSAGE msg; 1057 CONTROLVM_MESSAGE msg;
1058 int rc; 1058 int rc;
@@ -1073,14 +1073,14 @@ uislib_client_inject_resume_vnic(U32 busNo, U32 devNo)
1073EXPORT_SYMBOL_GPL(uislib_client_inject_resume_vnic); 1073EXPORT_SYMBOL_GPL(uislib_client_inject_resume_vnic);
1074 1074
1075int 1075int
1076uislib_client_inject_del_vnic(U32 busNo, U32 devNo) 1076uislib_client_inject_del_vnic(u32 busNo, u32 devNo)
1077{ 1077{
1078 return delete_device_glue(busNo, devNo); 1078 return delete_device_glue(busNo, devNo);
1079} 1079}
1080EXPORT_SYMBOL_GPL(uislib_client_inject_del_vnic); 1080EXPORT_SYMBOL_GPL(uislib_client_inject_del_vnic);
1081 1081
1082static int 1082static int
1083uislib_client_add_vnic(U32 busNo) 1083uislib_client_add_vnic(u32 busNo)
1084{ 1084{
1085 BOOL busCreated = FALSE; 1085 BOOL busCreated = FALSE;
1086 int devNo = 0; /* Default to 0, since only one device 1086 int devNo = 0; /* Default to 0, since only one device
@@ -1129,7 +1129,7 @@ AwayCleanup:
1129EXPORT_SYMBOL_GPL(uislib_client_add_vnic); 1129EXPORT_SYMBOL_GPL(uislib_client_add_vnic);
1130 1130
1131static int 1131static int
1132uislib_client_delete_vnic(U32 busNo) 1132uislib_client_delete_vnic(u32 busNo)
1133{ 1133{
1134 int devNo = 0; /* Default to 0, since only one device 1134 int devNo = 0; /* Default to 0, since only one device
1135 * will be created for this bus... */ 1135 * will be created for this bus... */
@@ -1285,7 +1285,7 @@ info_debugfs_read(struct file *file, char __user *buf,
1285} 1285}
1286 1286
1287static struct device_info * 1287static struct device_info *
1288find_dev(U32 busNo, U32 devNo) 1288find_dev(u32 busNo, u32 devNo)
1289{ 1289{
1290 struct bus_info *bus; 1290 struct bus_info *bus;
1291 struct device_info *dev = NULL; 1291 struct device_info *dev = NULL;
@@ -1458,7 +1458,7 @@ Initialize_incoming_thread(void)
1458 * function. 1458 * function.
1459 */ 1459 */
1460void 1460void
1461uislib_enable_channel_interrupts(U32 busNo, U32 devNo, 1461uislib_enable_channel_interrupts(u32 busNo, u32 devNo,
1462 int (*interrupt)(void *), 1462 int (*interrupt)(void *),
1463 void *interrupt_context) 1463 void *interrupt_context)
1464{ 1464{
@@ -1484,7 +1484,7 @@ EXPORT_SYMBOL_GPL(uislib_enable_channel_interrupts);
1484 * Process_Incoming(). 1484 * Process_Incoming().
1485 */ 1485 */
1486void 1486void
1487uislib_disable_channel_interrupts(U32 busNo, U32 devNo) 1487uislib_disable_channel_interrupts(u32 busNo, u32 devNo)
1488{ 1488{
1489 struct device_info *dev; 1489 struct device_info *dev;
1490 dev = find_dev(busNo, devNo); 1490 dev = find_dev(busNo, devNo);
@@ -1517,7 +1517,7 @@ static DECLARE_WORK(Work_wakeup_polling_device_channels,
1517 * your device might have more requests. 1517 * your device might have more requests.
1518 */ 1518 */
1519void 1519void
1520uislib_force_channel_interrupt(U32 busNo, U32 devNo) 1520uislib_force_channel_interrupt(u32 busNo, u32 devNo)
1521{ 1521{
1522 if (en_smart_wakeup == 0) 1522 if (en_smart_wakeup == 0)
1523 return; 1523 return;
diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index 07e5535fc340..c30057b25d13 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -112,7 +112,7 @@ uisctrl_register_req_handler_ex(uuid_le switchTypeGuid,
112 channelBytes), 112 channelBytes),
113 int (*Server_Channel_Init) 113 int (*Server_Channel_Init)
114 (void *x, unsigned char *clientStr, 114 (void *x, unsigned char *clientStr,
115 U32 clientStrLen, U64 bytes), 115 u32 clientStrLen, U64 bytes),
116 ULTRA_VBUS_DEVICEINFO *chipset_DriverInfo) 116 ULTRA_VBUS_DEVICEINFO *chipset_DriverInfo)
117{ 117{
118 ReqHandlerInfo_t *pReqHandlerInfo; 118 ReqHandlerInfo_t *pReqHandlerInfo;
@@ -279,7 +279,7 @@ ReqHandlerAdd(uuid_le switchTypeGuid,
279 unsigned long min_channel_bytes, 279 unsigned long min_channel_bytes,
280 int (*Server_Channel_Ok)(unsigned long channelBytes), 280 int (*Server_Channel_Ok)(unsigned long channelBytes),
281 int (*Server_Channel_Init) 281 int (*Server_Channel_Init)
282 (void *x, unsigned char *clientStr, U32 clientStrLen, U64 bytes)) 282 (void *x, unsigned char *clientStr, u32 clientStrLen, U64 bytes))
283{ 283{
284 ReqHandlerInfo_t *rc = NULL; 284 ReqHandlerInfo_t *rc = NULL;
285 285
diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index 48a03b488c75..b59c1bab9189 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -160,8 +160,8 @@ struct scsipending {
160#define VIRTHBA_ERROR_COUNT 30 160#define VIRTHBA_ERROR_COUNT 30
161#define IOS_ERROR_THRESHOLD 1000 161#define IOS_ERROR_THRESHOLD 1000
162struct virtdisk_info { 162struct virtdisk_info {
163 U32 valid; 163 u32 valid;
164 U32 channel, id, lun; /* Disk Path */ 164 u32 channel, id, lun; /* Disk Path */
165 atomic_t ios_threshold; 165 atomic_t ios_threshold;
166 atomic_t error_count; 166 atomic_t error_count;
167 struct virtdisk_info *next; 167 struct virtdisk_info *next;
@@ -198,7 +198,7 @@ struct virthba_info {
198struct diskaddremove { 198struct diskaddremove {
199 u8 add; /* 0-remove, 1-add */ 199 u8 add; /* 0-remove, 1-add */
200 struct Scsi_Host *shost; /* Scsi Host for this virthba instance */ 200 struct Scsi_Host *shost; /* Scsi Host for this virthba instance */
201 U32 channel, id, lun; /* Disk Path */ 201 u32 channel, id, lun; /* Disk Path */
202 struct diskaddremove *next; 202 struct diskaddremove *next;
203}; 203};
204 204
diff --git a/drivers/staging/unisys/virtpci/virtpci.h b/drivers/staging/unisys/virtpci/virtpci.h
index 7539fcb30d38..6e26956c79f4 100644
--- a/drivers/staging/unisys/virtpci/virtpci.h
+++ b/drivers/staging/unisys/virtpci/virtpci.h
@@ -58,8 +58,8 @@ struct virtpci_dev {
58 * this device */ 58 * this device */
59 unsigned short vendor; /* vendor id for device */ 59 unsigned short vendor; /* vendor id for device */
60 unsigned short device; /* device id for device */ 60 unsigned short device; /* device id for device */
61 U32 busNo; /* number of bus on which device exists */ 61 u32 busNo; /* number of bus on which device exists */
62 U32 deviceNo; /* device's number on the bus */ 62 u32 deviceNo; /* device's number on the bus */
63 struct InterruptInfo intr; /* interrupt info */ 63 struct InterruptInfo intr; /* interrupt info */
64 struct device generic_dev; /* generic device */ 64 struct device generic_dev; /* generic device */
65 union { 65 union {
diff --git a/drivers/staging/unisys/visorchannel/visorchannel.h b/drivers/staging/unisys/visorchannel/visorchannel.h
index 9de4f8a5bfce..352bc5458aa2 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel.h
+++ b/drivers/staging/unisys/visorchannel/visorchannel.h
@@ -56,10 +56,10 @@ int visorchannel_write(VISORCHANNEL *channel, ulong offset,
56 void *local, ulong nbytes); 56 void *local, ulong nbytes);
57int visorchannel_clear(VISORCHANNEL *channel, ulong offset, 57int visorchannel_clear(VISORCHANNEL *channel, ulong offset,
58 u8 ch, ulong nbytes); 58 u8 ch, ulong nbytes);
59BOOL visorchannel_signalremove(VISORCHANNEL *channel, U32 queue, void *msg); 59BOOL visorchannel_signalremove(VISORCHANNEL *channel, u32 queue, void *msg);
60BOOL visorchannel_signalinsert(VISORCHANNEL *channel, U32 queue, void *msg); 60BOOL visorchannel_signalinsert(VISORCHANNEL *channel, u32 queue, void *msg);
61int visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, U32 queue); 61int visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, u32 queue);
62int visorchannel_signalqueue_max_slots(VISORCHANNEL *channel, U32 queue); 62int visorchannel_signalqueue_max_slots(VISORCHANNEL *channel, u32 queue);
63 63
64HOSTADDRESS visorchannel_get_physaddr(VISORCHANNEL *channel); 64HOSTADDRESS visorchannel_get_physaddr(VISORCHANNEL *channel);
65ulong visorchannel_get_nbytes(VISORCHANNEL *channel); 65ulong visorchannel_get_nbytes(VISORCHANNEL *channel);
@@ -70,7 +70,7 @@ uuid_le visorchannel_get_uuid(VISORCHANNEL *channel);
70MEMREGION *visorchannel_get_memregion(VISORCHANNEL *channel); 70MEMREGION *visorchannel_get_memregion(VISORCHANNEL *channel);
71char *visorchannel_uuid_id(uuid_le *guid, char *s); 71char *visorchannel_uuid_id(uuid_le *guid, char *s);
72void visorchannel_debug(VISORCHANNEL *channel, int nQueues, 72void visorchannel_debug(VISORCHANNEL *channel, int nQueues,
73 struct seq_file *seq, U32 off); 73 struct seq_file *seq, u32 off);
74void visorchannel_dump_section(VISORCHANNEL *chan, char *s, 74void visorchannel_dump_section(VISORCHANNEL *chan, char *s,
75 int off, int len, struct seq_file *seq); 75 int off, int len, struct seq_file *seq);
76void __iomem *visorchannel_get_header(VISORCHANNEL *channel); 76void __iomem *visorchannel_get_header(VISORCHANNEL *channel);
diff --git a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
index 8d0964a25352..62ec9280cb3a 100644
--- a/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
+++ b/drivers/staging/unisys/visorchannel/visorchannel_funcs.c
@@ -310,7 +310,7 @@ EXPORT_SYMBOL_GPL(visorchannel_get_header);
310 sizeof((sig_hdr)->FIELD)) >= 0) 310 sizeof((sig_hdr)->FIELD)) >= 0)
311 311
312static BOOL 312static BOOL
313sig_read_header(VISORCHANNEL *channel, U32 queue, 313sig_read_header(VISORCHANNEL *channel, u32 queue,
314 SIGNAL_QUEUE_HEADER *sig_hdr) 314 SIGNAL_QUEUE_HEADER *sig_hdr)
315{ 315{
316 BOOL rc = FALSE; 316 BOOL rc = FALSE;
@@ -336,8 +336,8 @@ Away:
336} 336}
337 337
338static BOOL 338static BOOL
339sig_do_data(VISORCHANNEL *channel, U32 queue, 339sig_do_data(VISORCHANNEL *channel, u32 queue,
340 SIGNAL_QUEUE_HEADER *sig_hdr, U32 slot, void *data, BOOL is_write) 340 SIGNAL_QUEUE_HEADER *sig_hdr, u32 slot, void *data, BOOL is_write)
341{ 341{
342 BOOL rc = FALSE; 342 BOOL rc = FALSE;
343 int signal_data_offset = SIG_DATA_OFFSET(&channel->chan_hdr, queue, 343 int signal_data_offset = SIG_DATA_OFFSET(&channel->chan_hdr, queue,
@@ -362,15 +362,15 @@ Away:
362} 362}
363 363
364static inline BOOL 364static inline BOOL
365sig_read_data(VISORCHANNEL *channel, U32 queue, 365sig_read_data(VISORCHANNEL *channel, u32 queue,
366 SIGNAL_QUEUE_HEADER *sig_hdr, U32 slot, void *data) 366 SIGNAL_QUEUE_HEADER *sig_hdr, u32 slot, void *data)
367{ 367{
368 return sig_do_data(channel, queue, sig_hdr, slot, data, FALSE); 368 return sig_do_data(channel, queue, sig_hdr, slot, data, FALSE);
369} 369}
370 370
371static inline BOOL 371static inline BOOL
372sig_write_data(VISORCHANNEL *channel, U32 queue, 372sig_write_data(VISORCHANNEL *channel, u32 queue,
373 SIGNAL_QUEUE_HEADER *sig_hdr, U32 slot, void *data) 373 SIGNAL_QUEUE_HEADER *sig_hdr, u32 slot, void *data)
374{ 374{
375 return sig_do_data(channel, queue, sig_hdr, slot, data, TRUE); 375 return sig_do_data(channel, queue, sig_hdr, slot, data, TRUE);
376} 376}
@@ -378,7 +378,7 @@ sig_write_data(VISORCHANNEL *channel, U32 queue,
378static inline unsigned char 378static inline unsigned char
379safe_sig_queue_validate(pSIGNAL_QUEUE_HEADER psafe_sqh, 379safe_sig_queue_validate(pSIGNAL_QUEUE_HEADER psafe_sqh,
380 pSIGNAL_QUEUE_HEADER punsafe_sqh, 380 pSIGNAL_QUEUE_HEADER punsafe_sqh,
381 U32 *phead, U32 *ptail) 381 u32 *phead, u32 *ptail)
382{ 382{
383 if ((*phead >= psafe_sqh->MaxSignalSlots) 383 if ((*phead >= psafe_sqh->MaxSignalSlots)
384 || (*ptail >= psafe_sqh->MaxSignalSlots)) { 384 || (*ptail >= psafe_sqh->MaxSignalSlots)) {
@@ -398,7 +398,7 @@ safe_sig_queue_validate(pSIGNAL_QUEUE_HEADER psafe_sqh,
398} /* end safe_sig_queue_validate */ 398} /* end safe_sig_queue_validate */
399 399
400BOOL 400BOOL
401visorchannel_signalremove(VISORCHANNEL *channel, U32 queue, void *msg) 401visorchannel_signalremove(VISORCHANNEL *channel, u32 queue, void *msg)
402{ 402{
403 BOOL rc = FALSE; 403 BOOL rc = FALSE;
404 SIGNAL_QUEUE_HEADER sig_hdr; 404 SIGNAL_QUEUE_HEADER sig_hdr;
@@ -444,7 +444,7 @@ Away:
444EXPORT_SYMBOL_GPL(visorchannel_signalremove); 444EXPORT_SYMBOL_GPL(visorchannel_signalremove);
445 445
446BOOL 446BOOL
447visorchannel_signalinsert(VISORCHANNEL *channel, U32 queue, void *msg) 447visorchannel_signalinsert(VISORCHANNEL *channel, u32 queue, void *msg)
448{ 448{
449 BOOL rc = FALSE; 449 BOOL rc = FALSE;
450 SIGNAL_QUEUE_HEADER sig_hdr; 450 SIGNAL_QUEUE_HEADER sig_hdr;
@@ -498,11 +498,11 @@ EXPORT_SYMBOL_GPL(visorchannel_signalinsert);
498 498
499 499
500int 500int
501visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, U32 queue) 501visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, u32 queue)
502{ 502{
503 SIGNAL_QUEUE_HEADER sig_hdr; 503 SIGNAL_QUEUE_HEADER sig_hdr;
504 U32 slots_avail, slots_used; 504 u32 slots_avail, slots_used;
505 U32 head, tail; 505 u32 head, tail;
506 506
507 if (!sig_read_header(channel, queue, &sig_hdr)) 507 if (!sig_read_header(channel, queue, &sig_hdr))
508 return 0; 508 return 0;
@@ -517,7 +517,7 @@ visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, U32 queue)
517EXPORT_SYMBOL_GPL(visorchannel_signalqueue_slots_avail); 517EXPORT_SYMBOL_GPL(visorchannel_signalqueue_slots_avail);
518 518
519int 519int
520visorchannel_signalqueue_max_slots(VISORCHANNEL *channel, U32 queue) 520visorchannel_signalqueue_max_slots(VISORCHANNEL *channel, u32 queue)
521{ 521{
522 SIGNAL_QUEUE_HEADER sig_hdr; 522 SIGNAL_QUEUE_HEADER sig_hdr;
523 if (!sig_read_header(channel, queue, &sig_hdr)) 523 if (!sig_read_header(channel, queue, &sig_hdr))
@@ -552,7 +552,7 @@ sigqueue_debug(SIGNAL_QUEUE_HEADER *q, int which, struct seq_file *seq)
552 552
553void 553void
554visorchannel_debug(VISORCHANNEL *channel, int nQueues, 554visorchannel_debug(VISORCHANNEL *channel, int nQueues,
555 struct seq_file *seq, U32 off) 555 struct seq_file *seq, u32 off)
556{ 556{
557 HOSTADDRESS addr = 0; 557 HOSTADDRESS addr = 0;
558 ulong nbytes = 0, nbytes_region = 0; 558 ulong nbytes = 0, nbytes_region = 0;
diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 4274dd2dbbd1..0b1bff7aa017 100644
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -41,7 +41,7 @@ struct PARSER_CONTEXT_Tag {
41}; 41};
42 42
43static PARSER_CONTEXT * 43static PARSER_CONTEXT *
44parser_init_guts(U64 addr, U32 bytes, BOOL isLocal, 44parser_init_guts(U64 addr, u32 bytes, BOOL isLocal,
45 BOOL hasStandardPayloadHeader, BOOL *tryAgain) 45 BOOL hasStandardPayloadHeader, BOOL *tryAgain)
46{ 46{
47 int allocbytes = sizeof(PARSER_CONTEXT) + bytes; 47 int allocbytes = sizeof(PARSER_CONTEXT) + bytes;
@@ -152,7 +152,7 @@ Away:
152} 152}
153 153
154PARSER_CONTEXT * 154PARSER_CONTEXT *
155parser_init(U64 addr, U32 bytes, BOOL isLocal, BOOL *tryAgain) 155parser_init(U64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
156{ 156{
157 return parser_init_guts(addr, bytes, isLocal, TRUE, tryAgain); 157 return parser_init_guts(addr, bytes, isLocal, TRUE, tryAgain);
158} 158}
@@ -163,7 +163,7 @@ parser_init(U64 addr, U32 bytes, BOOL isLocal, BOOL *tryAgain)
163 * parser_byteStream_get() to obtain the data. 163 * parser_byteStream_get() to obtain the data.
164 */ 164 */
165PARSER_CONTEXT * 165PARSER_CONTEXT *
166parser_init_byteStream(U64 addr, U32 bytes, BOOL isLocal, BOOL *tryAgain) 166parser_init_byteStream(U64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
167{ 167{
168 return parser_init_guts(addr, bytes, isLocal, FALSE, tryAgain); 168 return parser_init_guts(addr, bytes, isLocal, FALSE, tryAgain);
169} 169}
diff --git a/drivers/staging/unisys/visorchipset/parser.h b/drivers/staging/unisys/visorchipset/parser.h
index be85fd68c0c4..30bc9a1df84c 100644
--- a/drivers/staging/unisys/visorchipset/parser.h
+++ b/drivers/staging/unisys/visorchipset/parser.h
@@ -33,8 +33,8 @@ typedef enum {
33 33
34typedef struct PARSER_CONTEXT_Tag PARSER_CONTEXT; 34typedef struct PARSER_CONTEXT_Tag PARSER_CONTEXT;
35 35
36PARSER_CONTEXT *parser_init(U64 addr, U32 bytes, BOOL isLocal, BOOL *tryAgain); 36PARSER_CONTEXT *parser_init(U64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain);
37PARSER_CONTEXT *parser_init_byteStream(U64 addr, U32 bytes, BOOL isLocal, 37PARSER_CONTEXT *parser_init_byteStream(U64 addr, u32 bytes, BOOL isLocal,
38 BOOL *tryAgain); 38 BOOL *tryAgain);
39void parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string); 39void parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string);
40void *parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize); 40void *parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize);
diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
index ef2bc23c4e88..954040c95780 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset.h
+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
@@ -32,10 +32,10 @@
32 * been received for a bus or device. 32 * been received for a bus or device.
33 */ 33 */
34typedef struct { 34typedef struct {
35 U32 created:1; 35 u32 created:1;
36 U32 attached:1; 36 u32 attached:1;
37 U32 configured:1; 37 u32 configured:1;
38 U32 running:1; 38 u32 running:1;
39 /* Add new fields above. */ 39 /* Add new fields above. */
40 /* Remaining bits in this 32-bit word are unused. */ 40 /* Remaining bits in this 32-bit word are unused. */
41} VISORCHIPSET_STATE; 41} VISORCHIPSET_STATE;
@@ -77,15 +77,15 @@ typedef struct {
77 */ 77 */
78typedef struct { 78typedef struct {
79 struct list_head entry; 79 struct list_head entry;
80 U32 busNo; 80 u32 busNo;
81 U32 devNo; 81 u32 devNo;
82 uuid_le devInstGuid; 82 uuid_le devInstGuid;
83 VISORCHIPSET_STATE state; 83 VISORCHIPSET_STATE state;
84 VISORCHIPSET_CHANNEL_INFO chanInfo; 84 VISORCHIPSET_CHANNEL_INFO chanInfo;
85 U32 Reserved1; /* CONTROLVM_ID */ 85 u32 Reserved1; /* CONTROLVM_ID */
86 U64 Reserved2; 86 U64 Reserved2;
87 U32 switchNo; /* when devState.attached==1 */ 87 u32 switchNo; /* when devState.attached==1 */
88 U32 internalPortNo; /* when devState.attached==1 */ 88 u32 internalPortNo; /* when devState.attached==1 */
89 CONTROLVM_MESSAGE_HEADER pendingMsgHdr; /* CONTROLVM_MESSAGE */ 89 CONTROLVM_MESSAGE_HEADER pendingMsgHdr; /* CONTROLVM_MESSAGE */
90 /** For private use by the bus driver */ 90 /** For private use by the bus driver */
91 void *bus_driver_context; 91 void *bus_driver_context;
@@ -93,7 +93,7 @@ typedef struct {
93} VISORCHIPSET_DEVICE_INFO; 93} VISORCHIPSET_DEVICE_INFO;
94 94
95static inline VISORCHIPSET_DEVICE_INFO * 95static inline VISORCHIPSET_DEVICE_INFO *
96finddevice(struct list_head *list, U32 busNo, U32 devNo) 96finddevice(struct list_head *list, u32 busNo, u32 devNo)
97{ 97{
98 VISORCHIPSET_DEVICE_INFO *p; 98 VISORCHIPSET_DEVICE_INFO *p;
99 99
@@ -104,7 +104,7 @@ finddevice(struct list_head *list, U32 busNo, U32 devNo)
104 return NULL; 104 return NULL;
105} 105}
106 106
107static inline void delbusdevices(struct list_head *list, U32 busNo) 107static inline void delbusdevices(struct list_head *list, u32 busNo)
108{ 108{
109 VISORCHIPSET_DEVICE_INFO *p, *tmp; 109 VISORCHIPSET_DEVICE_INFO *p, *tmp;
110 110
@@ -124,7 +124,7 @@ static inline void delbusdevices(struct list_head *list, U32 busNo)
124 */ 124 */
125typedef struct { 125typedef struct {
126 struct list_head entry; 126 struct list_head entry;
127 U32 busNo; 127 u32 busNo;
128 VISORCHIPSET_STATE state; 128 VISORCHIPSET_STATE state;
129 VISORCHIPSET_CHANNEL_INFO chanInfo; 129 VISORCHIPSET_CHANNEL_INFO chanInfo;
130 uuid_le partitionGuid; 130 uuid_le partitionGuid;
@@ -132,10 +132,10 @@ typedef struct {
132 u8 *name; /* UTF8 */ 132 u8 *name; /* UTF8 */
133 u8 *description; /* UTF8 */ 133 u8 *description; /* UTF8 */
134 U64 Reserved1; 134 U64 Reserved1;
135 U32 Reserved2; 135 u32 Reserved2;
136 MYPROCOBJECT *procObject; 136 MYPROCOBJECT *procObject;
137 struct { 137 struct {
138 U32 server:1; 138 u32 server:1;
139 /* Add new fields above. */ 139 /* Add new fields above. */
140 /* Remaining bits in this 32-bit word are unused. */ 140 /* Remaining bits in this 32-bit word are unused. */
141 } flags; 141 } flags;
@@ -147,7 +147,7 @@ typedef struct {
147} VISORCHIPSET_BUS_INFO; 147} VISORCHIPSET_BUS_INFO;
148 148
149static inline VISORCHIPSET_BUS_INFO * 149static inline VISORCHIPSET_BUS_INFO *
150findbus(struct list_head *list, U32 busNo) 150findbus(struct list_head *list, u32 busNo)
151{ 151{
152 VISORCHIPSET_BUS_INFO *p; 152 VISORCHIPSET_BUS_INFO *p;
153 153
@@ -161,7 +161,7 @@ findbus(struct list_head *list, U32 busNo)
161/** Attributes for a particular Supervisor switch. 161/** Attributes for a particular Supervisor switch.
162 */ 162 */
163typedef struct { 163typedef struct {
164 U32 switchNo; 164 u32 switchNo;
165 VISORCHIPSET_STATE state; 165 VISORCHIPSET_STATE state;
166 uuid_le switchTypeGuid; 166 uuid_le switchTypeGuid;
167 u8 *authService1; 167 u8 *authService1;
@@ -169,7 +169,7 @@ typedef struct {
169 u8 *authService3; 169 u8 *authService3;
170 u8 *securityContext; 170 u8 *securityContext;
171 U64 Reserved; 171 U64 Reserved;
172 U32 Reserved2; /* CONTROLVM_ID */ 172 u32 Reserved2; /* CONTROLVM_ID */
173 struct device dev; 173 struct device dev;
174 BOOL dev_exists; 174 BOOL dev_exists;
175 CONTROLVM_MESSAGE_HEADER pendingMsgHdr; 175 CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
@@ -180,8 +180,8 @@ typedef struct {
180 * to a specific switch. 180 * to a specific switch.
181 */ 181 */
182typedef struct { 182typedef struct {
183 U32 switchNo; 183 u32 switchNo;
184 U32 externalPortNo; 184 u32 externalPortNo;
185 VISORCHIPSET_STATE state; 185 VISORCHIPSET_STATE state;
186 uuid_le networkZoneGuid; 186 uuid_le networkZoneGuid;
187 int pdPort; 187 int pdPort;
@@ -192,7 +192,7 @@ typedef struct {
192 u8 *ipGateway; 192 u8 *ipGateway;
193 u8 *ipDNS; 193 u8 *ipDNS;
194 U64 Reserved1; 194 U64 Reserved1;
195 U32 Reserved2; /* CONTROLVM_ID */ 195 u32 Reserved2; /* CONTROLVM_ID */
196 struct device dev; 196 struct device dev;
197 BOOL dev_exists; 197 BOOL dev_exists;
198 CONTROLVM_MESSAGE_HEADER pendingMsgHdr; 198 CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
@@ -203,13 +203,13 @@ typedef struct {
203 * device connects to a particular switch. 203 * device connects to a particular switch.
204 */ 204 */
205typedef struct { 205typedef struct {
206 U32 switchNo; 206 u32 switchNo;
207 U32 internalPortNo; 207 u32 internalPortNo;
208 VISORCHIPSET_STATE state; 208 VISORCHIPSET_STATE state;
209 U32 busNo; /* valid only when state.attached == 1 */ 209 u32 busNo; /* valid only when state.attached == 1 */
210 U32 devNo; /* valid only when state.attached == 1 */ 210 u32 devNo; /* valid only when state.attached == 1 */
211 U64 Reserved1; 211 U64 Reserved1;
212 U32 Reserved2; /* CONTROLVM_ID */ 212 u32 Reserved2; /* CONTROLVM_ID */
213 CONTROLVM_MESSAGE_HEADER pendingMsgHdr; 213 CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
214 MYPROCOBJECT *procObject; 214 MYPROCOBJECT *procObject;
215 215
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index e9e15535e749..c139f0a03ffc 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -107,7 +107,7 @@ typedef struct {
107 u8 __iomem *ptr; /* pointer to base address of payload pool */ 107 u8 __iomem *ptr; /* pointer to base address of payload pool */
108 U64 offset; /* offset from beginning of controlvm 108 U64 offset; /* offset from beginning of controlvm
109 * channel to beginning of payload * pool */ 109 * channel to beginning of payload * pool */
110 U32 bytes; /* number of bytes in payload pool */ 110 u32 bytes; /* number of bytes in payload pool */
111} CONTROLVM_PAYLOAD_INFO; 111} CONTROLVM_PAYLOAD_INFO;
112 112
113/* Manages the request payload in the controlvm channel */ 113/* Manages the request payload in the controlvm channel */
@@ -695,7 +695,7 @@ controlvm_init_response(CONTROLVM_MESSAGE *msg,
695 msg->hdr.PayloadMaxBytes = 0; 695 msg->hdr.PayloadMaxBytes = 0;
696 if (response < 0) { 696 if (response < 0) {
697 msg->hdr.Flags.failed = 1; 697 msg->hdr.Flags.failed = 1;
698 msg->hdr.CompletionStatus = (U32) (-response); 698 msg->hdr.CompletionStatus = (u32) (-response);
699 } 699 }
700} 700}
701 701
@@ -756,7 +756,7 @@ controlvm_respond_physdev_changestate(CONTROLVM_MESSAGE_HEADER *msgHdr,
756void 756void
757visorchipset_save_message(CONTROLVM_MESSAGE *msg, CRASH_OBJ_TYPE type) 757visorchipset_save_message(CONTROLVM_MESSAGE *msg, CRASH_OBJ_TYPE type)
758{ 758{
759 U32 localSavedCrashMsgOffset; 759 u32 localSavedCrashMsgOffset;
760 u16 localSavedCrashMsgCount; 760 u16 localSavedCrashMsgCount;
761 761
762 /* get saved message count */ 762 /* get saved message count */
@@ -783,7 +783,7 @@ visorchipset_save_message(CONTROLVM_MESSAGE *msg, CRASH_OBJ_TYPE type)
783 if (visorchannel_read(ControlVm_channel, 783 if (visorchannel_read(ControlVm_channel,
784 offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL, 784 offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL,
785 SavedCrashMsgOffset), 785 SavedCrashMsgOffset),
786 &localSavedCrashMsgOffset, sizeof(U32)) < 0) { 786 &localSavedCrashMsgOffset, sizeof(u32)) < 0) {
787 LOGERR("failed to get Saved Message Offset"); 787 LOGERR("failed to get Saved Message Offset");
788 POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC, 788 POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
789 POSTCODE_SEVERITY_ERR); 789 POSTCODE_SEVERITY_ERR);
@@ -840,7 +840,7 @@ bus_responder(CONTROLVM_ID cmdId, ulong busNo, int response)
840 LOGERR("bus_responder no pending msg"); 840 LOGERR("bus_responder no pending msg");
841 return; /* no controlvm response needed */ 841 return; /* no controlvm response needed */
842 } 842 }
843 if (p->pendingMsgHdr.Id != (U32) cmdId) { 843 if (p->pendingMsgHdr.Id != (u32) cmdId) {
844 LOGERR("expected=%d, found=%d", cmdId, p->pendingMsgHdr.Id); 844 LOGERR("expected=%d, found=%d", cmdId, p->pendingMsgHdr.Id);
845 return; 845 return;
846 } 846 }
@@ -911,7 +911,7 @@ device_responder(CONTROLVM_ID cmdId, ulong busNo, ulong devNo, int response)
911 LOGERR("device_responder no pending msg"); 911 LOGERR("device_responder no pending msg");
912 return; /* no controlvm response needed */ 912 return; /* no controlvm response needed */
913 } 913 }
914 if (p->pendingMsgHdr.Id != (U32) cmdId) { 914 if (p->pendingMsgHdr.Id != (u32) cmdId) {
915 LOGERR("expected=%d, found=%d", cmdId, p->pendingMsgHdr.Id); 915 LOGERR("expected=%d, found=%d", cmdId, p->pendingMsgHdr.Id);
916 return; 916 return;
917 } 917 }
@@ -922,8 +922,8 @@ device_responder(CONTROLVM_ID cmdId, ulong busNo, ulong devNo, int response)
922} 922}
923 923
924static void 924static void
925bus_epilog(U32 busNo, 925bus_epilog(u32 busNo,
926 U32 cmd, CONTROLVM_MESSAGE_HEADER *msgHdr, 926 u32 cmd, CONTROLVM_MESSAGE_HEADER *msgHdr,
927 int response, BOOL needResponse) 927 int response, BOOL needResponse)
928{ 928{
929 BOOL notified = FALSE; 929 BOOL notified = FALSE;
@@ -989,7 +989,7 @@ bus_epilog(U32 busNo,
989} 989}
990 990
991static void 991static void
992device_epilog(U32 busNo, U32 devNo, ULTRA_SEGMENT_STATE state, U32 cmd, 992device_epilog(u32 busNo, u32 devNo, ULTRA_SEGMENT_STATE state, u32 cmd,
993 CONTROLVM_MESSAGE_HEADER *msgHdr, int response, 993 CONTROLVM_MESSAGE_HEADER *msgHdr, int response,
994 BOOL needResponse, BOOL for_visorbus) 994 BOOL needResponse, BOOL for_visorbus)
995{ 995{
@@ -1366,7 +1366,7 @@ Away:
1366 * for failure. 1366 * for failure.
1367 */ 1367 */
1368static int 1368static int
1369initialize_controlvm_payload_info(HOSTADDRESS phys_addr, U64 offset, U32 bytes, 1369initialize_controlvm_payload_info(HOSTADDRESS phys_addr, U64 offset, u32 bytes,
1370 CONTROLVM_PAYLOAD_INFO *info) 1370 CONTROLVM_PAYLOAD_INFO *info)
1371{ 1371{
1372 u8 __iomem *payload = NULL; 1372 u8 __iomem *payload = NULL;
@@ -1424,7 +1424,7 @@ initialize_controlvm_payload(void)
1424{ 1424{
1425 HOSTADDRESS phys_addr = visorchannel_get_physaddr(ControlVm_channel); 1425 HOSTADDRESS phys_addr = visorchannel_get_physaddr(ControlVm_channel);
1426 U64 payloadOffset = 0; 1426 U64 payloadOffset = 0;
1427 U32 payloadBytes = 0; 1427 u32 payloadBytes = 0;
1428 if (visorchannel_read(ControlVm_channel, 1428 if (visorchannel_read(ControlVm_channel,
1429 offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL, 1429 offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL,
1430 RequestPayloadOffset), 1430 RequestPayloadOffset),
@@ -1764,7 +1764,7 @@ handle_command(CONTROLVM_MESSAGE inmsg, HOSTADDRESS channel_addr)
1764{ 1764{
1765 CONTROLVM_MESSAGE_PACKET *cmd = &inmsg.cmd; 1765 CONTROLVM_MESSAGE_PACKET *cmd = &inmsg.cmd;
1766 U64 parametersAddr = 0; 1766 U64 parametersAddr = 0;
1767 U32 parametersBytes = 0; 1767 u32 parametersBytes = 0;
1768 PARSER_CONTEXT *parser_ctx = NULL; 1768 PARSER_CONTEXT *parser_ctx = NULL;
1769 BOOL isLocalAddr = FALSE; 1769 BOOL isLocalAddr = FALSE;
1770 CONTROLVM_MESSAGE ackmsg; 1770 CONTROLVM_MESSAGE ackmsg;
@@ -1900,7 +1900,7 @@ handle_command(CONTROLVM_MESSAGE inmsg, HOSTADDRESS channel_addr)
1900HOSTADDRESS controlvm_get_channel_address(void) 1900HOSTADDRESS controlvm_get_channel_address(void)
1901{ 1901{
1902 U64 addr = 0; 1902 U64 addr = 0;
1903 U32 size = 0; 1903 u32 size = 0;
1904 1904
1905 if (!VMCALL_SUCCESSFUL(Issue_VMCALL_IO_CONTROLVM_ADDR(&addr, &size))) { 1905 if (!VMCALL_SUCCESSFUL(Issue_VMCALL_IO_CONTROLVM_ADDR(&addr, &size))) {
1906 ERRDRV("%s - vmcall to determine controlvm channel addr failed", 1906 ERRDRV("%s - vmcall to determine controlvm channel addr failed",
@@ -2027,7 +2027,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
2027 CONTROLVM_MESSAGE localCrashCreateBusMsg; 2027 CONTROLVM_MESSAGE localCrashCreateBusMsg;
2028 CONTROLVM_MESSAGE localCrashCreateDevMsg; 2028 CONTROLVM_MESSAGE localCrashCreateDevMsg;
2029 CONTROLVM_MESSAGE msg; 2029 CONTROLVM_MESSAGE msg;
2030 U32 localSavedCrashMsgOffset; 2030 u32 localSavedCrashMsgOffset;
2031 u16 localSavedCrashMsgCount; 2031 u16 localSavedCrashMsgCount;
2032 2032
2033 /* make sure visorbus server is registered for controlvm callbacks */ 2033 /* make sure visorbus server is registered for controlvm callbacks */
@@ -2073,7 +2073,7 @@ setup_crash_devices_work_queue(struct work_struct *work)
2073 if (visorchannel_read(ControlVm_channel, 2073 if (visorchannel_read(ControlVm_channel,
2074 offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL, 2074 offsetof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL,
2075 SavedCrashMsgOffset), 2075 SavedCrashMsgOffset),
2076 &localSavedCrashMsgOffset, sizeof(U32)) < 0) { 2076 &localSavedCrashMsgOffset, sizeof(u32)) < 0) {
2077 LOGERR("failed to get Saved Message Offset"); 2077 LOGERR("failed to get Saved Message Offset");
2078 POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC, 2078 POSTCODE_LINUX_2(CRASH_DEV_CTRL_RD_FAILURE_PC,
2079 POSTCODE_SEVERITY_ERR); 2079 POSTCODE_SEVERITY_ERR);
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-12 02:49:15 -0400