Commit 786bbe50 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: kill FILT_ROUT_CACHE_CFG IPA register 



A recent commit defined a few IPA registers used for IPA v5.0+.
One of those was a mistake.  Although the filter and router caches
get *flushed* using a single register, they use distinct registers
(ENDP_FILTER_CACHE_CFG and ENDP_ROUTER_CACHE_CFG) for configuration.

And although there *exists* a FILT_ROUT_CACHE_CFG register, it is
not needed in upstream code.  So get rid of definitions related to
FILT_ROUT_CACHE_CFG, because they are not needed.

Fixes: 8ba59716 ("net: ipa: define IPA v5.0+ registers")
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 55c49e5c

drivers/net/ipa/ipa_reg.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ static bool ipa_reg_id_valid(struct ipa *ipa, enum ipa_reg_id reg_id) 
		return version <= IPA_VERSION_3_1;



	case ENDP_FILTER_ROUTER_HSH_CFG:

		return version != IPA_VERSION_4_2;

		return version < IPA_VERSION_5_0 &&

			version != IPA_VERSION_4_2;



	case IRQ_SUSPEND_EN:

	case IRQ_SUSPEND_CLR:
@@ -52,7 +53,6 @@ static bool ipa_reg_id_valid(struct ipa *ipa, enum ipa_reg_id reg_id) 
	case QSB_MAX_WRITES:

	case QSB_MAX_READS:

	case FILT_ROUT_HASH_EN:

	case FILT_ROUT_CACHE_CFG:

	case FILT_ROUT_HASH_FLUSH:

	case FILT_ROUT_CACHE_FLUSH:

	case STATE_AGGR_ACTIVE:

drivers/net/ipa/ipa_reg.h

+0 −9
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ enum ipa_reg_id { 
	QSB_MAX_WRITES,

	QSB_MAX_READS,

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

	FILT_ROUT_CACHE_CFG,				/* IPA v5.0+ */

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

	FILT_ROUT_CACHE_FLUSH,				/* IPA v5.0+ */

	STATE_AGGR_ACTIVE,
@@ -206,14 +205,6 @@ enum ipa_reg_qsb_max_reads_field_id { 
	GEN_QMB_1_MAX_READS_BEATS,			/* IPA v4.0+ */

};



/* FILT_ROUT_CACHE_CFG register */

enum ipa_reg_filt_rout_cache_cfg_field_id {

	ROUTER_CACHE_EN,

	FILTER_CACHE_EN,

	LOW_PRI_HASH_HIT_DISABLE,

	LRU_EVICTION_THRESHOLD,

};



/* FILT_ROUT_HASH_EN and FILT_ROUT_HASH_FLUSH registers */

enum ipa_reg_filt_rout_hash_field_id {

	IPV6_ROUTER_HASH,