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

Commit c75ebe5e authored by Sameer Wadgaonkar's avatar Sameer Wadgaonkar Committed by Greg Kroah-Hartman
Browse files

staging: unisys: include: renamed #defines in channel.h to match driver namespace 



Renamed #defines
* ULTRA_CHANNEL_PROTOCOL_SIGNATURE to
		VISOR_CHANNEL_SIGNATURE
* SPAR_CHANNEL_SERVER_READY to
		VISOR_CHANNEL_SERVER_READY
* ULTRA_VALID_CHANNELCLI_TRANSITION
		VISOR_VALID_CHANNELCLI_TRANSITION
* ULTRA_CLIERRORBOOT_THROTTLEMSG_DISABLED to
		VISOR_CLIERRORBOOT_THROTTLEMSG_DISABLED
* ULTRA_CLIERRORBOOT_THROTTLEMSG_NOTATTACHED to
		VISOR_CLIERRORBOOT_THROTTLEMSG_NOTATTACHED
* ULTRA_CLIERRORBOOT_THROTTLEMSG_BUSY to
		VISOR_CLIERRORBOOT_THROTTLEMSG_BUSY
* ULTRA_IO_DRIVER_ENABLES_INTS to
		VISOR_DRIVER_ENABLES_INTS
* ULTRA_IO_CHANNEL_IS_POLLING to
		VISOR_CHANNEL_IS_POLLING
* ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS to
		VISOR_IOVM_OK_DRIVER_DISABLING_INTS
* ULTRA_IO_DRIVER_DISABLES_INTS to
		VISOR_DRIVER_DISABLES_INTS
* ULTRA_IO_DRIVER_SUPPORTS_ENHANCED_RCVBUF_CHECKING to
		VISOR_DRIVER_ENHANCED_RCVBUF_CHECKING
* ULTRA_CHANNEL_ENABLE_INTS to
		VISOR_CHANNEL_ENABLE_INTS
* SPAR_VHBA_CHANNEL_PROTOCOL_UUID to VISOR_VHBA_CHANNEL_UUID
* SPAR_VHBA_CHANNEL_PROTOCOL_UUID_STR to
		VISOR_VHBA_CHANNEL_UUID_STR
* SPAR_VNIC_CHANNEL_PROTOCOL_UUID to VISOR_VNIC_CHANNEL_UUID
* SPAR_VNIC_CHANNEL_PROTOCOL_UUID_STR to
		VISOR_VNIC_CHANNEL_UUID_STR
* SPAR_SIOVM_UUID to VISOR_SIOVM_UUID

Signed-off-by: default avatarSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 315dfc84

drivers/staging/unisys/Documentation/overview.txt

+4 −4
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ The following files exist under /sys/devices/visorbus<x>/vbus<x>:dev<y>: 


The visorhba driver registers with visorbus as the function driver to

handle virtual scsi disk devices, specified using the

SPAR_VHBA_CHANNEL_PROTOCOL_UUID type in the visorbus_register_visor_driver()

VISOR_VHBA_CHANNEL_UUID type in the visorbus_register_visor_driver()

call. visorhba uses scsi_add_host() to expose a Linux block device

(e.g., /sys/block/) in the guest environment for each s-Par virtual device.
@@ -240,7 +240,7 @@ When compiled as a module, visorhba can be autoloaded by visorbus in 
standard udev/systemd environments, as it includes the modules.alias

definition:



    "visorbus:"+SPAR_VHBA_CHANNEL_PROTOCOL_UUID_STR

    "visorbus:"+VISOR_VHBA_CHANNEL_UUID_STR



i.e.:
@@ -252,7 +252,7 @@ i.e.: 


The visornic driver registers with visorbus as the function driver to

handle virtual network devices, specified using the

SPAR_VNIC_CHANNEL_PROTOCOL_UUID type in the visorbus_register_visor_driver()

VISOR_VNIC_CHANNEL_UUID type in the visorbus_register_visor_driver()

call. visornic uses register_netdev() to expose a Linux device of class net

(e.g., /sys/class/net/) in the guest environment for each s-Par virtual

device.
@@ -270,7 +270,7 @@ When compiled as a module, visornic can be autoloaded by visorbus in 
standard udev/systemd environments, as it includes the modules.alias

definition:



    "visorbus:"+SPAR_VNIC_CHANNEL_PROTOCOL_UUID_STR

    "visorbus:"+VISOR_VNIC_CHANNEL_UUID_STR



i.e.:

drivers/staging/unisys/include/channel.h

+23 −25
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define COVER(v, d) ((d) * DIV_ROUND_UP(v, d))

#endif



