Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: ipa: remove unneeded FILT_ROUT_HASH_EN definitions

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>

authored by

Alex Elder and committed by
Paolo Abeni
5043d6b1 19790951

-84
-14
drivers/net/ipa/reg/ipa_reg-v3.1.c
··· 78 78 79 79 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); 80 80 81 - static const u32 reg_filt_rout_hash_en_fmask[] = { 82 - [IPV6_ROUTER_HASH] = BIT(0), 83 - /* Bits 1-3 reserved */ 84 - [IPV6_FILTER_HASH] = BIT(4), 85 - /* Bits 5-7 reserved */ 86 - [IPV4_ROUTER_HASH] = BIT(8), 87 - /* Bits 9-11 reserved */ 88 - [IPV4_FILTER_HASH] = BIT(12), 89 - /* Bits 13-31 reserved */ 90 - }; 91 - 92 - REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x000008c); 93 - 94 81 static const u32 reg_filt_rout_hash_flush_fmask[] = { 95 82 [IPV6_ROUTER_HASH] = BIT(0), 96 83 /* Bits 1-3 reserved */ ··· 392 405 [SHARED_MEM_SIZE] = &reg_shared_mem_size, 393 406 [QSB_MAX_WRITES] = &reg_qsb_max_writes, 394 407 [QSB_MAX_READS] = &reg_qsb_max_reads, 395 - [FILT_ROUT_HASH_EN] = &reg_filt_rout_hash_en, 396 408 [FILT_ROUT_HASH_FLUSH] = &reg_filt_rout_hash_flush, 397 409 [STATE_AGGR_ACTIVE] = &reg_state_aggr_active, 398 410 [IPA_BCR] = &reg_ipa_bcr,
-14
drivers/net/ipa/reg/ipa_reg-v3.5.1.c
··· 83 83 84 84 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); 85 85 86 - static const u32 reg_filt_rout_hash_en_fmask[] = { 87 - [IPV6_ROUTER_HASH] = BIT(0), 88 - /* Bits 1-3 reserved */ 89 - [IPV6_FILTER_HASH] = BIT(4), 90 - /* Bits 5-7 reserved */ 91 - [IPV4_ROUTER_HASH] = BIT(8), 92 - /* Bits 9-11 reserved */ 93 - [IPV4_FILTER_HASH] = BIT(12), 94 - /* Bits 13-31 reserved */ 95 - }; 96 - 97 - REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x000008c); 98 - 99 86 static const u32 reg_filt_rout_hash_flush_fmask[] = { 100 87 [IPV6_ROUTER_HASH] = BIT(0), 101 88 /* Bits 1-3 reserved */ ··· 403 416 [SHARED_MEM_SIZE] = &reg_shared_mem_size, 404 417 [QSB_MAX_WRITES] = &reg_qsb_max_writes, 405 418 [QSB_MAX_READS] = &reg_qsb_max_reads, 406 - [FILT_ROUT_HASH_EN] = &reg_filt_rout_hash_en, 407 419 [FILT_ROUT_HASH_FLUSH] = &reg_filt_rout_hash_flush, 408 420 [STATE_AGGR_ACTIVE] = &reg_state_aggr_active, 409 421 [IPA_BCR] = &reg_ipa_bcr,
-14
drivers/net/ipa/reg/ipa_reg-v4.11.c
··· 115 115 116 116 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); 117 117 118 - static const u32 reg_filt_rout_hash_en_fmask[] = { 119 - [IPV6_ROUTER_HASH] = BIT(0), 120 - /* Bits 1-3 reserved */ 121 - [IPV6_FILTER_HASH] = BIT(4), 122 - /* Bits 5-7 reserved */ 123 - [IPV4_ROUTER_HASH] = BIT(8), 124 - /* Bits 9-11 reserved */ 125 - [IPV4_FILTER_HASH] = BIT(12), 126 - /* Bits 13-31 reserved */ 127 - }; 128 - 129 - REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148); 130 - 131 118 static const u32 reg_filt_rout_hash_flush_fmask[] = { 132 119 [IPV6_ROUTER_HASH] = BIT(0), 133 120 /* Bits 1-3 reserved */ ··· 459 472 [SHARED_MEM_SIZE] = &reg_shared_mem_size, 460 473 [QSB_MAX_WRITES] = &reg_qsb_max_writes, 461 474 [QSB_MAX_READS] = &reg_qsb_max_reads, 462 - [FILT_ROUT_HASH_EN] = &reg_filt_rout_hash_en, 463 475 [FILT_ROUT_HASH_FLUSH] = &reg_filt_rout_hash_flush, 464 476 [STATE_AGGR_ACTIVE] = &reg_state_aggr_active, 465 477 [LOCAL_PKT_PROC_CNTXT] = &reg_local_pkt_proc_cntxt,
-14
drivers/net/ipa/reg/ipa_reg-v4.5.c
··· 109 109 110 110 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); 111 111 112 - static const u32 reg_filt_rout_hash_en_fmask[] = { 113 - [IPV6_ROUTER_HASH] = BIT(0), 114 - /* Bits 1-3 reserved */ 115 - [IPV6_FILTER_HASH] = BIT(4), 116 - /* Bits 5-7 reserved */ 117 - [IPV4_ROUTER_HASH] = BIT(8), 118 - /* Bits 9-11 reserved */ 119 - [IPV4_FILTER_HASH] = BIT(12), 120 - /* Bits 13-31 reserved */ 121 - }; 122 - 123 - REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148); 124 - 125 112 static const u32 reg_filt_rout_hash_flush_fmask[] = { 126 113 [IPV6_ROUTER_HASH] = BIT(0), 127 114 /* Bits 1-3 reserved */ ··· 478 491 [SHARED_MEM_SIZE] = &reg_shared_mem_size, 479 492 [QSB_MAX_WRITES] = &reg_qsb_max_writes, 480 493 [QSB_MAX_READS] = &reg_qsb_max_reads, 481 - [FILT_ROUT_HASH_EN] = &reg_filt_rout_hash_en, 482 494 [FILT_ROUT_HASH_FLUSH] = &reg_filt_rout_hash_flush, 483 495 [STATE_AGGR_ACTIVE] = &reg_state_aggr_active, 484 496 [LOCAL_PKT_PROC_CNTXT] = &reg_local_pkt_proc_cntxt,
-14
drivers/net/ipa/reg/ipa_reg-v4.7.c
··· 109 109 110 110 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); 111 111 112 - static const u32 reg_filt_rout_hash_en_fmask[] = { 113 - [IPV6_ROUTER_HASH] = BIT(0), 114 - /* Bits 1-3 reserved */ 115 - [IPV6_FILTER_HASH] = BIT(4), 116 - /* Bits 5-7 reserved */ 117 - [IPV4_ROUTER_HASH] = BIT(8), 118 - /* Bits 9-11 reserved */ 119 - [IPV4_FILTER_HASH] = BIT(12), 120 - /* Bits 13-31 reserved */ 121 - }; 122 - 123 - REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148); 124 - 125 112 static const u32 reg_filt_rout_hash_flush_fmask[] = { 126 113 [IPV6_ROUTER_HASH] = BIT(0), 127 114 /* Bits 1-3 reserved */ ··· 451 464 [SHARED_MEM_SIZE] = &reg_shared_mem_size, 452 465 [QSB_MAX_WRITES] = &reg_qsb_max_writes, 453 466 [QSB_MAX_READS] = &reg_qsb_max_reads, 454 - [FILT_ROUT_HASH_EN] = &reg_filt_rout_hash_en, 455 467 [FILT_ROUT_HASH_FLUSH] = &reg_filt_rout_hash_flush, 456 468 [STATE_AGGR_ACTIVE] = &reg_state_aggr_active, 457 469 [LOCAL_PKT_PROC_CNTXT] = &reg_local_pkt_proc_cntxt,
-14
drivers/net/ipa/reg/ipa_reg-v4.9.c
··· 114 114 115 115 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); 116 116 117 - static const u32 reg_filt_rout_hash_en_fmask[] = { 118 - [IPV6_ROUTER_HASH] = BIT(0), 119 - /* Bits 1-3 reserved */ 120 - [IPV6_FILTER_HASH] = BIT(4), 121 - /* Bits 5-7 reserved */ 122 - [IPV4_ROUTER_HASH] = BIT(8), 123 - /* Bits 9-11 reserved */ 124 - [IPV4_FILTER_HASH] = BIT(12), 125 - /* Bits 13-31 reserved */ 126 - }; 127 - 128 - REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148); 129 - 130 117 static const u32 reg_filt_rout_hash_flush_fmask[] = { 131 118 [IPV6_ROUTER_HASH] = BIT(0), 132 119 /* Bits 1-3 reserved */ ··· 456 469 [SHARED_MEM_SIZE] = &reg_shared_mem_size, 457 470 [QSB_MAX_WRITES] = &reg_qsb_max_writes, 458 471 [QSB_MAX_READS] = &reg_qsb_max_reads, 459 - [FILT_ROUT_HASH_EN] = &reg_filt_rout_hash_en, 460 472 [FILT_ROUT_HASH_FLUSH] = &reg_filt_rout_hash_flush, 461 473 [STATE_AGGR_ACTIVE] = &reg_state_aggr_active, 462 474 [LOCAL_PKT_PROC_CNTXT] = &reg_local_pkt_proc_cntxt,