aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/unisys/common-spar
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/unisys/common-spar')
-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
7 files changed, 154 insertions, 154 deletions
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 {
* access channel anytime */
} CHANNEL_CLIENTSTATE;
static inline const u8 *
-ULTRA_CHANNELCLI_STRING(U32 v)
+ULTRA_CHANNELCLI_STRING(u32 v)
{
switch (v) {
case CHANNELCLI_DETACHED:
@@ -210,33 +210,33 @@ ULTRA_CHANNELCLI_STRING(U32 v)
/* Common Channel Header */
typedef struct _CHANNEL_HEADER {
U64 Signature; /* Signature */
- U32 LegacyState; /* DEPRECATED - being replaced by */
+ u32 LegacyState; /* DEPRECATED - being replaced by */
/* / SrvState, CliStateBoot, and CliStateOS below */
- U32 HeaderSize; /* sizeof(CHANNEL_HEADER) */
+ u32 HeaderSize; /* sizeof(CHANNEL_HEADER) */
U64 Size; /* Total size of this channel in bytes */
U64 Features; /* Flags to modify behavior */
uuid_le Type; /* Channel type: data, bus, control, etc. */
U64 PartitionHandle; /* ID of guest partition */
U64 Handle; /* Device number of this channel in client */
U64 oChannelSpace; /* Offset in bytes to channel specific area */
- U32 VersionId; /* CHANNEL_HEADER Version ID */
- U32 PartitionIndex; /* Index of guest partition */
+ u32 VersionId; /* CHANNEL_HEADER Version ID */
+ u32 PartitionIndex; /* Index of guest partition */
uuid_le ZoneGuid; /* Guid of Channel's zone */
- U32 oClientString; /* offset from channel header to
+ u32 oClientString; /* offset from channel header to
* nul-terminated ClientString (0 if
* ClientString not present) */
- U32 CliStateBoot; /* CHANNEL_CLIENTSTATE of pre-boot
+ u32 CliStateBoot; /* CHANNEL_CLIENTSTATE of pre-boot
* EFI client of this channel */
- U32 CmdStateCli; /* CHANNEL_COMMANDSTATE (overloaded in
+ u32 CmdStateCli; /* CHANNEL_COMMANDSTATE (overloaded in
* Windows drivers, see ServerStateUp,
* ServerStateDown, etc) */
- U32 CliStateOS; /* CHANNEL_CLIENTSTATE of Guest OS
+ u32 CliStateOS; /* CHANNEL_CLIENTSTATE of Guest OS
* client of this channel */
- U32 ChannelCharacteristics; /* CHANNEL_CHARACTERISTIC_<xxx> */
- U32 CmdStateSrv; /* CHANNEL_COMMANDSTATE (overloaded in
+ u32 ChannelCharacteristics; /* CHANNEL_CHARACTERISTIC_<xxx> */
+ u32 CmdStateSrv; /* CHANNEL_COMMANDSTATE (overloaded in
* Windows drivers, see ServerStateUp,
* ServerStateDown, etc) */
- U32 SrvState; /* CHANNEL_SERVERSTATE */
+ u32 SrvState; /* CHANNEL_SERVERSTATE */
u8 CliErrorBoot; /* bits to indicate err states for
* boot clients, so err messages can
* be throttled */
@@ -253,25 +253,25 @@ typedef struct _CHANNEL_HEADER {
/* Subheader for the Signal Type variation of the Common Channel */
typedef struct _SIGNAL_QUEUE_HEADER {
/* 1st cache line */
- U32 VersionId; /* SIGNAL_QUEUE_HEADER Version ID */
- U32 Type; /* Queue type: storage, network */
+ u32 VersionId; /* SIGNAL_QUEUE_HEADER Version ID */
+ u32 Type; /* Queue type: storage, network */
U64 Size; /* Total size of this queue in bytes */
U64 oSignalBase; /* Offset to signal queue area */
U64 FeatureFlags; /* Flags to modify behavior */
U64 NumSignalsSent; /* Total # of signals placed in this queue */
U64 NumOverflows; /* Total # of inserts failed due to
* full queue */
- U32 SignalSize; /* Total size of a signal for this queue */
- U32 MaxSignalSlots; /* Max # of slots in queue, 1 slot is
+ u32 SignalSize; /* Total size of a signal for this queue */
+ u32 MaxSignalSlots; /* Max # of slots in queue, 1 slot is
* always empty */
- U32 MaxSignals; /* Max # of signals in queue
+ u32 MaxSignals; /* Max # of signals in queue
* (MaxSignalSlots-1) */
- U32 Head; /* Queue head signal # */
+ u32 Head; /* Queue head signal # */
/* 2nd cache line */
U64 NumSignalsReceived; /* Total # of signals removed from this queue */
- U32 Tail; /* Queue tail signal # (on separate
+ u32 Tail; /* Queue tail signal # (on separate
* cache line) */
- U32 Reserved1; /* Reserved field */
+ u32 Reserved1; /* Reserved field */
U64 Reserved2; /* Resrved field */
U64 ClientQueue;
U64 NumInterruptsReceived; /* Total # of Interrupts received. This
@@ -280,7 +280,7 @@ typedef struct _SIGNAL_QUEUE_HEADER {
U64 NumEmptyCnt; /* Number of times that visor_signal_remove
* is called and returned Empty
* Status. */
- U32 ErrorFlags; /* Error bits set during SignalReinit
+ u32 ErrorFlags; /* Error bits set during SignalReinit
* to denote trouble with client's
* fields */
u8 Filler[12]; /* Pad out to 64 byte cacheline */
@@ -312,7 +312,7 @@ ULTRA_check_channel_client(void __iomem *pChannel,
uuid_le expectedTypeGuid,
char *channelName,
U64 expectedMinBytes,
- U32 expectedVersionId,
+ u32 expectedVersionId,
U64 expectedSignature,
char *fileName, int lineNumber, void *logCtx)
{
@@ -588,7 +588,7 @@ ULTRA_channel_client_release_os(void __iomem *pChannel, u8 *chanId,
* full.
*/
-unsigned char visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, U32 Queue,
+unsigned char visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, u32 Queue,
void *pSignal);
/*
@@ -610,7 +610,7 @@ unsigned char visor_signal_insert(CHANNEL_HEADER __iomem *pChannel, U32 Queue,
* empty.
*/
-unsigned char visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, U32 Queue,
+unsigned char visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, u32 Queue,
void *pSignal);
/*
@@ -632,7 +632,7 @@ unsigned char visor_signal_remove(CHANNEL_HEADER __iomem *pChannel, U32 Queue,
* Return value:
* # of signals copied.
*/
-unsigned int SignalRemoveAll(pCHANNEL_HEADER pChannel, U32 Queue,
+unsigned int SignalRemoveAll(pCHANNEL_HEADER pChannel, u32 Queue,
void *pSignal);
/*
@@ -647,6 +647,6 @@ unsigned int SignalRemoveAll(pCHANNEL_HEADER pChannel, U32 Queue,
* 1 if the signal queue is empty, 0 otherwise.
*/
unsigned char visor_signalqueue_empty(CHANNEL_HEADER __iomem *pChannel,
- U32 Queue);
+ u32 Queue);
#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 {
* increment thereafter */
u8 Minor;
u16 Maintenance;
- U32 Revision; /* Subversion revision */
+ u32 Revision; /* Subversion revision */
} Part;
} ULTRA_COMPONENT_VERSION;
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 {
/**< specifies interrupt vector. It, interrupt pin, and shared are
* used to connect to the corresponding interrupt. Used by
* IOPart-GP only. */
- U32 recvInterruptVector;
+ u32 recvInterruptVector;
/**< specifies if the recvInterrupt is shared. It, interrupt pin
* and vector are used to connect to 0 = not shared; 1 = shared.
@@ -159,33 +159,33 @@ struct PciConfigHdr {
u16 SubSysVendor;
u16 DeviceId;
u16 SubSysDevice;
- U32 ClassCode;
- U32 Reserved; /* Natural alignment purposes */
+ u32 ClassCode;
+ u32 Reserved; /* Natural alignment purposes */
};
struct ScsiId {
- U32 Bus;
- U32 Target;
- U32 Lun;
- U32 Host; /* Command should ignore this for *
+ u32 Bus;
+ u32 Target;
+ u32 Lun;
+ u32 Host; /* Command should ignore this for *
* DiskArrival/RemovalEvents */
};
struct WWID {
- U32 wwid1;
- U32 wwid2;
+ u32 wwid1;
+ u32 wwid2;
};
struct virtDiskInfo {
- U32 switchNo; /* defined by SWITCH_CREATE */
- U32 externalPortNo; /* 0 for SAS RAID provided (external)
+ u32 switchNo; /* defined by SWITCH_CREATE */
+ u32 externalPortNo; /* 0 for SAS RAID provided (external)
* virtual disks, 1 for virtual disk
* images, 2 for gold disk images */
u16 VirtualDiskIndex; /* Index of disk descriptor in the
* VirtualDisk segment associated with
* externalPortNo */
u16 Reserved1;
- U32 Reserved2;
+ u32 Reserved2;
};
typedef enum {
@@ -237,59 +237,59 @@ typedef enum {
* looking at the flags.response field.
*/
typedef struct _CONTROLVM_MESSAGE_HEADER {
- U32 Id; /* See CONTROLVM_ID. */
+ u32 Id; /* See CONTROLVM_ID. */
/* For requests, indicates the message type. */
/* For responses, indicates the type of message we are responding to. */
- U32 MessageSize; /* Includes size of this struct + size
+ u32 MessageSize; /* Includes size of this struct + size
* of message */
- U32 SegmentIndex; /* Index of segment containing Vm
+ u32 SegmentIndex; /* Index of segment containing Vm
* message/information */
- U32 CompletionStatus; /* Error status code or result of
+ u32 CompletionStatus; /* Error status code or result of
* message completion */
struct {
- U32 failed:1; /**< =1 in a response to * signify
+ u32 failed:1; /**< =1 in a response to * signify
* failure */
- U32 responseExpected:1; /**< =1 in all messages that expect a
+ u32 responseExpected:1; /**< =1 in all messages that expect a
* response (Control ignores this
* bit) */
- U32 server:1; /**< =1 in all bus & device-related
+ u32 server:1; /**< =1 in all bus & device-related
* messages where the message
* receiver is to act as the bus or
* device server */
- U32 testMessage:1; /**< =1 for testing use only
+ u32 testMessage:1; /**< =1 for testing use only
* (Control and Command ignore this
* bit) */
- U32 partialCompletion:1; /**< =1 if there are forthcoming
+ u32 partialCompletion:1; /**< =1 if there are forthcoming
* responses/acks associated
* with this message */
- U32 preserve:1; /**< =1 this is to let us know to
+ u32 preserve:1; /**< =1 this is to let us know to
* preserve channel contents
* (for running guests)*/
- U32 writerInDiag:1; /**< =1 the DiagWriter is active in the
+ u32 writerInDiag:1; /**< =1 the DiagWriter is active in the
* Diagnostic Partition*/
/* remaining bits in this 32-bit word are available */
} Flags;
- U32 Reserved; /* Natural alignment */
+ u32 Reserved; /* Natural alignment */
U64 MessageHandle; /* Identifies the particular message instance,
* and is used to match particular */
/* request instances with the corresponding response instance. */
U64 PayloadVmOffset; /* Offset of payload area from start of this
* instance of ControlVm segment */
- U32 PayloadMaxBytes; /* Maximum bytes allocated in payload
+ u32 PayloadMaxBytes; /* Maximum bytes allocated in payload
* area of ControlVm segment */
- U32 PayloadBytes; /* Actual number of bytes of payload
+ u32 PayloadBytes; /* Actual number of bytes of payload
* area to copy between IO/Command; */
/* if non-zero, there is a payload to copy. */
} CONTROLVM_MESSAGE_HEADER;
typedef struct _CONTROLVM_PACKET_DEVICE_CREATE {
- U32 busNo; /**< bus # (0..n-1) from the msg receiver's
+ u32 busNo; /**< bus # (0..n-1) from the msg receiver's
* perspective */
/* Control uses header SegmentIndex field to access bus number... */
- U32 devNo; /**< bus-relative (0..n-1) device number */
+ u32 devNo; /**< bus-relative (0..n-1) device number */
U64 channelAddr; /**< Guest physical address of the channel, which
* can be dereferenced by the receiver
* of this ControlVm command */
@@ -300,11 +300,11 @@ typedef struct _CONTROLVM_PACKET_DEVICE_CREATE {
} CONTROLVM_PACKET_DEVICE_CREATE; /* for CONTROLVM_DEVICE_CREATE */
typedef struct _CONTROLVM_PACKET_DEVICE_CONFIGURE {
- U32 busNo; /**< bus # (0..n-1) from the msg
+ u32 busNo; /**< bus # (0..n-1) from the msg
* receiver's perspective */
/* Control uses header SegmentIndex field to access bus number... */
- U32 devNo; /**< bus-relative (0..n-1) device number */
+ u32 devNo; /**< bus-relative (0..n-1) device number */
} CONTROLVM_PACKET_DEVICE_CONFIGURE; /* for CONTROLVM_DEVICE_CONFIGURE */
typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE {
@@ -323,11 +323,11 @@ typedef struct _CONTROLVM_MESSAGE_PACKET {
/* BEGIN Request messages */
struct {
- U32 busNo; /*< bus # (0..n-1) from the msg
+ u32 busNo; /*< bus # (0..n-1) from the msg
* receiver's perspective */
/* Control uses header SegmentIndex field to access bus number... */
- U32 deviceCount; /*< indicates the max number of
+ u32 deviceCount; /*< indicates the max number of
* devices on this bus */
U64 channelAddr; /*< Guest physical address of the
* channel, which can be
@@ -339,19 +339,19 @@ typedef struct _CONTROLVM_MESSAGE_PACKET {
uuid_le busInstGuid; /*< instance guid for the bus */
} createBus; /* for CONTROLVM_BUS_CREATE */
struct {
- U32 busNo; /*< bus # (0..n-1) from the msg
+ u32 busNo; /*< bus # (0..n-1) from the msg
* receiver's perspective */
/* Control uses header SegmentIndex field to access bus number... */
- U32 reserved; /* Natural alignment purposes */
+ u32 reserved; /* Natural alignment purposes */
} destroyBus; /* for CONTROLVM_BUS_DESTROY */
struct {
- U32 busNo; /*< bus # (0..n-1) from the
+ u32 busNo; /*< bus # (0..n-1) from the
* msg receiver's
* perspective */
/* Control uses header SegmentIndex field to access bus number... */
- U32 reserved1; /* for alignment purposes */
+ u32 reserved1; /* for alignment purposes */
U64 guestHandle; /* This is used to convert
* guest physical address to real
* physical address for DMA, for ex. */
@@ -368,57 +368,57 @@ typedef struct _CONTROLVM_MESSAGE_PACKET {
/* for CONTROLVM_DEVICE_CREATE */
CONTROLVM_PACKET_DEVICE_CREATE createDevice;
struct {
- U32 busNo; /*< bus # (0..n-1) from the msg
+ u32 busNo; /*< bus # (0..n-1) from the msg
* receiver's perspective */
/* Control uses header SegmentIndex field to access bus number... */
- U32 devNo; /*< bus-relative (0..n-1) device
+ u32 devNo; /*< bus-relative (0..n-1) device
* number */
} destroyDevice; /* for CONTROLVM_DEVICE_DESTROY */
/* for CONTROLVM_DEVICE_CONFIGURE */
CONTROLVM_PACKET_DEVICE_CONFIGURE configureDevice;
struct {
- U32 busNo; /*< bus # (0..n-1) from the msg
+ u32 busNo; /*< bus # (0..n-1) from the msg
* receiver's perspective */
/* Control uses header SegmentIndex field to access bus number... */
- U32 devNo; /*< bus-relative (0..n-1) device
+ u32 devNo; /*< bus-relative (0..n-1) device
* number */
} reconfigureDevice; /* for CONTROLVM_DEVICE_RECONFIGURE */
struct {
- U32 busNo;
+ u32 busNo;
ULTRA_SEGMENT_STATE state;
u8 reserved[2]; /* Natural alignment purposes */
} busChangeState; /* for CONTROLVM_BUS_CHANGESTATE */
struct {
- U32 busNo;
- U32 devNo;
+ u32 busNo;
+ u32 devNo;
ULTRA_SEGMENT_STATE state;
struct {
- U32 physicalDevice:1; /* =1 if message is for
+ u32 physicalDevice:1; /* =1 if message is for
* a physical device */
/* remaining bits in this 32-bit word are available */
} flags;
u8 reserved[2]; /* Natural alignment purposes */
} deviceChangeState; /* for CONTROLVM_DEVICE_CHANGESTATE */
struct {
- U32 busNo;
- U32 devNo;
+ u32 busNo;
+ u32 devNo;
ULTRA_SEGMENT_STATE state;
u8 reserved[6]; /* Natural alignment purposes */
} deviceChangeStateEvent; /* for CONTROLVM_DEVICE_CHANGESTATE_EVENT */
struct {
- U32 busCount; /*< indicates the max number of busses */
- U32 switchCount; /*< indicates the max number of
+ u32 busCount; /*< indicates the max number of busses */
+ u32 switchCount; /*< indicates the max number of
* switches (applicable for service
* partition only) */
ULTRA_CHIPSET_FEATURE features;
- U32 platformNumber; /* Platform Number */
+ u32 platformNumber; /* Platform Number */
} initChipset; /* for CONTROLVM_CHIPSET_INIT */
struct {
- U32 Options; /*< reserved */
- U32 Test; /*< bit 0 set to run embedded selftest */
+ u32 Options; /*< reserved */
+ u32 Test; /*< bit 0 set to run embedded selftest */
} chipsetSelftest; /* for CONTROLVM_CHIPSET_SELFTEST */
/* END Request messages */
@@ -452,8 +452,8 @@ typedef struct _CONTROLVM_MESSAGE {
typedef struct _DEVICE_MAP {
GUEST_PHYSICAL_ADDRESS DeviceChannelAddress;
U64 DeviceChannelSize;
- U32 CA_Index;
- U32 Reserved; /* natural alignment */
+ u32 CA_Index;
+ u32 Reserved; /* natural alignment */
U64 Reserved2; /* Align structure on 32-byte boundary */
} DEVICE_MAP;
@@ -463,8 +463,8 @@ typedef struct _GUEST_DEVICES {
DEVICE_MAP NetworkChannel;
DEVICE_MAP StorageChannel;
DEVICE_MAP ConsoleChannel;
- U32 PartitionIndex;
- U32 Pad;
+ u32 PartitionIndex;
+ u32 Pad;
} GUEST_DEVICES;
typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
@@ -489,13 +489,13 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
* channel */
U64 RequestPayloadOffset; /* Offset to request payload area */
U64 EventPayloadOffset; /* Offset to event payload area */
- U32 RequestPayloadBytes; /* Bytes available in request payload
+ u32 RequestPayloadBytes; /* Bytes available in request payload
* area */
- U32 EventPayloadBytes; /* Bytes available in event payload area */
- U32 ControlChannelBytes;
- U32 NvramChannelBytes; /* Bytes in PartitionNvram segment */
- U32 MessageBytes; /* sizeof(CONTROLVM_MESSAGE) */
- U32 MessageCount; /* CONTROLVM_MESSAGE_MAX */
+ u32 EventPayloadBytes; /* Bytes available in event payload area */
+ u32 ControlChannelBytes;
+ u32 NvramChannelBytes; /* Bytes in PartitionNvram segment */
+ u32 MessageBytes; /* sizeof(CONTROLVM_MESSAGE) */
+ u32 MessageCount; /* CONTROLVM_MESSAGE_MAX */
GUEST_PHYSICAL_ADDRESS gpSmbiosTable; /* guest phys addr of SMBIOS
* tables */
GUEST_PHYSICAL_ADDRESS gpPhysicalSmbiosTable; /* guest phys addr of
@@ -525,11 +525,11 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
* is running in dump mode */
u16 NvramFailCount;
u16 SavedCrashMsgCount; /* = CONTROLVM_CRASHMSG_MAX */
- U32 SavedCrashMsgOffset; /* Offset to request payload area needed
+ u32 SavedCrashMsgOffset; /* Offset to request payload area needed
* for crash dump */
- U32 InstallationError; /* Type of error encountered during
+ u32 InstallationError; /* Type of error encountered during
* installation */
- U32 InstallationTextId; /* Id of string to display */
+ u32 InstallationTextId; /* Id of string to display */
u16 InstallationRemainingSteps; /* Number of remaining installation
* steps (for progress bars) */
u8 ToolAction; /* ULTRA_TOOL_ACTIONS Installation Action
@@ -537,7 +537,7 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
u8 Reserved; /* alignment */
ULTRA_EFI_SPAR_INDICATION EfiSparIndication;
ULTRA_EFI_SPAR_INDICATION EfiSparIndicationSupported;
- U32 SPReserved;
+ u32 SPReserved;
u8 Reserved2[28]; /* Force signals to begin on 128-byte cache
* line */
SIGNAL_QUEUE_HEADER RequestQueue; /* Service or guest partition
@@ -600,21 +600,21 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL {
* https://ustr-linux-1.na.uis.unisys.com/spar/index.php/ControlVm_Parameters_Area
*/
typedef struct _ULTRA_CONTROLVM_PARAMETERS_HEADER {
- U32 TotalLength;
- U32 HeaderLength;
- U32 ConnectionOffset;
- U32 ConnectionLength;
- U32 InitiatorOffset;
- U32 InitiatorLength;
- U32 TargetOffset;
- U32 TargetLength;
- U32 ClientOffset;
- U32 ClientLength;
- U32 NameOffset;
- U32 NameLength;
+ u32 TotalLength;
+ u32 HeaderLength;
+ u32 ConnectionOffset;
+ u32 ConnectionLength;
+ u32 InitiatorOffset;
+ u32 InitiatorLength;
+ u32 TargetOffset;
+ u32 TargetLength;
+ u32 ClientOffset;
+ u32 ClientLength;
+ u32 NameOffset;
+ u32 NameLength;
uuid_le Id;
- U32 Revision;
- U32 Reserved; /* Natural alignment */
+ u32 Revision;
+ u32 Reserved; /* Natural alignment */
} ULTRA_CONTROLVM_PARAMETERS_HEADER;
#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 {
u8 Minute; /* 0 - 59 */
u8 Second; /* 0 - 59 */
u8 Pad1;
- U32 Nanosecond; /* 0 - 999, 999, 999 */
+ u32 Nanosecond; /* 0 - 999, 999, 999 */
S16 TimeZone; /* -1440 to 1440 or 2047 */
u8 Daylight;
u8 Pad2;
@@ -156,24 +156,24 @@ typedef enum {
* AdditionalInfo: Array of characters for additional event info (may be
* empty). */
typedef struct _DIAG_CHANNEL_EVENT {
- U32 EventId;
- U32 Severity;
+ u32 EventId;
+ u32 Severity;
u8 ModuleName[MAX_MODULE_NAME_SIZE];
- U32 LineNumber;
+ u32 LineNumber;
DIAG_EFI_TIME Timestamp; /* Size = 16 bytes */
- U32 PartitionNumber; /* Filled in by Diag Switch as pool blocks are
+ u32 PartitionNumber; /* Filled in by Diag Switch as pool blocks are
* filled */
u16 VirtualProcessorNumber;
u16 LogicalProcessorNumber;
u8 ComponentType; /* ULTRA_COMPONENT_TYPES */
u8 Subsystem;
u16 Reserved0; /* pad to U64 alignment */
- U32 BlockNumber; /* filled in by DiagSwitch as pool blocks are
+ u32 BlockNumber; /* filled in by DiagSwitch as pool blocks are
* filled */
- U32 BlockNumberHigh;
- U32 EventNumber; /* filled in by DiagSwitch as pool blocks are
+ u32 BlockNumberHigh;
+ u32 EventNumber; /* filled in by DiagSwitch as pool blocks are
* filled */
- U32 EventNumberHigh;
+ u32 EventNumberHigh;
/* The BlockNumber and EventNumber fields are set only by DiagSwitch
* and referenced only by WinDiagDisplay formatting tool as
@@ -363,7 +363,7 @@ typedef enum {
* particular subsystem below this level will be discarded.
*/
typedef struct _DIAG_CHANNEL_PROTOCOL_HEADER {
- volatile U32 DiagLock;
+ volatile u32 DiagLock;
u8 IsChannelInitialized;
u8 Reserved[3];
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 {
#define GPI_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(struct guest_phys_info))
struct uisscsi_dest {
- U32 channel; /* channel == bus number */
- U32 id; /* id == target number */
- U32 lun; /* lun == logical unit number */
+ u32 channel; /* channel == bus number */
+ u32 id; /* id == target number */
+ u32 lun; /* lun == logical unit number */
};
struct vhba_wwnn {
- U32 wwnn1;
- U32 wwnn2;
+ u32 wwnn1;
+ u32 wwnn2;
};
/* WARNING: Values stired in this structure must contain maximum counts (not
* maximum values). */
struct vhba_config_max { /* 20 bytes */
- U32 max_channel; /* maximum channel for devices attached to this
+ u32 max_channel; /* maximum channel for devices attached to this
* bus */
- U32 max_id; /* maximum SCSI ID for devices attached to this
+ u32 max_id; /* maximum SCSI ID for devices attached to this
* bus */
- U32 max_lun; /* maximum SCSI LUN for devices attached to this
+ u32 max_lun; /* maximum SCSI LUN for devices attached to this
* bus */
- U32 cmd_per_lun; /* maximum number of outstanding commands per
+ u32 cmd_per_lun; /* maximum number of outstanding commands per
* lun that are allowed at one time */
- U32 max_io_size; /* maximum io size for devices attached to this
+ u32 max_io_size; /* maximum io size for devices attached to this
* bus */
/* max io size is often determined by the resource of the hba. e.g */
/* max scatter gather list length * page size / sector size */
@@ -288,7 +288,7 @@ struct uiscmdrsp_scsi {
void *scsicmd; /* the handle to the cmd that was received -
* send it back as is in the rsp packet. */
u8 cmnd[MAX_CMND_SIZE]; /* the cdb for the command */
- U32 bufflen; /* length of data to be transferred out or in */
+ u32 bufflen; /* length of data to be transferred out or in */
u16 guest_phys_entries; /* Number of entries in scatter-gather (sg)
* list */
struct guest_phys_info gpi_list[MAX_PHYS_INFO]; /* physical address
@@ -492,10 +492,10 @@ struct net_pkt_xmt {
u8 hrawoffv; /* 1 = hwrafoff is valid */
u8 nhrawoffv; /* 1 = nhwrafoff is valid */
u16 protocol; /* specifies packet protocol */
- U32 csum; /* value used to set skb->csum at IOPart */
- U32 hrawoff; /* value used to set skb->h.raw at IOPart */
+ u32 csum; /* value used to set skb->csum at IOPart */
+ u32 hrawoff; /* value used to set skb->h.raw at IOPart */
/* hrawoff points to the start of the TRANSPORT LAYER HEADER */
- U32 nhrawoff; /* value used to set skb->nh.raw at IOPart */
+ u32 nhrawoff; /* value used to set skb->nh.raw at IOPart */
/* nhrawoff points to the start of the NETWORK LAYER HEADER */
} lincsum;
@@ -508,7 +508,7 @@ struct net_pkt_xmt {
};
struct net_pkt_xmtdone {
- U32 xmt_done_result; /* result of NET_XMIT */
+ u32 xmt_done_result; /* result of NET_XMIT */
#define XMIT_SUCCESS 0
#define XMIT_FAILED 1
};
@@ -538,7 +538,7 @@ struct net_pkt_rcv {
/* the number of receive buffers that can be chained */
/* is based on max mtu and size of each rcv buf */
- U32 rcv_done_len; /* length of received data */
+ u32 rcv_done_len; /* length of received data */
u8 numrcvbufs; /* number of receive buffers that contain the */
/* incoming data; guest end MUST chain these together. */
void *rcvbuf[MAX_NET_RCV_CHAIN]; /* the list of receive buffers
@@ -546,7 +546,7 @@ struct net_pkt_rcv {
/* each entry is a receive buffer provided by NET_RCV_POST. */
/* NOTE: first rcvbuf in the chain will also be provided in net.buf. */
U64 UniqueNum;
- U32 RcvsDroppedDelta;
+ u32 RcvsDroppedDelta;
};
struct net_pkt_enbdis {
@@ -618,7 +618,7 @@ struct uiscmdrsp_disknotify {
u8 add; /* 0-remove, 1-add */
void *vHba; /* Pointer to vhba_info for channel info to
* route msg */
- U32 channel, id, lun; /* SCSI Path of Disk to added or removed */
+ u32 channel, id, lun; /* SCSI Path of Disk to added or removed */
};
/* The following is used by virthba/vSCSI to send the Acquire/Release commands
@@ -696,8 +696,8 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
} vhba; /* 28 */
struct {
u8 macaddr[MAX_MACADDR_LEN]; /* 6 bytes */
- U32 num_rcv_bufs; /* 4 */
- U32 mtu; /* 4 */
+ u32 num_rcv_bufs; /* 4 */
+ u32 mtu; /* 4 */
uuid_le zoneGuid; /* 16 */
} vnic; /* total 30 */
};
@@ -777,9 +777,9 @@ typedef struct _ULTRA_IO_CHANNEL_PROTOCOL {
OFFSETOF(type, clientString); \
MEMCPY(chan->clientString, clientStr, \
MINNUM(clientStrLen, \
- (U32) (MAX_CLIENTSTRING_LEN - 1))); \
+ (u32) (MAX_CLIENTSTRING_LEN - 1))); \
chan->clientString[MINNUM(clientStrLen, \
- (U32) (MAX_CLIENTSTRING_LEN \
+ (u32) (MAX_CLIENTSTRING_LEN \
- 1))] \
= '\0'; \
} \
@@ -801,7 +801,7 @@ static inline int ULTRA_VHBA_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
struct vhba_wwnn *wwnn,
struct vhba_config_max *max,
unsigned char *clientStr,
- U32 clientStrLen, U64 bytes) {
+ u32 clientStrLen, U64 bytes) {
MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL));
x->ChannelHeader.VersionId = ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID;
x->ChannelHeader.Signature = ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE;
@@ -833,10 +833,10 @@ static inline void ULTRA_VHBA_set_max(ULTRA_IO_CHANNEL_PROTOCOL *x,
static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
unsigned char *macaddr,
- U32 num_rcv_bufs, U32 mtu,
+ u32 num_rcv_bufs, u32 mtu,
uuid_le zoneGuid,
unsigned char *clientStr,
- U32 clientStrLen,
+ u32 clientStrLen,
U64 bytes) {
MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL));
x->ChannelHeader.VersionId = ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID;
@@ -883,11 +883,11 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
* room)
*/
static INLINE u16
-add_physinfo_entries(U32 inp_pfn, /* input - specifies the pfn to be used
+add_physinfo_entries(u32 inp_pfn, /* input - specifies the pfn to be used
* to add entries */
u16 inp_off, /* input - specifies the off to be used
* to add entries */
- U32 inp_len, /* input - specifies the len to be used
+ u32 inp_len, /* input - specifies the len to be used
* to add entries */
u16 index, /* input - index in array at which new
* entries are added */
@@ -896,7 +896,7 @@ add_physinfo_entries(U32 inp_pfn, /* input - specifies the pfn to be used
struct phys_info pi_arr[]) /* input & output - array to
* which entries are added */
{
- U32 len;
+ u32 len;
u16 i, firstlen;
firstlen = PI_PAGE_SIZE - inp_off;
@@ -925,7 +925,7 @@ add_physinfo_entries(U32 inp_pfn, /* input - specifies the pfn to be used
else {
pi_arr[index + i].pi_off = 0;
pi_arr[index + i].pi_len =
- (u16) MINNUM(len, (U32) PI_PAGE_SIZE);
+ (u16) MINNUM(len, (u32) PI_PAGE_SIZE);
}
}
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 =
#pragma pack(push, 1) /* both GCC and VC now allow this pragma */
typedef struct _ULTRA_VBUS_HEADERINFO {
- U32 structBytes; /* size of this struct in bytes */
- U32 deviceInfoStructBytes; /* sizeof(ULTRA_VBUS_DEVICEINFO) */
- U32 devInfoCount; /* num of items in DevInfo member */
+ u32 structBytes; /* size of this struct in bytes */
+ u32 deviceInfoStructBytes; /* sizeof(ULTRA_VBUS_DEVICEINFO) */
+ u32 devInfoCount; /* num of items in DevInfo member */
/* (this is the allocated size) */
- U32 chpInfoByteOffset; /* byte offset from beginning of this struct */
+ u32 chpInfoByteOffset; /* byte offset from beginning of this struct */
/* to the the ChpInfo struct (below) */
- U32 busInfoByteOffset; /* byte offset from beginning of this struct */
+ u32 busInfoByteOffset; /* byte offset from beginning of this struct */
/* to the the BusInfo struct (below) */
- U32 devInfoByteOffset; /* byte offset from beginning of this struct */
+ u32 devInfoByteOffset; /* byte offset from beginning of this struct */
/* to the the DevInfo array (below) */
u8 reserved[104];
} 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 */
* not used much */
#define ISSUE_IO_VMCALL_POSTCODE_SEVERITY(postcode, severity) \
do { \
- U32 _tempresult = VMCALL_SUCCESS; \
+ u32 _tempresult = VMCALL_SUCCESS; \
ISSUE_IO_EXTENDED_VMCALL(VMCALL_POST_CODE_LOGEVENT, severity, \
MDS_APPOS, postcode, _tempresult); \
} while (0)
@@ -119,7 +119,7 @@ typedef struct _VMCALL_IO_CONTROLVM_ADDR_PARAMS {
U64 ChannelAddress; /* contents provided by this VMCALL (OUT) */
/* the size of the ControlVm channel in bytes This VMCall fills this
* in with the appropriate address. */
- U32 ChannelBytes; /* contents provided by this VMCALL (OUT) */
+ u32 ChannelBytes; /* contents provided by this VMCALL (OUT) */
u8 Unused[4]; /* Unused Bytes in the 64-Bit Aligned Struct */
} VMCALL_IO_CONTROLVM_ADDR_PARAMS;
@@ -159,7 +159,7 @@ typedef struct _VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS {
* (IN) */
u8 ItemName[32]; /* Null terminated string giving name of
* mismatched item (IN) */
- U32 SourceLineNumber; /* line# where invoked. (IN) */
+ u32 SourceLineNumber; /* line# where invoked. (IN) */
u8 SourceFileName[36]; /* source code where invoked - Null terminated
* string (IN) */
} VMCALL_CHANNEL_VERSION_MISMATCH_PARAMS;