projects / linux-2.6-microblaze.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1979095)
net: ipa: remove unneeded FILT_ROUT_HASH_EN definitions
authorAlex Elder <elder@linaro.org>
Fri, 19 Apr 2024 15:17:56 +0000 (10:17 -0500)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 23 Apr 2024 11:08:08 +0000 (13:08 +0200)
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>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ipa/reg/ipa_reg-v3.1.c patch | blob | history
drivers/net/ipa/reg/ipa_reg-v3.5.1.c patch | blob | history
drivers/net/ipa/reg/ipa_reg-v4.11.c patch | blob | history
drivers/net/ipa/reg/ipa_reg-v4.5.c patch | blob | history
drivers/net/ipa/reg/ipa_reg-v4.7.c patch | blob | history
drivers/net/ipa/reg/ipa_reg-v4.9.c patch | blob | history

diff --git a/drivers/net/ipa/reg/ipa_reg-v3.1.c b/drivers/net/ipa/reg/ipa_reg-v3.1.c
index 63a44dc..a891037 100644 (file)
--- 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]               = &reg_shared_mem_size,
        [QSB_MAX_WRITES]                = &reg_qsb_max_writes,
        [QSB_MAX_READS]                 = &reg_qsb_max_reads,
-       [FILT_ROUT_HASH_EN]             = &reg_filt_rout_hash_en,
        [FILT_ROUT_HASH_FLUSH]          = &reg_filt_rout_hash_flush,
        [STATE_AGGR_ACTIVE]             = &reg_state_aggr_active,
        [IPA_BCR]                       = &reg_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 4a7b6d9..c81c48e 100644 (file)
--- 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]               = &reg_shared_mem_size,
        [QSB_MAX_WRITES]                = &reg_qsb_max_writes,
        [QSB_MAX_READS]                 = &reg_qsb_max_reads,
-       [FILT_ROUT_HASH_EN]             = &reg_filt_rout_hash_en,
        [FILT_ROUT_HASH_FLUSH]          = &reg_filt_rout_hash_flush,
        [STATE_AGGR_ACTIVE]             = &reg_state_aggr_active,
        [IPA_BCR]                       = &reg_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 257eaff..18bddc3 100644 (file)
--- 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]               = &reg_shared_mem_size,
        [QSB_MAX_WRITES]                = &reg_qsb_max_writes,
        [QSB_MAX_READS]                 = &reg_qsb_max_reads,
-       [FILT_ROUT_HASH_EN]             = &reg_filt_rout_hash_en,
        [FILT_ROUT_HASH_FLUSH]          = &reg_filt_rout_hash_flush,
        [STATE_AGGR_ACTIVE]             = &reg_state_aggr_active,
        [LOCAL_PKT_PROC_CNTXT]          = &reg_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 dc39634..8494731 100644 (file)
--- 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]               = &reg_shared_mem_size,
        [QSB_MAX_WRITES]                = &reg_qsb_max_writes,
        [QSB_MAX_READS]                 = &reg_qsb_max_reads,
-       [FILT_ROUT_HASH_EN]             = &reg_filt_rout_hash_en,
        [FILT_ROUT_HASH_FLUSH]          = &reg_filt_rout_hash_flush,
        [STATE_AGGR_ACTIVE]             = &reg_state_aggr_active,
        [LOCAL_PKT_PROC_CNTXT]          = &reg_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 37a2e46..2c161cf 100644 (file)
--- 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]               = &reg_shared_mem_size,
        [QSB_MAX_WRITES]                = &reg_qsb_max_writes,
        [QSB_MAX_READS]                 = &reg_qsb_max_reads,
-       [FILT_ROUT_HASH_EN]             = &reg_filt_rout_hash_en,
        [FILT_ROUT_HASH_FLUSH]          = &reg_filt_rout_hash_flush,
        [STATE_AGGR_ACTIVE]             = &reg_state_aggr_active,
        [LOCAL_PKT_PROC_CNTXT]          = &reg_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 09755d7..fa6fd31 100644 (file)
--- 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]               = &reg_shared_mem_size,
        [QSB_MAX_WRITES]                = &reg_qsb_max_writes,
        [QSB_MAX_READS]                 = &reg_qsb_max_reads,
-       [FILT_ROUT_HASH_EN]             = &reg_filt_rout_hash_en,
        [FILT_ROUT_HASH_FLUSH]          = &reg_filt_rout_hash_flush,
        [STATE_AGGR_ACTIVE]             = &reg_state_aggr_active,
        [LOCAL_PKT_PROC_CNTXT]          = &reg_local_pkt_proc_cntxt,
MicroBlaze GIT Repository