From: Alex Elder <elder@linaro.org>
To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com
Cc: caleb.connolly@linaro.org, mka@chromium.org,
evgreen@chromium.org, andersson@kernel.org,
quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com,
quic_jponduru@quicinc.com, quic_subashab@quicinc.com,
elder@kernel.org, netdev@vger.kernel.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 4/6] net: ipa: avoid setting an undefined field
Date: Wed, 15 Feb 2023 13:53:50 -0600 [thread overview]
Message-ID: <20230215195352.755744-5-elder@linaro.org> (raw)
In-Reply-To: <20230215195352.755744-1-elder@linaro.org>
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@linaro.org>
---
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
next prev parent reply other threads:[~2023-02-15 19:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 19:53 [PATCH net-next 0/6] net: final GSI register updates Alex Elder
2023-02-15 19:53 ` [PATCH net-next 1/6] net: ipa: fix an incorrect assignment Alex Elder
2023-02-15 19:53 ` [PATCH net-next 2/6] net: ipa: kill gsi->virt_raw Alex Elder
2023-02-16 17:51 ` Alexander Lobakin
2023-02-16 18:11 ` Alex Elder
2023-02-17 11:57 ` Alexander Lobakin
2023-02-17 13:04 ` Alex Elder
2023-03-05 16:58 ` Alex Elder
2023-03-06 10:30 ` Alexander Lobakin
2023-02-15 19:53 ` [PATCH net-next 3/6] net: ipa: kill ev_ch_e_cntxt_1_length_encode() Alex Elder
2023-02-15 19:53 ` Alex Elder [this message]
2023-02-15 19:53 ` [PATCH net-next 5/6] net: ipa: support different event ring encoding Alex Elder
2023-02-15 19:53 ` [PATCH net-next 6/6] net: ipa: add HW_PARAM_4 GSI register Alex Elder
2023-02-20 7:30 ` [PATCH net-next 0/6] net: final GSI register updates patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230215195352.755744-5-elder@linaro.org \
--to=elder@linaro.org \
--cc=andersson@kernel.org \
--cc=caleb.connolly@linaro.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=elder@kernel.org \
--cc=evgreen@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mka@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=quic_avuyyuru@quicinc.com \
--cc=quic_cpratapa@quicinc.com \
--cc=quic_jponduru@quicinc.com \
--cc=quic_subashab@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox