[PATCH net-next 4/6] net: ipa: avoid setting an undefined field

From: Alex Elder
Date: Wed Feb 15 2023 - 14:54:23 EST


The GSI channel protocol field in the CH_C_CNTXT_0 GSI register is
widened starting IPA v5.0, making the CHTYPE_PROTOCOL_MSB field
added in IPA v4.5 unnecessary. Update the code to reflect this.

Signed-off-by: Alex Elder <elder@xxxxxxxxxx>
---
drivers/net/ipa/gsi.c | 2 +-
drivers/net/ipa/gsi_reg.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 0e6f679f71a8c..88279956194a9 100644
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -185,7 +185,7 @@ static u32 ch_c_cntxt_0_type_encode(enum ipa_version version,
u32 val;

val = reg_encode(reg, CHTYPE_PROTOCOL, type);
- if (version < IPA_VERSION_4_5)
+ if (version < IPA_VERSION_4_5 || version >= IPA_VERSION_5_0)
return val;

type >>= hweight32(reg_fmask(reg, CHTYPE_PROTOCOL));
diff --git a/drivers/net/ipa/gsi_reg.h b/drivers/net/ipa/gsi_reg.h
index a0b7ff0dcdfda..52520cd44c3e1 100644
--- a/drivers/net/ipa/gsi_reg.h
+++ b/drivers/net/ipa/gsi_reg.h
@@ -101,7 +101,7 @@ enum gsi_reg_ch_c_cntxt_0_field_id {
CHTYPE_DIR,
CH_EE,
CHID,
- CHTYPE_PROTOCOL_MSB, /* IPA v4.9+ */
+ CHTYPE_PROTOCOL_MSB, /* IPA v4.5-4.11 */
ERINDEX,
CHSTATE,
ELEMENT_SIZE,
--
2.34.1