Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fc0229a authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove U64 type 



This patch switches all use of the U64 typedef to use the kernel's u64 type
instead.

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3c55b13

drivers/staging/unisys/common-spar/include/channels/channel.h

+21 −21
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define SIGNATURE_32(A, B, C, D) \

	(SIGNATURE_16(A, B) | (SIGNATURE_16(C, D) << 16))

#define SIGNATURE_64(A, B, C, D, E, F, G, H) \

	(SIGNATURE_32(A, B, C, D) | ((U64)(SIGNATURE_32(E, F, G, H)) << 32))

	(SIGNATURE_32(A, B, C, D) | ((u64)(SIGNATURE_32(E, F, G, H)) << 32))



#ifndef lengthof

#define lengthof(TYPE, MEMBER) (sizeof(((TYPE *)0)->MEMBER))
@@ -209,16 +209,16 @@ ULTRA_CHANNELCLI_STRING(u32 v) 
#pragma pack(push, 1)		/* both GCC and VC now allow this pragma */

/* Common Channel Header */

typedef struct _CHANNEL_HEADER {

	U64 Signature;		/* Signature */

	u64 Signature;		/* Signature */

	u32 LegacyState;	/* DEPRECATED - being replaced by */

	/* /              SrvState, CliStateBoot, and CliStateOS below */

	u32 HeaderSize;		/* sizeof(CHANNEL_HEADER) */

	U64 Size;		/* Total size of this channel in bytes */

	U64 Features;		/* Flags to modify behavior */

	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 */

	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 */

	uuid_le ZoneGuid;		/* Guid of Channel's zone */
@@ -255,11 +255,11 @@ typedef struct _SIGNAL_QUEUE_HEADER { 
	/* 1st cache line */

	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

	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
@@ -268,16 +268,16 @@ typedef struct _SIGNAL_QUEUE_HEADER { 
				 * (MaxSignalSlots-1) */

	u32 Head;		/* Queue head signal # */

	/* 2nd cache line */

	U64 NumSignalsReceived;	/* Total # of signals removed from this queue */

	u64 NumSignalsReceived;	/* Total # of signals removed from this queue */

	u32 Tail;		/* Queue tail signal # (on separate

				 * cache line) */

	u32 Reserved1;		/* Reserved field */

	U64 Reserved2;		/* Resrved field */

	U64 ClientQueue;

	U64 NumInterruptsReceived;	/* Total # of Interrupts received.  This

	u64 Reserved2;		/* Resrved field */

	u64 ClientQueue;

	u64 NumInterruptsReceived;	/* Total # of Interrupts received.  This

					 * is incremented by the ISR in the

					 * guest windows driver */

	U64 NumEmptyCnt;	/* Number of times that visor_signal_remove

	u64 NumEmptyCnt;	/* Number of times that visor_signal_remove

				 * is called and returned Empty

				 * Status. */

	u32 ErrorFlags;		/* Error bits set during SignalReinit
@@ -311,9 +311,9 @@ static inline int 
ULTRA_check_channel_client(void __iomem *pChannel,

			   uuid_le expectedTypeGuid,

			   char *channelName,

			   U64 expectedMinBytes,

			   u64 expectedMinBytes,

			   u32 expectedVersionId,

			   U64 expectedSignature,

			   u64 expectedSignature,

			   char *fileName, int lineNumber, void *logCtx)

{

	if (uuid_le_cmp(expectedTypeGuid, NULL_UUID_LE) != 0)
@@ -373,8 +373,8 @@ ULTRA_check_channel_client(void __iomem *pChannel, 
static inline int

ULTRA_check_channel_server(uuid_le typeGuid,

			   char *channelName,

			   U64 expectedMinBytes,

			   U64 actualBytes,

			   u64 expectedMinBytes,

			   u64 actualBytes,

			   char *fileName, int lineNumber, void *logCtx)

{

	if (expectedMinBytes > 0)	/* caller wants us to verify

drivers/staging/unisys/common-spar/include/channels/controlframework.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static const ULTRA_SEGMENT_STATE SegmentStateStandby = { 
	1, 1, 0, 0, 1, 1, 1, 0

};

typedef union {

	U64 Full;

	u64 Full;

	struct {

		u8 Major;	/* will be 1 for the first release and

				 * increment thereafter  */

drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h

+22 −22
Original line number Diff line number Diff line
@@ -126,13 +126,13 @@ struct InterruptInfo { 
	  *   interrupt.  Currently this is used by IOPart-SP to wake

	  *   up GP when Data Channel transitions from empty to

	  *   non-empty.*/

	U64 sendInterruptHandle;

	u64 sendInterruptHandle;



	 /**< specifies interrupt handle. It is used to retrieve the

	  *   corresponding interrupt pin from Monitor; and the

	  *   interrupt pin is used to connect to the corresponding

	  *   intrrupt.  Used by IOPart-GP only. */

	U64 recvInterruptHandle;

	u64 recvInterruptHandle;



	 /**< specifies interrupt vector. It, interrupt pin, and shared are

	  *   used to connect to the corresponding interrupt.  Used by
@@ -218,10 +218,10 @@ typedef enum _ULTRA_TOOL_ACTIONS { 
} ULTRA_TOOL_ACTIONS;



typedef struct _ULTRA_EFI_SPAR_INDICATION  {

	U64 BootToFirmwareUI:1;	/* Bit 0: Stop in uefi ui */

	U64 ClearNvram:1;	/* Bit 1: Clear NVRAM */

	U64 ClearCmos:1;	/* Bit 2: Clear CMOS */

	U64 BootToTool:1;	/* Bit 3: Run install tool */

	u64 BootToFirmwareUI:1;	/* Bit 0: Stop in uefi ui */

	u64 ClearNvram:1;	/* Bit 1: Clear NVRAM */

	u64 ClearCmos:1;	/* Bit 2: Clear CMOS */

	u64 BootToTool:1;	/* Bit 3: Run install tool */

	/* remaining bits are available */

} ULTRA_EFI_SPAR_INDICATION;
@@ -272,10 +272,10 @@ typedef struct _CONTROLVM_MESSAGE_HEADER { 
		    /* remaining bits in this 32-bit word are available */

	} Flags;

	u32 Reserved;		/* Natural alignment */

	U64 MessageHandle;	/* Identifies the particular message instance,

	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

	u64 PayloadVmOffset;	/* Offset of payload area from start of this

				 * instance of ControlVm segment */

	u32 PayloadMaxBytes;	/* Maximum bytes allocated in payload

				 * area of ControlVm segment */
@@ -290,10 +290,10 @@ typedef struct _CONTROLVM_PACKET_DEVICE_CREATE { 


	    /* Control uses header SegmentIndex field to access bus number... */

	u32 devNo;	   /**< bus-relative (0..n-1) device number */

	U64 channelAddr;  /**< Guest physical address of the channel, which

	u64 channelAddr;  /**< Guest physical address of the channel, which

			*   can be dereferenced by the receiver

			*   of this ControlVm command */

	U64 channelBytes; /**< specifies size of the channel in bytes */

	u64 channelBytes; /**< specifies size of the channel in bytes */

	uuid_le dataTypeGuid;/**< specifies format of data in channel */

	uuid_le devInstGuid; /**< instance guid for the device */

	struct InterruptInfo intr; /**< specifies interrupt information */
@@ -329,11 +329,11 @@ typedef struct _CONTROLVM_MESSAGE_PACKET { 
	    /* Control uses header SegmentIndex field to access bus number... */

			u32 deviceCount;      /*< indicates the max number of

					       * devices on this bus */

			U64 channelAddr;     /*< Guest physical address of the

			u64 channelAddr;     /*< Guest physical address of the

					      *   channel, which can be

					      *   dereferenced by the receiver

					      *   of this ControlVm command */

			U64 channelBytes;    /*< size of the channel in bytes */

			u64 channelBytes;    /*< size of the channel in bytes */

			uuid_le busDataTypeGuid;/*< indicates format of data in

						    bus channel */

			uuid_le busInstGuid;    /*< instance guid for the bus */
@@ -352,10 +352,10 @@ typedef struct _CONTROLVM_MESSAGE_PACKET { 


	    /* Control uses header SegmentIndex field to access bus number... */

			u32 reserved1;		    /* for alignment purposes */

			U64 guestHandle;	    /* This is used to convert

			u64 guestHandle;	    /* This is used to convert

					 *  guest physical address to real

					 *  physical address for DMA, for ex. */

			U64 recvBusInterruptHandle;/*< specifies interrupt

			u64 recvBusInterruptHandle;/*< specifies interrupt

					 *   info. It is used by SP to register

					 *   to receive interrupts from the CP.

					 *   This interrupt is used for bus
@@ -434,11 +434,11 @@ typedef struct _CONTROLVM_MESSAGE_PACKET { 
		    /* BEGIN Ack messages */



		    /* END Ack messages */

		U64 addr;	    /*< a physical address of something, that

		u64 addr;	    /*< a physical address of something, that

				     *   can be dereferenced by the receiver of

				     *   this ControlVm command (depends on

				     *   command id) */

		U64 handle;	    /*< a handle of something (depends on

		u64 handle;	    /*< a handle of something (depends on

				     * command id) */

	};

} CONTROLVM_MESSAGE_PACKET;
@@ -451,10 +451,10 @@ typedef struct _CONTROLVM_MESSAGE { 


typedef struct _DEVICE_MAP  {

	GUEST_PHYSICAL_ADDRESS DeviceChannelAddress;

	U64 DeviceChannelSize;

	u64 DeviceChannelSize;

	u32 CA_Index;

	u32 Reserved;		/* natural alignment */

	U64 Reserved2;		/* Align structure on 32-byte boundary */

	u64 Reserved2;		/* Align structure on 32-byte boundary */

} DEVICE_MAP;



typedef struct _GUEST_DEVICES  {
@@ -487,8 +487,8 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { 
						 * ROM disk */

	 GUEST_PHYSICAL_ADDRESS gpNvram;	/* guest phys addr of NVRAM

						 * channel */

	 U64 RequestPayloadOffset;	/* Offset to request payload area */

	 U64 EventPayloadOffset;	/* Offset to event payload area */

	 u64 RequestPayloadOffset;	/* Offset to request payload area */

	 u64 EventPayloadOffset;	/* Offset to event payload area */

	 u32 RequestPayloadBytes;	/* Bytes available in request payload

					 * area */

	 u32 EventPayloadBytes;	/* Bytes available in event payload area */
@@ -510,13 +510,13 @@ typedef struct _ULTRA_CONTROLVM_CHANNEL_PROTOCOL { 
	 GUEST_PHYSICAL_ADDRESS VirtualGuestFirmwareEntryPoint;



	 /* guest EFI firmware image size  */

	 U64 VirtualGuestFirmwareImageSize;

	 u64 VirtualGuestFirmwareImageSize;



	 /* GPA = 1MB where EFI firmware image is copied to  */

	 GUEST_PHYSICAL_ADDRESS VirtualGuestFirmwareBootBase;

	 GUEST_PHYSICAL_ADDRESS VirtualGuestImageBase;

	 GUEST_PHYSICAL_ADDRESS VirtualGuestImageSize;

	 U64 PrototypeControlChannelOffset;

	 u64 PrototypeControlChannelOffset;

	 GUEST_PHYSICAL_ADDRESS VirtualGuestPartitionHandle;



	 u16 RestoreAction;	/* Restore Action field to restore the guest

drivers/staging/unisys/common-spar/include/channels/diagchannel.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ typedef struct _DIAG_CHANNEL_EVENT { 
	u16 LogicalProcessorNumber;

	u8 ComponentType;	/* ULTRA_COMPONENT_TYPES */

	u8 Subsystem;

	u16 Reserved0;		/* pad to U64 alignment */

	u16 Reserved0;		/* pad to u64 alignment */

	u32 BlockNumber;	/* filled in by DiagSwitch as pool blocks are

				 * filled */

	u32 BlockNumberHigh;

drivers/staging/unisys/common-spar/include/channels/iochannel.h

+6 −6
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ typedef enum { VDISK_MGMT_ACQUIRE = 1, VDISK_MGMT_RELEASE, 
#pragma pack(push, 1)



struct guest_phys_info {

	U64 address;

	U64 length;

	u64 address;

	u64 length;

};



#define GPI_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(struct guest_phys_info))
@@ -529,7 +529,7 @@ struct net_pkt_rcvpost { 
	    * to be describable */

	    struct phys_info frag;	/* physical page information for the

					 * single fragment 2K rcv buf */

	    U64 UniqueNum;		/* This is used to make sure that

	    u64 UniqueNum;		/* This is used to make sure that

					 * receive posts are returned to  */

	    /* the Adapter which sent them origonally. */

};
@@ -545,7 +545,7 @@ struct net_pkt_rcv { 
						 * that must be chained; */

	/* 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;

	u64 UniqueNum;

	u32 RcvsDroppedDelta;

};
@@ -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;
@@ -837,7 +837,7 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x, 
						 uuid_le zoneGuid,

						 unsigned char *clientStr,

						 u32 clientStrLen,

						 U64 bytes)  {

						 u64 bytes)  {

	MEMSET(x, 0, sizeof(ULTRA_IO_CHANNEL_PROTOCOL));

	x->ChannelHeader.VersionId = ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID;

	x->ChannelHeader.Signature = ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE;