From: Jami Kettunen <jami.kettunen@somainline.org>
To: Caleb Connolly <caleb.connolly@linaro.org>
Cc: Alex Elder <elder@linaro.org>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Alex Elder <elder@kernel.org>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH v2 2/2] net: ipa: fix v3.1 resource limit masks
Date: Tue, 25 Oct 2022 23:03:07 +0300 [thread overview]
Message-ID: <1b3438b9c5c33eeae0f648843ab0eb10@somainline.org> (raw)
In-Reply-To: <20221024210336.4014983-2-caleb.connolly@linaro.org>
On 25.10.2022 00:03, Caleb Connolly wrote:
> The resource group limits for IPA v3.1 mistakenly used 6 bit wide mask
> values, when the hardware actually uses 8. Out of range values were
> silently ignored before, so the IPA worked as expected. However the
> new generalised register definitions introduce stricter checking here,
> they now cause some splats and result in the value 0 being written
> instead. Fix the limit bitmask widths so that the correct values can be
> written.
>
> Fixes: 1c418c4a929c ("net: ipa: define resource group/type IPA register
> fields")
> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
Tested-by: Jami Kettunen <jami.kettunen@somainline.org>
> ---
> drivers/net/ipa/reg/ipa_reg-v3.1.c | 96 ++++++++++--------------------
> 1 file changed, 32 insertions(+), 64 deletions(-)
>
> diff --git a/drivers/net/ipa/reg/ipa_reg-v3.1.c
> b/drivers/net/ipa/reg/ipa_reg-v3.1.c
> index 116b27717e3d..0d002c3c38a2 100644
> --- a/drivers/net/ipa/reg/ipa_reg-v3.1.c
> +++ b/drivers/net/ipa/reg/ipa_reg-v3.1.c
> @@ -127,112 +127,80 @@ static const u32 ipa_reg_counter_cfg_fmask[] = {
> IPA_REG_FIELDS(COUNTER_CFG, counter_cfg, 0x000001f0);
>
> static const u32 ipa_reg_src_rsrc_grp_01_rsrc_type_fmask[] = {
> - [X_MIN_LIM] = GENMASK(5, 0),
> - /* Bits 6-7 reserved */
> - [X_MAX_LIM] = GENMASK(13, 8),
> - /* Bits 14-15 reserved */
> - [Y_MIN_LIM] = GENMASK(21, 16),
> - /* Bits 22-23 reserved */
> - [Y_MAX_LIM] = GENMASK(29, 24),
> - /* Bits 30-31 reserved */
> + [X_MIN_LIM] = GENMASK(7, 0),
> + [X_MAX_LIM] = GENMASK(15, 8),
> + [Y_MIN_LIM] = GENMASK(23, 16),
> + [Y_MAX_LIM] = GENMASK(31, 24),
> };
>
> IPA_REG_STRIDE_FIELDS(SRC_RSRC_GRP_01_RSRC_TYPE,
> src_rsrc_grp_01_rsrc_type,
> 0x00000400, 0x0020);
>
> static const u32 ipa_reg_src_rsrc_grp_23_rsrc_type_fmask[] = {
> - [X_MIN_LIM] = GENMASK(5, 0),
> - /* Bits 6-7 reserved */
> - [X_MAX_LIM] = GENMASK(13, 8),
> - /* Bits 14-15 reserved */
> - [Y_MIN_LIM] = GENMASK(21, 16),
> - /* Bits 22-23 reserved */
> - [Y_MAX_LIM] = GENMASK(29, 24),
> - /* Bits 30-31 reserved */
> + [X_MIN_LIM] = GENMASK(7, 0),
> + [X_MAX_LIM] = GENMASK(15, 8),
> + [Y_MIN_LIM] = GENMASK(23, 16),
> + [Y_MAX_LIM] = GENMASK(31, 24),
> };
>
> IPA_REG_STRIDE_FIELDS(SRC_RSRC_GRP_23_RSRC_TYPE,
> src_rsrc_grp_23_rsrc_type,
> 0x00000404, 0x0020);
>
> static const u32 ipa_reg_src_rsrc_grp_45_rsrc_type_fmask[] = {
> - [X_MIN_LIM] = GENMASK(5, 0),
> - /* Bits 6-7 reserved */
> - [X_MAX_LIM] = GENMASK(13, 8),
> - /* Bits 14-15 reserved */
> - [Y_MIN_LIM] = GENMASK(21, 16),
> - /* Bits 22-23 reserved */
> - [Y_MAX_LIM] = GENMASK(29, 24),
> - /* Bits 30-31 reserved */
> + [X_MIN_LIM] = GENMASK(7, 0),
> + [X_MAX_LIM] = GENMASK(15, 8),
> + [Y_MIN_LIM] = GENMASK(23, 16),
> + [Y_MAX_LIM] = GENMASK(31, 24),
> };
>
> IPA_REG_STRIDE_FIELDS(SRC_RSRC_GRP_45_RSRC_TYPE,
> src_rsrc_grp_45_rsrc_type,
> 0x00000408, 0x0020);
>
> static const u32 ipa_reg_src_rsrc_grp_67_rsrc_type_fmask[] = {
> - [X_MIN_LIM] = GENMASK(5, 0),
> - /* Bits 6-7 reserved */
> - [X_MAX_LIM] = GENMASK(13, 8),
> - /* Bits 14-15 reserved */
> - [Y_MIN_LIM] = GENMASK(21, 16),
> - /* Bits 22-23 reserved */
> - [Y_MAX_LIM] = GENMASK(29, 24),
> - /* Bits 30-31 reserved */
> + [X_MIN_LIM] = GENMASK(7, 0),
> + [X_MAX_LIM] = GENMASK(15, 8),
> + [Y_MIN_LIM] = GENMASK(23, 16),
> + [Y_MAX_LIM] = GENMASK(31, 24),
> };
>
> IPA_REG_STRIDE_FIELDS(SRC_RSRC_GRP_67_RSRC_TYPE,
> src_rsrc_grp_67_rsrc_type,
> 0x0000040c, 0x0020);
>
> static const u32 ipa_reg_dst_rsrc_grp_01_rsrc_type_fmask[] = {
> - [X_MIN_LIM] = GENMASK(5, 0),
> - /* Bits 6-7 reserved */
> - [X_MAX_LIM] = GENMASK(13, 8),
> - /* Bits 14-15 reserved */
> - [Y_MIN_LIM] = GENMASK(21, 16),
> - /* Bits 22-23 reserved */
> - [Y_MAX_LIM] = GENMASK(29, 24),
> - /* Bits 30-31 reserved */
> + [X_MIN_LIM] = GENMASK(7, 0),
> + [X_MAX_LIM] = GENMASK(15, 8),
> + [Y_MIN_LIM] = GENMASK(23, 16),
> + [Y_MAX_LIM] = GENMASK(31, 24),
> };
>
> IPA_REG_STRIDE_FIELDS(DST_RSRC_GRP_01_RSRC_TYPE,
> dst_rsrc_grp_01_rsrc_type,
> 0x00000500, 0x0020);
>
> static const u32 ipa_reg_dst_rsrc_grp_23_rsrc_type_fmask[] = {
> - [X_MIN_LIM] = GENMASK(5, 0),
> - /* Bits 6-7 reserved */
> - [X_MAX_LIM] = GENMASK(13, 8),
> - /* Bits 14-15 reserved */
> - [Y_MIN_LIM] = GENMASK(21, 16),
> - /* Bits 22-23 reserved */
> - [Y_MAX_LIM] = GENMASK(29, 24),
> - /* Bits 30-31 reserved */
> + [X_MIN_LIM] = GENMASK(7, 0),
> + [X_MAX_LIM] = GENMASK(15, 8),
> + [Y_MIN_LIM] = GENMASK(23, 16),
> + [Y_MAX_LIM] = GENMASK(31, 24),
> };
>
> IPA_REG_STRIDE_FIELDS(DST_RSRC_GRP_23_RSRC_TYPE,
> dst_rsrc_grp_23_rsrc_type,
> 0x00000504, 0x0020);
>
> static const u32 ipa_reg_dst_rsrc_grp_45_rsrc_type_fmask[] = {
> - [X_MIN_LIM] = GENMASK(5, 0),
> - /* Bits 6-7 reserved */
> - [X_MAX_LIM] = GENMASK(13, 8),
> - /* Bits 14-15 reserved */
> - [Y_MIN_LIM] = GENMASK(21, 16),
> - /* Bits 22-23 reserved */
> - [Y_MAX_LIM] = GENMASK(29, 24),
> - /* Bits 30-31 reserved */
> + [X_MIN_LIM] = GENMASK(7, 0),
> + [X_MAX_LIM] = GENMASK(15, 8),
> + [Y_MIN_LIM] = GENMASK(23, 16),
> + [Y_MAX_LIM] = GENMASK(31, 24),
> };
>
> IPA_REG_STRIDE_FIELDS(DST_RSRC_GRP_45_RSRC_TYPE,
> dst_rsrc_grp_45_rsrc_type,
> 0x00000508, 0x0020);
>
> static const u32 ipa_reg_dst_rsrc_grp_67_rsrc_type_fmask[] = {
> - [X_MIN_LIM] = GENMASK(5, 0),
> - /* Bits 6-7 reserved */
> - [X_MAX_LIM] = GENMASK(13, 8),
> - /* Bits 14-15 reserved */
> - [Y_MIN_LIM] = GENMASK(21, 16),
> - /* Bits 22-23 reserved */
> - [Y_MAX_LIM] = GENMASK(29, 24),
> - /* Bits 30-31 reserved */
> + [X_MIN_LIM] = GENMASK(7, 0),
> + [X_MAX_LIM] = GENMASK(15, 8),
> + [Y_MIN_LIM] = GENMASK(23, 16),
> + [Y_MAX_LIM] = GENMASK(31, 24),
> };
>
> IPA_REG_STRIDE_FIELDS(DST_RSRC_GRP_67_RSRC_TYPE,
> dst_rsrc_grp_67_rsrc_type,
next prev parent reply other threads:[~2022-10-25 20:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-24 21:03 [PATCH v2 1/2] net: ipa: fix v3.5.1 resource limit max values Caleb Connolly
2022-10-24 21:03 ` [PATCH v2 2/2] net: ipa: fix v3.1 resource limit masks Caleb Connolly
2022-10-24 21:36 ` Alex Elder
2022-10-25 20:03 ` Jami Kettunen [this message]
2022-10-24 21:36 ` [PATCH v2 1/2] net: ipa: fix v3.5.1 resource limit max values Alex Elder
2022-10-26 3:00 ` 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=1b3438b9c5c33eeae0f648843ab0eb10@somainline.org \
--to=jami.kettunen@somainline.org \
--cc=caleb.connolly@linaro.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=elder@kernel.org \
--cc=elder@linaro.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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;
as well as URLs for NNTP newsgroup(s).