Commit 4a04d65c authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: refer to IPA versions, not GSI 



The GSI code is now exposed to IPA version numbers, and we handle
version-specific behavior based on the IPA version.

Modify some comments that talk about GSI versions so they reference
IPA versions instead.  Correct version number errors in a couple of
these comments.

The (comment) mapping between IPA and GSI versions in the definition
of the ipa_version enumerated type remains.

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

drivers/net/ipa/gsi_reg.h

+5 −5
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
#define CHTYPE_DIR_FMASK		GENMASK(3, 3)

#define EE_FMASK			GENMASK(7, 4)

#define CHID_FMASK			GENMASK(12, 8)

/* The next field is present for GSI v2.0 and above */

/* The next field is present for IPA v4.5 and above */

#define CHTYPE_PROTOCOL_MSB_FMASK	GENMASK(13, 13)

#define ERINDEX_FMASK			GENMASK(18, 14)

#define CHSTATE_FMASK			GENMASK(23, 20)
@@ -95,7 +95,7 @@ 
#define WRR_WEIGHT_FMASK		GENMASK(3, 0)

#define MAX_PREFETCH_FMASK		GENMASK(8, 8)

#define USE_DB_ENG_FMASK		GENMASK(9, 9)

/* The next field is present for GSI v2.0 and above */

/* The next field is only present for IPA v4.0, v4.1, and v4.2 */

#define USE_ESCAPE_BUF_ONLY_FMASK	GENMASK(10, 10)



#define GSI_CH_C_SCRATCH_0_OFFSET(ch) \
@@ -238,19 +238,19 @@ 
#define IRAM_SIZE_FMASK			GENMASK(2, 0)

#define IRAM_SIZE_ONE_KB_FVAL			0

#define IRAM_SIZE_TWO_KB_FVAL			1

/* The next two values are available for GSI v2.0 and above */

/* The next two values are available for IPA v4.0 and above */

#define IRAM_SIZE_TWO_N_HALF_KB_FVAL		2

#define IRAM_SIZE_THREE_KB_FVAL			3

#define NUM_CH_PER_EE_FMASK		GENMASK(7, 3)

#define NUM_EV_PER_EE_FMASK		GENMASK(12, 8)

#define GSI_CH_PEND_TRANSLATE_FMASK	GENMASK(13, 13)

#define GSI_CH_FULL_LOGIC_FMASK		GENMASK(14, 14)

/* Fields below are present for GSI v2.0 and above */

/* Fields below are present for IPA v4.0 and above */

#define GSI_USE_SDMA_FMASK		GENMASK(15, 15)

#define GSI_SDMA_N_INT_FMASK		GENMASK(18, 16)

#define GSI_SDMA_MAX_BURST_FMASK	GENMASK(26, 19)

#define GSI_SDMA_N_IOVEC_FMASK		GENMASK(29, 27)

/* Fields below are present for GSI v2.2 and above */

/* Fields below are present for IPA v4.2 and above */

#define GSI_USE_RD_WR_ENG_FMASK		GENMASK(30, 30)

#define GSI_USE_INTER_EE_FMASK		GENMASK(31, 31)