Commit 7b0ac8f6 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: move GSI error values into "gsi_reg.h" 



The gsi_err_code and gsi_err_type enumerated types are values that
fields in the GSI ERROR_LOG register can take on.  Move their
definitions out of "gsi.c" and into "gsi_reg.h", alongside the
definition of the ERROR_LOG register offset and field symbols.

Drop the "_ERR" suffix in the names of the gsi_err_code members.

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

drivers/net/ipa/gsi.c

+2 −20
Original line number Diff line number Diff line
@@ -109,24 +109,6 @@ struct gsi_event { 
	u8 chid;

};



/* Hardware values from the error log register error code field */

enum gsi_err_code {

	GSI_INVALID_TRE_ERR			= 0x1,

	GSI_OUT_OF_BUFFERS_ERR			= 0x2,

	GSI_OUT_OF_RESOURCES_ERR		= 0x3,

	GSI_UNSUPPORTED_INTER_EE_OP_ERR		= 0x4,

	GSI_EVT_RING_EMPTY_ERR			= 0x5,

	GSI_NON_ALLOCATED_EVT_ACCESS_ERR	= 0x6,

	GSI_HWO_1_ERR				= 0x8,

};



/* Hardware values from the error log register error type field */

enum gsi_err_type {

	GSI_ERR_TYPE_GLOB	= 0x1,

	GSI_ERR_TYPE_CHAN	= 0x2,

	GSI_ERR_TYPE_EVT	= 0x3,

};



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

enum gsi_evt_cmd_opcode {

	GSI_EVT_ALLOCATE	= 0x0,
@@ -1052,7 +1034,7 @@ static void gsi_isr_evt_ctrl(struct gsi *gsi) 
static void

gsi_isr_glob_chan_err(struct gsi *gsi, u32 err_ee, u32 channel_id, u32 code)

{

	if (code == GSI_OUT_OF_RESOURCES_ERR) {

	if (code == GSI_OUT_OF_RESOURCES) {

		dev_err(gsi->dev, "channel %u out of resources\n", channel_id);

		complete(&gsi->channel[channel_id].completion);

		return;
@@ -1067,7 +1049,7 @@ gsi_isr_glob_chan_err(struct gsi *gsi, u32 err_ee, u32 channel_id, u32 code) 
static void

gsi_isr_glob_evt_err(struct gsi *gsi, u32 err_ee, u32 evt_ring_id, u32 code)

{

	if (code == GSI_OUT_OF_RESOURCES_ERR) {

	if (code == GSI_OUT_OF_RESOURCES) {

		struct gsi_evt_ring *evt_ring = &gsi->evt_ring[evt_ring_id];

		u32 channel_id = gsi_channel_id(evt_ring->channel);

drivers/net/ipa/gsi_reg.h

+17 −0
Original line number Diff line number Diff line
@@ -384,6 +384,23 @@ enum gsi_general_id { 
#define ERR_VIRT_IDX_FMASK		GENMASK(23, 19)

#define ERR_TYPE_FMASK			GENMASK(27, 24)

#define ERR_EE_FMASK			GENMASK(31, 28)

/** enum gsi_err_code - ERR_CODE field values in EE_ERR_LOG */

enum gsi_err_code {

	GSI_INVALID_TRE				= 0x1,

	GSI_OUT_OF_BUFFERS			= 0x2,

	GSI_OUT_OF_RESOURCES			= 0x3,

	GSI_UNSUPPORTED_INTER_EE_OP		= 0x4,

	GSI_EVT_RING_EMPTY			= 0x5,

	GSI_NON_ALLOCATED_EVT_ACCESS		= 0x6,

	/* 7 is not assigned */

	GSI_HWO_1				= 0x8,

};

/** enum gsi_err_type - ERR_TYPE field values in EE_ERR_LOG */

enum gsi_err_type {

	GSI_ERR_TYPE_GLOB			= 0x1,

	GSI_ERR_TYPE_CHAN			= 0x2,

	GSI_ERR_TYPE_EVT			= 0x3,

};



#define GSI_ERROR_LOG_CLR_OFFSET \

			GSI_EE_N_ERROR_LOG_CLR_OFFSET(GSI_EE_AP)

CRA Git | Maintained and supported by SUSTech CRA and CCSE