lkml.org 
[lkml]   [2023]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH net v2 3/4] net: ipa: kill FILT_ROUT_CACHE_CFG IPA register
From
On 3/15/23 2:35 PM, Alex Elder wrote:
> 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: de101ca79f97 ("net: ipa: define IPA v5.0+ registers")'

AGAIN! This is a bad commit ID. It should be 8ba59716d16a.

I've got a new series ready to go but I'll wait until
tomorrow to post it.

Sorry for the noise.

-Alex


> Signed-off-by: Alex Elder <elder@linaro.org>
> ---
> drivers/net/ipa/ipa_reg.c | 4 ++--
> drivers/net/ipa/ipa_reg.h | 9 ---------
> 2 files changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/ipa/ipa_reg.c b/drivers/net/ipa/ipa_reg.c
> index 735fa65916097..463a31dfa9f47 100644
> --- a/drivers/net/ipa/ipa_reg.c
> +++ b/drivers/net/ipa/ipa_reg.c
> @@ -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:
> diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h
> index 28aa1351dd488..ff2be8be0f683 100644
> --- a/drivers/net/ipa/ipa_reg.h
> +++ b/drivers/net/ipa/ipa_reg.h
> @@ -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,

\
 
 \ /
  Last update: 2023-03-27 01:01    [W:2.155 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site