Commit d773f404 authored Oct 28, 2020 by Alex Elder Committed by Jakub Kicinski Oct 30, 2020

net: ipa: fix resource group field mask definition



The mask for the RSRC_GRP field in the INIT_RSRC_GRP endpoint
initialization register is incorrectly defined for IPA v4.2 (where
it is only one bit wide).  So we need to fix this.

The fix is not straightforward, however.  Field masks are passed to
functions like u32_encode_bits(), and for that they must be constant.

To address this, we define a new inline function that returns the
*encoded* value to use for a given RSRC_GRP field, which depends on
the IPA version.  The caller can then use something like this, to
assign a given endpoint resource id 1:

    u32 offset = IPA_REG_ENDP_INIT_RSRC_GRP_N_OFFSET(endpoint_id);
    u32 val = rsrc_grp_encoded(ipa->version, 1);

    iowrite32(val, ipa->reg_virt + offset);

The next patch requires this fix.

Tested-by: Sujit Kautkar <sujitka@chromium.org>
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 279dc955

drivers/net/ipa/ipa_reg.h

+10 −1

Original line number	Diff line number	Diff line
		@@ -341,7 +341,16 @@ static inline u32 ipa_reg_idle_indication_cfg_offset(enum ipa_version version)

		#define IPA_REG_ENDP_INIT_RSRC_GRP_N_OFFSET(ep) \
		(0x00000838 + 0x0070 * (ep))
		#define RSRC_GRP_FMASK GENMASK(1, 0)
		/* Encoded value for RSRC_GRP endpoint register RSRC_GRP field */
		static inline u32 rsrc_grp_encoded(enum ipa_version version, u32 rsrc_grp)
		{
		switch (version) {
		case IPA_VERSION_4_2:
		return u32_encode_bits(rsrc_grp, GENMASK(0, 0));
		default:
		return u32_encode_bits(rsrc_grp, GENMASK(1, 0));
		}
		}

		/* Valid only for TX (IPA consumer) endpoints */
		#define IPA_REG_ENDP_INIT_SEQ_N_OFFSET(txep) \

Admin message