Commit 9ed8c2a9 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: move channel type values into "gsi_reg.h" 



The gsi_channel_type enumerated type define values used for the
channel type/protocol for event rings and channels.  Move its
definition out of "gsi.c" and into "gsi_reg.h", alongside the
definition of the CH_C_CNTXT_0 register offset and its fields.
Add a comment near the definition of the EV_CH_E_CNTXT_0 register
indicating this type is used for its EV_CHTYPE field.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 46dda53e

drivers/net/ipa/gsi.c

+0 −8
Original line number Diff line number Diff line
@@ -127,14 +127,6 @@ enum gsi_err_type { 
	GSI_ERR_TYPE_EVT	= 0x3,

};



/* Hardware values used when programming a channel or event ring type */

enum gsi_channel_type {

	GSI_CHANNEL_TYPE_MHI			= 0x0,

	GSI_CHANNEL_TYPE_XHCI			= 0x1,

	GSI_CHANNEL_TYPE_GPI			= 0x2,

	GSI_CHANNEL_TYPE_XDCI			= 0x3,

};



/* Hardware values representing an event ring immediate command opcode */

enum gsi_evt_cmd_opcode {

	GSI_EVT_ALLOCATE	= 0x0,

drivers/net/ipa/gsi_reg.h

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,13 @@ 
#define ERINDEX_FMASK			GENMASK(18, 14)

#define CHSTATE_FMASK			GENMASK(23, 20)

#define ELEMENT_SIZE_FMASK		GENMASK(31, 24)

/** enum gsi_channel_type - CHTYPE_PROTOCOL field values in CH_C_CNTXT_0 */

enum gsi_channel_type {

	GSI_CHANNEL_TYPE_MHI			= 0x0,

	GSI_CHANNEL_TYPE_XHCI			= 0x1,

	GSI_CHANNEL_TYPE_GPI			= 0x2,

	GSI_CHANNEL_TYPE_XDCI			= 0x3,

};



#define GSI_CH_C_CNTXT_1_OFFSET(ch) \

		GSI_EE_N_CH_C_CNTXT_1_OFFSET((ch), GSI_EE_AP)
@@ -128,6 +135,7 @@ 
#define EV_INTYPE_FMASK			GENMASK(16, 16)

#define EV_CHSTATE_FMASK		GENMASK(23, 20)

#define EV_ELEMENT_SIZE_FMASK		GENMASK(31, 24)

/* enum gsi_channel_type defines EV_CHTYPE field values in EV_CH_E_CNTXT_0 */



#define GSI_EV_CH_E_CNTXT_1_OFFSET(ev) \

		GSI_EE_N_EV_CH_E_CNTXT_1_OFFSET((ev), GSI_EE_AP)

CRA Git | Maintained and supported by SUSTech CRA and CCSE