From: Alex Elder <elder@linaro.org>
To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com
Cc: mka@chromium.org, andersson@kernel.org,
quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com,
quic_jponduru@quicinc.com, quic_subashab@quicinc.com,
elder@kernel.org, netdev@vger.kernel.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next v2 4/8] net: ipa: remove unneeded FILT_ROUT_HASH_EN definitions
Date: Fri, 19 Apr 2024 10:17:56 -0500 [thread overview]
Message-ID: <20240419151800.2168903-5-elder@linaro.org> (raw)
In-Reply-To: <20240419151800.2168903-1-elder@linaro.org>
The FILT_ROUT_HASH_EN register is only used for IPA v4.2. There,
routing and filter table hashing are not supported, and so the
register must be written to disable the feature. No other version
uses this register, so its definition can be removed. If we need to
use these some day (for example, explicitly enable the feature) this
commit can be reverted.
Signed-off-by: Alex Elder <elder@linaro.org>
---
drivers/net/ipa/reg/ipa_reg-v3.1.c | 14 --------------
drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 14 --------------
drivers/net/ipa/reg/ipa_reg-v4.11.c | 14 --------------
drivers/net/ipa/reg/ipa_reg-v4.5.c | 14 --------------
drivers/net/ipa/reg/ipa_reg-v4.7.c | 14 --------------
drivers/net/ipa/reg/ipa_reg-v4.9.c | 14 --------------
6 files changed, 84 deletions(-)
diff --git a/drivers/net/ipa/reg/ipa_reg-v3.1.c b/drivers/net/ipa/reg/ipa_reg-v3.1.c
index 63a44dce88353..a891037015836 100644
--- a/drivers/net/ipa/reg/ipa_reg-v3.1.c
+++ b/drivers/net/ipa/reg/ipa_reg-v3.1.c
@@ -78,19 +78,6 @@ static const u32 reg_qsb_max_reads_fmask[] = {
REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078);
-static const u32 reg_filt_rout_hash_en_fmask[] = {
- [IPV6_ROUTER_HASH] = BIT(0),
- /* Bits 1-3 reserved */
- [IPV6_FILTER_HASH] = BIT(4),
- /* Bits 5-7 reserved */
- [IPV4_ROUTER_HASH] = BIT(8),
- /* Bits 9-11 reserved */
- [IPV4_FILTER_HASH] = BIT(12),
- /* Bits 13-31 reserved */
-};
-
-REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x000008c);
-
static const u32 reg_filt_rout_hash_flush_fmask[] = {
[IPV6_ROUTER_HASH] = BIT(0),
/* Bits 1-3 reserved */
@@ -405,7 +392,6 @@ static const struct reg *reg_array[] = {
[SHARED_MEM_SIZE] = ®_shared_mem_size,
[QSB_MAX_WRITES] = ®_qsb_max_writes,
[QSB_MAX_READS] = ®_qsb_max_reads,
- [FILT_ROUT_HASH_EN] = ®_filt_rout_hash_en,
[FILT_ROUT_HASH_FLUSH] = ®_filt_rout_hash_flush,
[STATE_AGGR_ACTIVE] = ®_state_aggr_active,
[IPA_BCR] = ®_ipa_bcr,
diff --git a/drivers/net/ipa/reg/ipa_reg-v3.5.1.c b/drivers/net/ipa/reg/ipa_reg-v3.5.1.c
index 4a7b6d92207de..c81c48ec51f90 100644
--- a/drivers/net/ipa/reg/ipa_reg-v3.5.1.c
+++ b/drivers/net/ipa/reg/ipa_reg-v3.5.1.c
@@ -83,19 +83,6 @@ static const u32 reg_qsb_max_reads_fmask[] = {
REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078);
-static const u32 reg_filt_rout_hash_en_fmask[] = {
- [IPV6_ROUTER_HASH] = BIT(0),
- /* Bits 1-3 reserved */
- [IPV6_FILTER_HASH] = BIT(4),
- /* Bits 5-7 reserved */
- [IPV4_ROUTER_HASH] = BIT(8),
- /* Bits 9-11 reserved */
- [IPV4_FILTER_HASH] = BIT(12),
- /* Bits 13-31 reserved */
-};
-
-REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x000008c);
-
static const u32 reg_filt_rout_hash_flush_fmask[] = {
[IPV6_ROUTER_HASH] = BIT(0),
/* Bits 1-3 reserved */
@@ -416,7 +403,6 @@ static const struct reg *reg_array[] = {
[SHARED_MEM_SIZE] = ®_shared_mem_size,
[QSB_MAX_WRITES] = ®_qsb_max_writes,
[QSB_MAX_READS] = ®_qsb_max_reads,
- [FILT_ROUT_HASH_EN] = ®_filt_rout_hash_en,
[FILT_ROUT_HASH_FLUSH] = ®_filt_rout_hash_flush,
[STATE_AGGR_ACTIVE] = ®_state_aggr_active,
[IPA_BCR] = ®_ipa_bcr,
diff --git a/drivers/net/ipa/reg/ipa_reg-v4.11.c b/drivers/net/ipa/reg/ipa_reg-v4.11.c
index 257eaff9436e5..18bddc32c9318 100644
--- a/drivers/net/ipa/reg/ipa_reg-v4.11.c
+++ b/drivers/net/ipa/reg/ipa_reg-v4.11.c
@@ -115,19 +115,6 @@ static const u32 reg_qsb_max_reads_fmask[] = {
REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078);
-static const u32 reg_filt_rout_hash_en_fmask[] = {
- [IPV6_ROUTER_HASH] = BIT(0),
- /* Bits 1-3 reserved */
- [IPV6_FILTER_HASH] = BIT(4),
- /* Bits 5-7 reserved */
- [IPV4_ROUTER_HASH] = BIT(8),
- /* Bits 9-11 reserved */
- [IPV4_FILTER_HASH] = BIT(12),
- /* Bits 13-31 reserved */
-};
-
-REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148);
-
static const u32 reg_filt_rout_hash_flush_fmask[] = {
[IPV6_ROUTER_HASH] = BIT(0),
/* Bits 1-3 reserved */
@@ -472,7 +459,6 @@ static const struct reg *reg_array[] = {
[SHARED_MEM_SIZE] = ®_shared_mem_size,
[QSB_MAX_WRITES] = ®_qsb_max_writes,
[QSB_MAX_READS] = ®_qsb_max_reads,
- [FILT_ROUT_HASH_EN] = ®_filt_rout_hash_en,
[FILT_ROUT_HASH_FLUSH] = ®_filt_rout_hash_flush,
[STATE_AGGR_ACTIVE] = ®_state_aggr_active,
[LOCAL_PKT_PROC_CNTXT] = ®_local_pkt_proc_cntxt,
diff --git a/drivers/net/ipa/reg/ipa_reg-v4.5.c b/drivers/net/ipa/reg/ipa_reg-v4.5.c
index dc396344d868a..8494731efdd3b 100644
--- a/drivers/net/ipa/reg/ipa_reg-v4.5.c
+++ b/drivers/net/ipa/reg/ipa_reg-v4.5.c
@@ -109,19 +109,6 @@ static const u32 reg_qsb_max_reads_fmask[] = {
REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078);
-static const u32 reg_filt_rout_hash_en_fmask[] = {
- [IPV6_ROUTER_HASH] = BIT(0),
- /* Bits 1-3 reserved */
- [IPV6_FILTER_HASH] = BIT(4),
- /* Bits 5-7 reserved */
- [IPV4_ROUTER_HASH] = BIT(8),
- /* Bits 9-11 reserved */
- [IPV4_FILTER_HASH] = BIT(12),
- /* Bits 13-31 reserved */
-};
-
-REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148);
-
static const u32 reg_filt_rout_hash_flush_fmask[] = {
[IPV6_ROUTER_HASH] = BIT(0),
/* Bits 1-3 reserved */
@@ -491,7 +478,6 @@ static const struct reg *reg_array[] = {
[SHARED_MEM_SIZE] = ®_shared_mem_size,
[QSB_MAX_WRITES] = ®_qsb_max_writes,
[QSB_MAX_READS] = ®_qsb_max_reads,
- [FILT_ROUT_HASH_EN] = ®_filt_rout_hash_en,
[FILT_ROUT_HASH_FLUSH] = ®_filt_rout_hash_flush,
[STATE_AGGR_ACTIVE] = ®_state_aggr_active,
[LOCAL_PKT_PROC_CNTXT] = ®_local_pkt_proc_cntxt,
diff --git a/drivers/net/ipa/reg/ipa_reg-v4.7.c b/drivers/net/ipa/reg/ipa_reg-v4.7.c
index 37a2e466e4755..2c161cf691935 100644
--- a/drivers/net/ipa/reg/ipa_reg-v4.7.c
+++ b/drivers/net/ipa/reg/ipa_reg-v4.7.c
@@ -109,19 +109,6 @@ static const u32 reg_qsb_max_reads_fmask[] = {
REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078);
-static const u32 reg_filt_rout_hash_en_fmask[] = {
- [IPV6_ROUTER_HASH] = BIT(0),
- /* Bits 1-3 reserved */
- [IPV6_FILTER_HASH] = BIT(4),
- /* Bits 5-7 reserved */
- [IPV4_ROUTER_HASH] = BIT(8),
- /* Bits 9-11 reserved */
- [IPV4_FILTER_HASH] = BIT(12),
- /* Bits 13-31 reserved */
-};
-
-REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148);
-
static const u32 reg_filt_rout_hash_flush_fmask[] = {
[IPV6_ROUTER_HASH] = BIT(0),
/* Bits 1-3 reserved */
@@ -464,7 +451,6 @@ static const struct reg *reg_array[] = {
[SHARED_MEM_SIZE] = ®_shared_mem_size,
[QSB_MAX_WRITES] = ®_qsb_max_writes,
[QSB_MAX_READS] = ®_qsb_max_reads,
- [FILT_ROUT_HASH_EN] = ®_filt_rout_hash_en,
[FILT_ROUT_HASH_FLUSH] = ®_filt_rout_hash_flush,
[STATE_AGGR_ACTIVE] = ®_state_aggr_active,
[LOCAL_PKT_PROC_CNTXT] = ®_local_pkt_proc_cntxt,
diff --git a/drivers/net/ipa/reg/ipa_reg-v4.9.c b/drivers/net/ipa/reg/ipa_reg-v4.9.c
index 09755d700784e..fa6fd312e4867 100644
--- a/drivers/net/ipa/reg/ipa_reg-v4.9.c
+++ b/drivers/net/ipa/reg/ipa_reg-v4.9.c
@@ -114,19 +114,6 @@ static const u32 reg_qsb_max_reads_fmask[] = {
REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078);
-static const u32 reg_filt_rout_hash_en_fmask[] = {
- [IPV6_ROUTER_HASH] = BIT(0),
- /* Bits 1-3 reserved */
- [IPV6_FILTER_HASH] = BIT(4),
- /* Bits 5-7 reserved */
- [IPV4_ROUTER_HASH] = BIT(8),
- /* Bits 9-11 reserved */
- [IPV4_FILTER_HASH] = BIT(12),
- /* Bits 13-31 reserved */
-};
-
-REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148);
-
static const u32 reg_filt_rout_hash_flush_fmask[] = {
[IPV6_ROUTER_HASH] = BIT(0),
/* Bits 1-3 reserved */
@@ -469,7 +456,6 @@ static const struct reg *reg_array[] = {
[SHARED_MEM_SIZE] = ®_shared_mem_size,
[QSB_MAX_WRITES] = ®_qsb_max_writes,
[QSB_MAX_READS] = ®_qsb_max_reads,
- [FILT_ROUT_HASH_EN] = ®_filt_rout_hash_en,
[FILT_ROUT_HASH_FLUSH] = ®_filt_rout_hash_flush,
[STATE_AGGR_ACTIVE] = ®_state_aggr_active,
[LOCAL_PKT_PROC_CNTXT] = ®_local_pkt_proc_cntxt,
--
2.40.1
next prev parent reply other threads:[~2024-04-19 15:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 15:17 [PATCH net-next v2 0/8] net: ipa: eight simple cleanups Alex Elder
2024-04-19 15:17 ` [PATCH net-next v2 1/8] net: ipa: maintain bitmap of suspend-enabled endpoints Alex Elder
2024-04-19 15:17 ` [PATCH net-next v2 2/8] net: ipa: only enable the SUSPEND IPA interrupt when needed Alex Elder
2024-04-19 15:17 ` [PATCH net-next v2 3/8] net: ipa: call device_init_wakeup() earlier Alex Elder
2024-04-19 15:17 ` Alex Elder [this message]
2024-04-19 15:17 ` [PATCH net-next v2 5/8] net: ipa: make ipa_table_hash_support() a real function Alex Elder
2024-04-19 15:17 ` [PATCH net-next v2 6/8] net: ipa: fix two bogus argument names Alex Elder
2024-04-19 15:17 ` [PATCH net-next v2 7/8] net: ipa: fix two minor ipa_cmd problems Alex Elder
2024-04-23 11:21 ` Paolo Abeni
2024-04-23 12:36 ` Alex Elder
2024-04-19 15:18 ` [PATCH net-next v2 8/8] net: ipa: kill ipa_version_supported() Alex Elder
2024-04-23 11:30 ` [PATCH net-next v2 0/8] net: ipa: eight simple cleanups 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=20240419151800.2168903-5-elder@linaro.org \
--to=elder@linaro.org \
--cc=andersson@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=elder@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mka@chromium.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=quic_avuyyuru@quicinc.com \
--cc=quic_cpratapa@quicinc.com \
--cc=quic_jponduru@quicinc.com \
--cc=quic_subashab@quicinc.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