Commit 21e8aaca authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: fix some register validity checks 



A recent commit defined HW_PARAM_4 as a GSI register ID but did not
add it to gsi_reg_id_valid() to indicate it's valid (for IPA v5.0+).
Add version checks for the HW_PARAM_2 and INTER_EE IRQ GSI registers
there as well.

IPA v5.0 supports up to 8 source and destination resource groups.
Update the validity check (and the comments where the register IDs
are defined) to reflect that.  Similarly update comments and
validity checks for the hash/cache-related registers.

Note that this patch fixes an omission and constrains things
further, but these don't technically represent bugs.

Fixes: f651334e ("net: ipa: add HW_PARAM_4 GSI register")
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 786bbe50

drivers/net/ipa/gsi_reg.c

+8 −1
Original line number Diff line number Diff line
@@ -15,6 +15,14 @@ static bool gsi_reg_id_valid(struct gsi *gsi, enum gsi_reg_id reg_id) 
	switch (reg_id) {

	case INTER_EE_SRC_CH_IRQ_MSK:

	case INTER_EE_SRC_EV_CH_IRQ_MSK:

		return gsi->version >= IPA_VERSION_3_5;



	case HW_PARAM_2:

		return gsi->version >= IPA_VERSION_3_5_1;



	case HW_PARAM_4:

		return gsi->version >= IPA_VERSION_5_0;



	case CH_C_CNTXT_0:

	case CH_C_CNTXT_1:

	case CH_C_CNTXT_2:
@@ -43,7 +51,6 @@ static bool gsi_reg_id_valid(struct gsi *gsi, enum gsi_reg_id reg_id) 
	case CH_CMD:

	case EV_CH_CMD:

	case GENERIC_CMD:

	case HW_PARAM_2:

	case CNTXT_TYPE_IRQ:

	case CNTXT_TYPE_IRQ_MSK:

	case CNTXT_SRC_CH_IRQ:

drivers/net/ipa/ipa_reg.c

+16 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (C) 2019-2022 Linaro Ltd.

 * Copyright (C) 2019-2023 Linaro Ltd.

 */



#include <linux/io.h>
@@ -15,6 +15,17 @@ static bool ipa_reg_id_valid(struct ipa *ipa, enum ipa_reg_id reg_id) 
	enum ipa_version version = ipa->version;



	switch (reg_id) {

	case FILT_ROUT_HASH_EN:

		return version == IPA_VERSION_4_2;



	case FILT_ROUT_HASH_FLUSH:

		return version < IPA_VERSION_5_0 && version != IPA_VERSION_4_2;



	case FILT_ROUT_CACHE_FLUSH:

	case ENDP_FILTER_CACHE_CFG:

	case ENDP_ROUTER_CACHE_CFG:

		return version >= IPA_VERSION_5_0;



	case IPA_BCR:

	case COUNTER_CFG:

		return version < IPA_VERSION_4_5;
@@ -32,11 +43,13 @@ static bool ipa_reg_id_valid(struct ipa *ipa, enum ipa_reg_id reg_id) 
	case SRC_RSRC_GRP_45_RSRC_TYPE:

	case DST_RSRC_GRP_45_RSRC_TYPE:

		return version <= IPA_VERSION_3_1 ||

		       version == IPA_VERSION_4_5;

		       version == IPA_VERSION_4_5 ||

		       version == IPA_VERSION_5_0;



	case SRC_RSRC_GRP_67_RSRC_TYPE:

	case DST_RSRC_GRP_67_RSRC_TYPE:

		return version <= IPA_VERSION_3_1;

		return version <= IPA_VERSION_3_1 ||

		       version == IPA_VERSION_5_0;



	case ENDP_FILTER_ROUTER_HSH_CFG:

		return version < IPA_VERSION_5_0 &&
@@ -52,9 +65,6 @@ static bool ipa_reg_id_valid(struct ipa *ipa, enum ipa_reg_id reg_id) 
	case SHARED_MEM_SIZE:

	case QSB_MAX_WRITES:

	case QSB_MAX_READS:

	case FILT_ROUT_HASH_EN:

	case FILT_ROUT_HASH_FLUSH:

	case FILT_ROUT_CACHE_FLUSH:

	case STATE_AGGR_ACTIVE:

	case LOCAL_PKT_PROC_CNTXT:

	case AGGR_FORCE_CLOSE:
@@ -76,8 +86,6 @@ static bool ipa_reg_id_valid(struct ipa *ipa, enum ipa_reg_id reg_id) 
	case ENDP_INIT_RSRC_GRP:

	case ENDP_INIT_SEQ:

	case ENDP_STATUS:

	case ENDP_FILTER_CACHE_CFG:

	case ENDP_ROUTER_CACHE_CFG:

	case IPA_IRQ_STTS:

	case IPA_IRQ_EN:

	case IPA_IRQ_CLR:

drivers/net/ipa/ipa_reg.h

+6 −6
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ enum ipa_reg_id { 
	SHARED_MEM_SIZE,

	QSB_MAX_WRITES,

	QSB_MAX_READS,

	FILT_ROUT_HASH_EN,				/* Not IPA v5.0+ */

	FILT_ROUT_HASH_FLUSH,				/* Not IPA v5.0+ */

	FILT_ROUT_HASH_EN,				/* IPA v4.2 */

	FILT_ROUT_HASH_FLUSH,			/* Not IPA v4.2 nor IPA v5.0+ */

	FILT_ROUT_CACHE_FLUSH,				/* IPA v5.0+ */

	STATE_AGGR_ACTIVE,

	IPA_BCR,					/* Not IPA v4.5+ */
@@ -76,12 +76,12 @@ enum ipa_reg_id { 
	TIMERS_PULSE_GRAN_CFG,				/* IPA v4.5+ */

	SRC_RSRC_GRP_01_RSRC_TYPE,

	SRC_RSRC_GRP_23_RSRC_TYPE,

	SRC_RSRC_GRP_45_RSRC_TYPE,		/* Not IPA v3.5+, IPA v4.5 */

	SRC_RSRC_GRP_67_RSRC_TYPE,			/* Not IPA v3.5+ */

	SRC_RSRC_GRP_45_RSRC_TYPE,	/* Not IPA v3.5+; IPA v4.5, IPA v5.0 */

	SRC_RSRC_GRP_67_RSRC_TYPE,		/* Not IPA v3.5+; IPA v5.0 */

	DST_RSRC_GRP_01_RSRC_TYPE,

	DST_RSRC_GRP_23_RSRC_TYPE,

	DST_RSRC_GRP_45_RSRC_TYPE,		/* Not IPA v3.5+, IPA v4.5 */

	DST_RSRC_GRP_67_RSRC_TYPE,			/* Not IPA v3.5+ */

	DST_RSRC_GRP_45_RSRC_TYPE,	/* Not IPA v3.5+; IPA v4.5, IPA v5.0 */

	DST_RSRC_GRP_67_RSRC_TYPE,		/* Not IPA v3.5+; IPA v5.0 */

	ENDP_INIT_CTRL,		/* Not IPA v4.2+ for TX, not IPA v4.0+ for RX */

	ENDP_INIT_CFG,

	ENDP_INIT_NAT,			/* TX only */