#define ULTRA_CHANNEL_PROTOCOL_SIGNATURE SIGNATURE_32('E', 'C', 'N', 'L')

#define VISOR_CHANNEL_SIGNATURE SIGNATURE_32('E', 'C', 'N', 'L')



enum channel_serverstate {

	CHANNELSRV_UNINITIALIZED = 0,	/* channel is in an undefined state */
@@ -59,10 +59,10 @@ enum channel_clientstate { 
				/* access channel anytime */

};



#define SPAR_CHANNEL_SERVER_READY(ch) \

#define VISOR_CHANNEL_SERVER_READY(ch) \

	(readl(&(ch)->srv_state) == CHANNELSRV_READY)



#define ULTRA_VALID_CHANNELCLI_TRANSITION(o, n) \

#define VISOR_VALID_CHANNELCLI_TRANSITION(o, n) \

	(((((o) == CHANNELCLI_DETACHED) && ((n) == CHANNELCLI_DISABLED)) || \

	  (((o) == CHANNELCLI_ATTACHING) && ((n) == CHANNELCLI_DISABLED)) || \

	  (((o) == CHANNELCLI_ATTACHED) && ((n) == CHANNELCLI_DISABLED)) || \
@@ -80,33 +80,33 @@ enum channel_clientstate { 
	  (((o) == CHANNELCLI_BUSY) && ((n) == CHANNELCLI_OWNED)) || (0)) \

	 ? (1) : (0))



/* Values for ULTRA_CHANNEL_PROTOCOL.CliErrorBoot: */

/* Values for VISORA_CHANNEL_PROTOCOL.CliErrorBoot: */

/* throttling invalid boot channel statetransition error due to client

 * disabled

 */

#define ULTRA_CLIERRORBOOT_THROTTLEMSG_DISABLED 0x01

#define VISOR_CLIERRORBOOT_THROTTLEMSG_DISABLED 0x01



/* throttling invalid boot channel statetransition error due to client

 * not attached

 */

#define ULTRA_CLIERRORBOOT_THROTTLEMSG_NOTATTACHED 0x02

#define VISOR_CLIERRORBOOT_THROTTLEMSG_NOTATTACHED 0x02



/* throttling invalid boot channel statetransition error due to busy channel */

#define ULTRA_CLIERRORBOOT_THROTTLEMSG_BUSY 0x04

#define VISOR_CLIERRORBOOT_THROTTLEMSG_BUSY 0x04



/* Values for ULTRA_CHANNEL_PROTOCOL.Features: This define exists so

/* Values for VISOR_CHANNEL_PROTOCOL.Features: This define exists so

 * that windows guest can look at the FeatureFlags in the io channel,

 * and configure the windows driver to use interrupts or not based on

 * this setting.  This flag is set in uislib after the

 * ULTRA_VHBA_init_channel is called.  All feature bits for all

 * VISOR_VHBA_init_channel is called.  All feature bits for all

 * channels should be defined here.  The io channel feature bits are

 * defined right here

 */

#define ULTRA_IO_DRIVER_ENABLES_INTS (0x1ULL << 1)

#define ULTRA_IO_CHANNEL_IS_POLLING (0x1ULL << 3)

#define ULTRA_IO_IOVM_IS_OK_WITH_DRIVER_DISABLING_INTS (0x1ULL << 4)

#define ULTRA_IO_DRIVER_DISABLES_INTS (0x1ULL << 5)

#define ULTRA_IO_DRIVER_SUPPORTS_ENHANCED_RCVBUF_CHECKING (0x1ULL << 6)

#define VISOR_DRIVER_ENABLES_INTS (0x1ULL << 1)

#define VISOR_CHANNEL_IS_POLLING (0x1ULL << 3)

#define VISOR_IOVM_OK_DRIVER_DISABLING_INTS (0x1ULL << 4)

#define VISOR_DRIVER_DISABLES_INTS (0x1ULL << 5)

#define VISOR_DRIVER_ENHANCED_RCVBUF_CHECKING (0x1ULL << 6)



/* Common Channel Header */

struct channel_header {
@@ -156,7 +156,7 @@ struct channel_header { 
	u8 recover_channel;

} __packed;



#define ULTRA_CHANNEL_ENABLE_INTS (0x1ULL << 0)

#define VISOR_CHANNEL_ENABLE_INTS (0x1ULL << 0)



/* Subheader for the Signal Type variation of the Common Channel */

struct signal_queue_header {
@@ -254,27 +254,25 @@ visor_check_channel(struct channel_header *ch, 
 */



/* {414815ed-c58c-11da-95a9-00e08161165f} */

#define SPAR_VHBA_CHANNEL_PROTOCOL_UUID \

#define VISOR_VHBA_CHANNEL_UUID \

	UUID_LE(0x414815ed, 0xc58c, 0x11da, \

		0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)

static const uuid_le spar_vhba_channel_protocol_uuid =

	SPAR_VHBA_CHANNEL_PROTOCOL_UUID;

#define SPAR_VHBA_CHANNEL_PROTOCOL_UUID_STR \

static const uuid_le visor_vhba_channel_uuid = VISOR_VHBA_CHANNEL_UUID;

#define VISOR_VHBA_CHANNEL_UUID_STR \

	"414815ed-c58c-11da-95a9-00e08161165f"



/* {8cd5994d-c58e-11da-95a9-00e08161165f} */

#define SPAR_VNIC_CHANNEL_PROTOCOL_UUID \

#define VISOR_VNIC_CHANNEL_UUID \

	UUID_LE(0x8cd5994d, 0xc58e, 0x11da, \

		0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)

static const uuid_le spar_vnic_channel_protocol_uuid =

	SPAR_VNIC_CHANNEL_PROTOCOL_UUID;

#define SPAR_VNIC_CHANNEL_PROTOCOL_UUID_STR \

static const uuid_le visor_vnic_channel_uuid = VISOR_VNIC_CHANNEL_UUID;

#define VISOR_VNIC_CHANNEL_UUID_STR \

	"8cd5994d-c58e-11da-95a9-00e08161165f"



/* {72120008-4AAB-11DC-8530-444553544200} */

#define SPAR_SIOVM_UUID \

#define VISOR_SIOVM_UUID \

	UUID_LE(0x72120008, 0x4AAB, 0x11DC, \

		0x85, 0x30, 0x44, 0x45, 0x53, 0x54, 0x42, 0x00)

static const uuid_le spar_siovm_uuid = SPAR_SIOVM_UUID;

static const uuid_le visor_siovm_uuid = VISOR_SIOVM_UUID;



#endif

drivers/staging/unisys/include/iochannel.h

+5 −6
Original line number Diff line number Diff line
@@ -34,10 +34,9 @@ 
#include <linux/dma-direction.h>

#include "channel.h"



#define ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define ULTRA_VSWITCH_CHANNEL_PROTOCOL_SIGNATURE \

	ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE VISOR_CHANNEL_SIGNATURE

#define ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE VISOR_CHANNEL_SIGNATURE

#define ULTRA_VSWITCH_CHANNEL_PROTOCOL_SIGNATURE VISOR_CHANNEL_SIGNATURE



/*

 * Must increment these whenever you insert or delete fields within this channel
@@ -51,13 +50,13 @@ 
#define ULTRA_VSWITCH_CHANNEL_PROTOCOL_VERSIONID 1



#define SPAR_VHBA_CHANNEL_OK_CLIENT(ch) \

	(visor_check_channel(ch, spar_vhba_channel_protocol_uuid, \

	(visor_check_channel(ch, visor_vhba_channel_uuid, \

			    "vhba", MIN_IO_CHANNEL_SIZE,	\

			    ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID, \

			    ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE))



#define SPAR_VNIC_CHANNEL_OK_CLIENT(ch) \

	(visor_check_channel(ch, spar_vnic_channel_protocol_uuid, \

	(visor_check_channel(ch, visor_vnic_channel_uuid, \

			    "vnic", MIN_IO_CHANNEL_SIZE,	\

			    ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID, \

			    ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE))

drivers/staging/unisys/visorbus/controlvmchannel.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
	UUID_LE(0x2b3c2d10, 0x7ef5, 0x4ad8, \

		0xb9, 0x66, 0x34, 0x48, 0xb7, 0x38, 0x6b, 0x3d)



#define VISOR_CONTROLVM_CHANNEL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define VISOR_CONTROLVM_CHANNEL_SIGNATURE VISOR_CHANNEL_SIGNATURE

#define CONTROLVM_MESSAGE_MAX 64



/* Must increment this whenever you insert or delete fields within

drivers/staging/unisys/visorbus/vbuschannel.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
		0x95, 0xa9, 0x0, 0xe0, 0x81, 0x61, 0x16, 0x5f)

static const uuid_le visor_vbus_channel_uuid = VISOR_VBUS_CHANNEL_UUID;



#define VISOR_VBUS_CHANNEL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE

#define VISOR_VBUS_CHANNEL_SIGNATURE VISOR_CHANNEL_SIGNATURE



/* Must increment this whenever you insert or delete fields within this channel

 * struct.  Also increment whenever you change the meaning of fields within this