net: ipa: support more endpoints
v2 cover net: ipa: support more endpoints
This series adds support for more than 32 IPA endpoints. To do this, five registers whose bits represent endpoint state are replicated as needed to represent endpoints beyond 32. For existing platforms, the number of endpoints is never greater than 32, so there is just one of each register. IPA v5.0+ supports more than that though; these changes prepare the code for that.
Beyond that, the IPA fields that represent endpoints in a 32-bit bitmask are updated to support an arbitrary number of these endpoint registers. (There is one exception, explained in patch 7.)
The first two patches are some sort of unrelated cleanups, making use of a helper function introduced recently.
The third and fourth use parameterized functions to determine the register offset for registers that represent endpoints.
The last five convert fields representing endpoints to allow more than 32 endpoints to be represented.
Since v1, I have implemented Jakub's suggestions:
- Don't print a message on (bitmap) memory allocation failure
- Do not do "mass null checks" when allocating bitmaps
- Rework some code to ensure error path is sane
-Alex
Alex Elder (9):
net: ipa: reduce arguments to ipa_table_init_add()
net: ipa: use ipa_table_mem() in ipa_table_reset_add()
net: ipa: add a parameter to aggregation registers
net: ipa: add a parameter to suspend registers
net: ipa: use a bitmap for defined endpoints
net: ipa: use a bitmap for available endpoints
net: ipa: support more filtering endpoints
net: ipa: use a bitmap for set-up endpoints
net: ipa: use a bitmap for enabled endpoints
drivers/net/ipa/ipa.h | 26 ++-- drivers/net/ipa/ipa_endpoint.c | 185 ++++++++++++++++----------- drivers/net/ipa/ipa_endpoint.h | 2 +- drivers/net/ipa/ipa_interrupt.c | 34 +++-- drivers/net/ipa/ipa_main.c | 7 +- drivers/net/ipa/ipa_table.c | 91 +++++++------ drivers/net/ipa/ipa_table.h | 6 +- drivers/net/ipa/reg/ipa_reg-v3.1.c | 13 +- drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 13 +- drivers/net/ipa/reg/ipa_reg-v4.11.c | 13 +- drivers/net/ipa/reg/ipa_reg-v4.2.c | 13 +- drivers/net/ipa/reg/ipa_reg-v4.5.c | 13 +- drivers/net/ipa/reg/ipa_reg-v4.9.c | 13 +- 13 files changed, 241 insertions(+), 188 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/9 net: ipa: reduce arguments to ipa_table_init_add()
Recently ipa_table_mem() was added as a way to look up one of 8 possible memory regions by indicating whether it was a filter or route table, hashed or not, and IPv6 or not.
We can simplify the interface to ipa_table_init_add() by passing two flags to it instead of the opcode and both hashed and non-hashed memory region IDs. The "filter" and "ipv6" flags are sufficient to determine the opcode to use, and with ipa_table_mem() can look up the correct memory region as well.
It's possible to not have hashed tables, but we already verify the number of entries in a filter or routing table is nonzero. Stop assuming a hashed table entry exists in ipa_table_init_add().
--- drivers/net/ipa/ipa_table.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-)
drivers/net/ipa/ipa_table.c +18 -19
@@ -376,14 +376,12 @@ int ipa_table_hash_flush(struct ipa *ipa)return 0 ; } -static void ipa_table_init_add (struct gsi_trans *trans,bool filter, -enum ipa_cmd_opcode opcode, -enum ipa_mem_id mem_id, -enum ipa_mem_id hash_mem_id) +static void ipa_table_init_add (struct gsi_trans *trans,bool filter,bool ipv6) { struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi); -const struct ipa_mem *hash_mem =ipa_mem_find (ipa, hash_mem_id); -const struct ipa_mem *mem =ipa_mem_find (ipa, mem_id); +const struct ipa_mem *hash_mem; +enum ipa_cmd_opcode opcode; +const struct ipa_mem *mem;dma_addr_t hash_addr;dma_addr_t addr;u32 zero_offset;
@@ -393,6 +391,14 @@ static void ipa_table_init_add(struct gsi_trans *trans, bool filter,u16 count;u16 size; + opcode = filter ? ipv6 ?IPA_CMD_IP_V6_FILTER_INIT + :IPA_CMD_IP_V4_FILTER_INIT + : ipv6 ?IPA_CMD_IP_V6_ROUTING_INIT + :IPA_CMD_IP_V4_ROUTING_INIT ; + + mem =ipa_table_mem (ipa, filter, false, ipv6); + hash_mem =ipa_table_mem (ipa, filter, true, ipv6); +/* Compute the number of table entries to initialize */ if (filter) {/* The number of filtering endpoints determines number of
@@ -401,13 +407,13 @@ static void ipa_table_init_add(struct gsi_trans *trans, bool filter,* table is either the same as the non-hashed one, or zero. */ count =1 +hweight32 (ipa->filter_map); - hash_count = hash_mem->size ? count :0 ; + hash_count = hash_mem && hash_mem->size ? count :0 ; }else {/* The size of a route table region determines the number * of entries it has. */ count = mem->size /sizeof (__le64); - hash_count = hash_mem->size /sizeof (__le64); + hash_count = hash_mem && hash_mem->size /sizeof (__le64); } size = count *sizeof (__le64); hash_size = hash_count *sizeof (__le64);
@@ -458,17 +464,10 @@ int ipa_table_setup(struct ipa *ipa)return -EBUSY ; } -ipa_table_init_add (trans, false,IPA_CMD_IP_V4_ROUTING_INIT , -IPA_MEM_V4_ROUTE ,IPA_MEM_V4_ROUTE_HASHED ); - -ipa_table_init_add (trans, false,IPA_CMD_IP_V6_ROUTING_INIT , -IPA_MEM_V6_ROUTE ,IPA_MEM_V6_ROUTE_HASHED ); - -ipa_table_init_add (trans, true,IPA_CMD_IP_V4_FILTER_INIT , -IPA_MEM_V4_FILTER ,IPA_MEM_V4_FILTER_HASHED ); - -ipa_table_init_add (trans, true,IPA_CMD_IP_V6_FILTER_INIT , -IPA_MEM_V6_FILTER ,IPA_MEM_V6_FILTER_HASHED ); +ipa_table_init_add (trans, false, false); +ipa_table_init_add (trans, false, true); +ipa_table_init_add (trans, true, false); +ipa_table_init_add (trans, true, true);gsi_trans_commit_wait (trans);
Signature · 1 line
2.34.1
PATCH v2 2/9 net: ipa: use ipa_table_mem() in ipa_table_reset_add()
In reply to Alex ElderSimilar to the previous commit, pass flags rather than a memory region ID to ipa_table_reset_add(), and there use ipa_table_mem() to look up the memory region affected based on those flags.
Currently all eight of these table memory regions are assumed to exist, because they all have canaries within them. Stop assuming that will always be the case, and in ipa_table_reset_add() allow these memory regions to be non-existent.
--- drivers/net/ipa/ipa_table.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
drivers/net/ipa/ipa_table.c +15 -16
@@ -200,16 +200,17 @@ static dma_addr_t ipa_table_addr(struct ipa *ipa, bool filter_mask, u16 count) }static void ipa_table_reset_add (struct gsi_trans *trans,bool filter, -u16 first,u16 count,enum ipa_mem_id mem_id) +bool hashed,bool ipv6,u16 first,u16 count) { struct ipa *ipa = container_of(trans->gsi, struct ipa, gsi); -const struct ipa_mem *mem =ipa_mem_find (ipa, mem_id); +const struct ipa_mem *mem;dma_addr_t addr;u32 offset;u16 size; -/* Nothing to do if the table memory region is empty */ -if (!mem->size) +/* Nothing to do if the memory region is doesn't exist or is empty */ + mem =ipa_table_mem (ipa, filter, hashed, ipv6); +if (!mem || !mem->size)return ;if (filter)
@@ -227,7 +228,7 @@ static void ipa_table_reset_add(struct gsi_trans *trans, bool filter,* for the IPv4 and IPv6 non-hashed and hashed filter tables. */ static int -ipa_filter_reset_table (struct ipa *ipa,enum ipa_mem_id mem_id,bool modem) +ipa_filter_reset_table (struct ipa *ipa,bool hashed,bool ipv6,bool modem) {u32 ep_mask = ipa->filter_map;u32 count =hweight32 (ep_mask);
@@ -253,7 +254,7 @@ ipa_filter_reset_table(struct ipa *ipa, enum ipa_mem_id mem_id, bool modem)if (endpoint->ee_id != ee_id)continue ; -ipa_table_reset_add (trans, true, endpoint_id,1 , mem_id); +ipa_table_reset_add (trans, true, hashed, ipv6, endpoint_id,1 ); }gsi_trans_commit_wait (trans);
@@ -269,18 +270,18 @@ static int ipa_filter_reset(struct ipa *ipa, bool modem) {int ret; - ret =ipa_filter_reset_table (ipa,IPA_MEM_V4_FILTER , modem); + ret =ipa_filter_reset_table (ipa, false, false, modem);if (ret)return ret; - ret =ipa_filter_reset_table (ipa,IPA_MEM_V4_FILTER_HASHED , modem); + ret =ipa_filter_reset_table (ipa, true, false, modem);if (ret)return ret; - ret =ipa_filter_reset_table (ipa,IPA_MEM_V6_FILTER , modem); + ret =ipa_filter_reset_table (ipa, false, true, modem);if (ret)return ret; - ret =ipa_filter_reset_table (ipa,IPA_MEM_V6_FILTER_HASHED , modem); + ret =ipa_filter_reset_table (ipa, true, true, modem);return ret; }
@@ -312,13 +313,11 @@ static int ipa_route_reset(struct ipa *ipa, bool modem) count = ipa->route_count - modem_route_count; } -ipa_table_reset_add (trans, false, first, count,IPA_MEM_V4_ROUTE ); -ipa_table_reset_add (trans, false, first, count, -IPA_MEM_V4_ROUTE_HASHED ); +ipa_table_reset_add (trans, false, false, false, first, count); +ipa_table_reset_add (trans, false, true, false, first, count); -ipa_table_reset_add (trans, false, first, count,IPA_MEM_V6_ROUTE ); -ipa_table_reset_add (trans, false, first, count, -IPA_MEM_V6_ROUTE_HASHED ); +ipa_table_reset_add (trans, false, false, true, first, count); +ipa_table_reset_add (trans, false, true, true, first, count);gsi_trans_commit_wait (trans);
Signature · 1 line
2.34.1
PATCH v2 3/9 net: ipa: add a parameter to aggregation registers
In reply to Alex ElderStarting with IPA v5.0, a single IPA instance can have more than 32 endpoints defined. To handle this, each register that holds a bitmap of IPA endpoints is replicated as needed to represent the available endpoints.
To prepare for this, registers that represent endpoint IDs in a bit mask will be defined to have a parameter, with a stride value of 4 bytes. The first 32 endpoints are represented in the first 32-bit register, then the next (up to) 32 endpoints at an offset 4 bytes higher. When accessing such a register, the endpoint ID divided by 32 determines the offset, and the endpoint ID modulo 32 defines the endpoint's bit position within the register.
The first two registers we'll update for this are STATE_AGGR_ACTIVE and AGGR_FORCE_CLOSE.
Until more than 32 endpoints are supported, this change has no practical effect.
--- drivers/net/ipa/ipa_endpoint.c | 14 ++++++++++---- drivers/net/ipa/reg/ipa_reg-v3.1.c | 4 ++-- drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 4 ++-- drivers/net/ipa/reg/ipa_reg-v4.11.c | 4 ++-- drivers/net/ipa/reg/ipa_reg-v4.2.c | 4 ++-- drivers/net/ipa/reg/ipa_reg-v4.5.c | 4 ++-- drivers/net/ipa/reg/ipa_reg-v4.9.c | 4 ++-- 7 files changed, 22 insertions(+), 16 deletions(-)
drivers/net/ipa/ipa_endpoint.c +10 -4
@@ -350,29 +350,35 @@ ipa_endpoint_program_delay(struct ipa_endpoint *endpoint, bool enable)static bool ipa_endpoint_aggr_active (struct ipa_endpoint *endpoint) { -u32 mask =BIT (endpoint->endpoint_id); +u32 endpoint_id = endpoint->endpoint_id; +u32 mask =BIT (endpoint_id %32 );struct ipa *ipa = endpoint->ipa; +u32 unit = endpoint_id /32 ;const struct ipa_reg *reg;u32 val; +/* This works until we actually have more than 32 endpoints */ WARN_ON (!(mask & ipa->available)); reg =ipa_reg (ipa,STATE_AGGR_ACTIVE ); - val =ioread32 (ipa->reg_virt +ipa_reg_offset (reg)); + val =ioread32 (ipa->reg_virt +ipa_reg_n_offset (reg, unit));return !!(val & mask); }static void ipa_endpoint_force_close (struct ipa_endpoint *endpoint) { -u32 mask =BIT (endpoint->endpoint_id); +u32 endpoint_id = endpoint->endpoint_id; +u32 mask =BIT (endpoint_id %32 );struct ipa *ipa = endpoint->ipa; +u32 unit = endpoint_id /32 ;const struct ipa_reg *reg; +/* This works until we actually have more than 32 endpoints */ WARN_ON (!(mask & ipa->available)); reg =ipa_reg (ipa,AGGR_FORCE_CLOSE ); -iowrite32 (mask, ipa->reg_virt +ipa_reg_offset (reg)); +iowrite32 (mask, ipa->reg_virt +ipa_reg_n_offset (reg, unit)); }/**
drivers/net/ipa/reg/ipa_reg-v3.1.c +2 -2
@@ -103,7 +103,7 @@ static const u32 ipa_reg_filt_rout_hash_flush_fmask[] = {IPA_REG_FIELDS (FILT_ROUT_HASH_FLUSH , filt_rout_hash_flush,0x0000090 );/* Valid bits defined by ipa->available */ -IPA_REG (STATE_AGGR_ACTIVE , state_aggr_active,0x0000010c ); +IPA_REG_STRIDE (STATE_AGGR_ACTIVE , state_aggr_active,0x0000010c ,0x0004 );IPA_REG (IPA_BCR , ipa_bcr,0x000001d0 );
@@ -116,7 +116,7 @@ static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = {IPA_REG_FIELDS (LOCAL_PKT_PROC_CNTXT , local_pkt_proc_cntxt,0x000001e8 );/* Valid bits defined by ipa->available */ -IPA_REG (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ); +IPA_REG_STRIDE (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ,0x0004 );static const u32 ipa_reg_counter_cfg_fmask[] = { [EOT_COAL_GRANULARITY ] =GENMASK (3 ,0 ),
drivers/net/ipa/reg/ipa_reg-v3.5.1.c +2 -2
@@ -108,7 +108,7 @@ static const u32 ipa_reg_filt_rout_hash_flush_fmask[] = {IPA_REG_FIELDS (FILT_ROUT_HASH_FLUSH , filt_rout_hash_flush,0x0000090 );/* Valid bits defined by ipa->available */ -IPA_REG (STATE_AGGR_ACTIVE , state_aggr_active,0x0000010c ); +IPA_REG_STRIDE (STATE_AGGR_ACTIVE , state_aggr_active,0x0000010c ,0x0004 );IPA_REG (IPA_BCR , ipa_bcr,0x000001d0 );
@@ -121,7 +121,7 @@ static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = {IPA_REG_FIELDS (LOCAL_PKT_PROC_CNTXT , local_pkt_proc_cntxt,0x000001e8 );/* Valid bits defined by ipa->available */ -IPA_REG (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ); +IPA_REG_STRIDE (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ,0x0004 );static const u32 ipa_reg_counter_cfg_fmask[] = {/* Bits 0-3 reserved */
drivers/net/ipa/reg/ipa_reg-v4.11.c +2 -2
@@ -140,7 +140,7 @@ static const u32 ipa_reg_filt_rout_hash_flush_fmask[] = {IPA_REG_FIELDS (FILT_ROUT_HASH_FLUSH , filt_rout_hash_flush,0x000014c );/* Valid bits defined by ipa->available */ -IPA_REG (STATE_AGGR_ACTIVE , state_aggr_active,0x000000b4 ); +IPA_REG_STRIDE (STATE_AGGR_ACTIVE , state_aggr_active,0x000000b4 ,0x0004 );static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = { [IPA_BASE_ADDR ] =GENMASK (17 ,0 ),
@@ -151,7 +151,7 @@ static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = {IPA_REG_FIELDS (LOCAL_PKT_PROC_CNTXT , local_pkt_proc_cntxt,0x000001e8 );/* Valid bits defined by ipa->available */ -IPA_REG (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ); +IPA_REG_STRIDE (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ,0x0004 );static const u32 ipa_reg_ipa_tx_cfg_fmask[] = {/* Bits 0-1 reserved */
drivers/net/ipa/reg/ipa_reg-v4.2.c +2 -2
@@ -132,7 +132,7 @@ static const u32 ipa_reg_filt_rout_hash_flush_fmask[] = {IPA_REG_FIELDS (FILT_ROUT_HASH_FLUSH , filt_rout_hash_flush,0x000014c );/* Valid bits defined by ipa->available */ -IPA_REG (STATE_AGGR_ACTIVE , state_aggr_active,0x000000b4 ); +IPA_REG_STRIDE (STATE_AGGR_ACTIVE , state_aggr_active,0x000000b4 ,0x0004 );IPA_REG (IPA_BCR , ipa_bcr,0x000001d0 );
@@ -145,7 +145,7 @@ static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = {IPA_REG_FIELDS (LOCAL_PKT_PROC_CNTXT , local_pkt_proc_cntxt,0x000001e8 );/* Valid bits defined by ipa->available */ -IPA_REG (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ); +IPA_REG_STRIDE (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ,0x0004 );static const u32 ipa_reg_counter_cfg_fmask[] = {/* Bits 0-3 reserved */
drivers/net/ipa/reg/ipa_reg-v4.5.c +2 -2
@@ -134,7 +134,7 @@ static const u32 ipa_reg_filt_rout_hash_flush_fmask[] = {IPA_REG_FIELDS (FILT_ROUT_HASH_FLUSH , filt_rout_hash_flush,0x000014c );/* Valid bits defined by ipa->available */ -IPA_REG (STATE_AGGR_ACTIVE , state_aggr_active,0x000000b4 ); +IPA_REG_STRIDE (STATE_AGGR_ACTIVE , state_aggr_active,0x000000b4 ,0x0004 );static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = { [IPA_BASE_ADDR ] =GENMASK (17 ,0 ),
@@ -145,7 +145,7 @@ static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = {IPA_REG_FIELDS (LOCAL_PKT_PROC_CNTXT , local_pkt_proc_cntxt,0x000001e8 );/* Valid bits defined by ipa->available */ -IPA_REG (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ); +IPA_REG_STRIDE (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ,0x0004 );static const u32 ipa_reg_ipa_tx_cfg_fmask[] = {/* Bits 0-1 reserved */
drivers/net/ipa/reg/ipa_reg-v4.9.c +2 -2
@@ -139,7 +139,7 @@ static const u32 ipa_reg_filt_rout_hash_flush_fmask[] = {IPA_REG_FIELDS (FILT_ROUT_HASH_FLUSH , filt_rout_hash_flush,0x000014c );/* Valid bits defined by ipa->available */ -IPA_REG (STATE_AGGR_ACTIVE , state_aggr_active,0x000000b4 ); +IPA_REG_STRIDE (STATE_AGGR_ACTIVE , state_aggr_active,0x000000b4 ,0x0004 );static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = { [IPA_BASE_ADDR ] =GENMASK (17 ,0 ),
@@ -150,7 +150,7 @@ static const u32 ipa_reg_local_pkt_proc_cntxt_fmask[] = {IPA_REG_FIELDS (LOCAL_PKT_PROC_CNTXT , local_pkt_proc_cntxt,0x000001e8 );/* Valid bits defined by ipa->available */ -IPA_REG (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ); +IPA_REG_STRIDE (AGGR_FORCE_CLOSE , aggr_force_close,0x000001ec ,0x0004 );static const u32 ipa_reg_ipa_tx_cfg_fmask[] = {/* Bits 0-1 reserved */
Signature · 1 line
2.34.1
PATCH v2 4/9 net: ipa: add a parameter to suspend registers
In reply to Alex ElderThe SUSPEND_INFO, SUSPEND_EN, SUSPEND_CLR registers represent endpoint IDs in a bit mask. When more than 32 endpoints are supported, these registers will be replicated as needed to represent the number of supported endpoints. Update the definitions of these registers to have a stride of 4 bytes, and update the code that operates them to select the proper offset and bit.
--- drivers/net/ipa/ipa_interrupt.c | 30 ++++++++++++++++++---------- drivers/net/ipa/reg/ipa_reg-v3.1.c | 9 ++++++--- drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 9 ++++++--- drivers/net/ipa/reg/ipa_reg-v4.11.c | 9 ++++++--- drivers/net/ipa/reg/ipa_reg-v4.2.c | 9 ++++++--- drivers/net/ipa/reg/ipa_reg-v4.5.c | 9 ++++++--- drivers/net/ipa/reg/ipa_reg-v4.9.c | 9 ++++++--- 7 files changed, 55 insertions(+), 29 deletions(-)
drivers/net/ipa/ipa_interrupt.c +19 -11
@@ -132,11 +132,13 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt, u32 endpoint_id, bool enable) {struct ipa *ipa = interrupt->ipa; -u32 mask =BIT (endpoint_id); +u32 mask =BIT (endpoint_id %32 ); +u32 unit = endpoint_id /32 ;const struct ipa_reg *reg;u32 offset;u32 val; +/* This works until we actually have more than 32 endpoints */ WARN_ON (!(mask & ipa->available));/* IPA version 3.0 does not support TX_SUSPEND interrupt control */
@@ -144,7 +146,7 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt,return ; reg =ipa_reg (ipa,IRQ_SUSPEND_EN ); - offset =ipa_reg_offset (reg); + offset =ipa_reg_n_offset (reg, unit); val =ioread32 (ipa->reg_virt + offset);if (enable) val |= mask;
@@ -171,18 +173,24 @@ ipa_interrupt_suspend_disable(struct ipa_interrupt *interrupt, u32 endpoint_id)void ipa_interrupt_suspend_clear_all (struct ipa_interrupt *interrupt) {struct ipa *ipa = interrupt->ipa; -const struct ipa_reg *reg; -u32 val; +u32 unit_count; +u32 unit; - reg =ipa_reg (ipa,IRQ_SUSPEND_INFO ); - val =ioread32 (ipa->reg_virt +ipa_reg_offset (reg)); + unit_count =roundup (ipa->endpoint_count,32 ); +for (unit =0 ; unit < unit_count; unit++) { +const struct ipa_reg *reg; +u32 val; -/* SUSPEND interrupt status isn't cleared on IPA version 3.0 */ -if (ipa->version ==IPA_VERSION_3_0 ) -return ; + reg =ipa_reg (ipa,IRQ_SUSPEND_INFO ); + val =ioread32 (ipa->reg_virt +ipa_reg_n_offset (reg, unit)); - reg =ipa_reg (ipa,IRQ_SUSPEND_CLR ); -iowrite32 (val, ipa->reg_virt +ipa_reg_offset (reg)); +/* SUSPEND interrupt status isn't cleared on IPA version 3.0 */ +if (ipa->version ==IPA_VERSION_3_0 ) +continue ; + + reg =ipa_reg (ipa,IRQ_SUSPEND_CLR ); +iowrite32 (val, ipa->reg_virt +ipa_reg_n_offset (reg, unit)); + } }/* Simulate arrival of an IPA TX_SUSPEND interrupt */
drivers/net/ipa/reg/ipa_reg-v3.1.c +6 -3
@@ -386,13 +386,16 @@ static const u32 ipa_reg_ipa_irq_uc_fmask[] = {IPA_REG_FIELDS (IPA_IRQ_UC , ipa_irq_uc,0x0000301c +0x1000 *GSI_EE_AP );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_INFO , irq_suspend_info,0x00003030 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_INFO , irq_suspend_info, +0x00003030 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_EN , irq_suspend_en,0x00003034 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_EN , irq_suspend_en, +0x00003034 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_CLR , irq_suspend_clr,0x00003038 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_CLR , irq_suspend_clr, +0x00003038 +0x1000 *GSI_EE_AP ,0x0004 );static const struct ipa_reg *ipa_reg_array[] = { [COMP_CFG ] = &ipa_reg_comp_cfg,
drivers/net/ipa/reg/ipa_reg-v3.5.1.c +6 -3
@@ -397,13 +397,16 @@ static const u32 ipa_reg_ipa_irq_uc_fmask[] = {IPA_REG_FIELDS (IPA_IRQ_UC , ipa_irq_uc,0x0000301c +0x1000 *GSI_EE_AP );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_INFO , irq_suspend_info,0x00003030 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_INFO , irq_suspend_info, +0x00003030 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_EN , irq_suspend_en,0x00003034 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_EN , irq_suspend_en, +0x00003034 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_CLR , irq_suspend_clr,0x00003038 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_CLR , irq_suspend_clr, +0x00003038 +0x1000 *GSI_EE_AP ,0x0004 );static const struct ipa_reg *ipa_reg_array[] = { [COMP_CFG ] = &ipa_reg_comp_cfg,
drivers/net/ipa/reg/ipa_reg-v4.11.c +6 -3
@@ -453,13 +453,16 @@ static const u32 ipa_reg_ipa_irq_uc_fmask[] = {IPA_REG_FIELDS (IPA_IRQ_UC , ipa_irq_uc,0x0000401c +0x1000 *GSI_EE_AP );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_INFO , irq_suspend_info,0x00004030 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_INFO , irq_suspend_info, +0x00004030 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_EN , irq_suspend_en,0x00004034 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_EN , irq_suspend_en, +0x00004034 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_CLR , irq_suspend_clr,0x00004038 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_CLR , irq_suspend_clr, +0x00004038 +0x1000 *GSI_EE_AP ,0x0004 );static const struct ipa_reg *ipa_reg_array[] = { [COMP_CFG ] = &ipa_reg_comp_cfg,
drivers/net/ipa/reg/ipa_reg-v4.2.c +6 -3
@@ -399,13 +399,16 @@ static const u32 ipa_reg_ipa_irq_uc_fmask[] = {IPA_REG_FIELDS (IPA_IRQ_UC , ipa_irq_uc,0x0000301c +0x1000 *GSI_EE_AP );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_INFO , irq_suspend_info,0x00003030 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_INFO , irq_suspend_info, +0x00003030 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_EN , irq_suspend_en,0x00003034 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_EN , irq_suspend_en, +0x00003034 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_CLR , irq_suspend_clr,0x00003038 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_CLR , irq_suspend_clr, +0x00003038 +0x1000 *GSI_EE_AP ,0x0004 );static const struct ipa_reg *ipa_reg_array[] = { [COMP_CFG ] = &ipa_reg_comp_cfg,
drivers/net/ipa/reg/ipa_reg-v4.5.c +6 -3
@@ -472,13 +472,16 @@ static const u32 ipa_reg_ipa_irq_uc_fmask[] = {IPA_REG_FIELDS (IPA_IRQ_UC , ipa_irq_uc,0x0000301c +0x1000 *GSI_EE_AP );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_INFO , irq_suspend_info,0x00003030 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_INFO , irq_suspend_info, +0x00003030 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_EN , irq_suspend_en,0x00003034 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_EN , irq_suspend_en, +0x00003034 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_CLR , irq_suspend_clr,0x00003038 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_CLR , irq_suspend_clr, +0x00003038 +0x1000 *GSI_EE_AP ,0x0004 );static const struct ipa_reg *ipa_reg_array[] = { [COMP_CFG ] = &ipa_reg_comp_cfg,
drivers/net/ipa/reg/ipa_reg-v4.9.c +6 -3
@@ -450,13 +450,16 @@ static const u32 ipa_reg_ipa_irq_uc_fmask[] = {IPA_REG_FIELDS (IPA_IRQ_UC , ipa_irq_uc,0x0000401c +0x1000 *GSI_EE_AP );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_INFO , irq_suspend_info,0x00004030 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_INFO , irq_suspend_info, +0x00004030 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_EN , irq_suspend_en,0x00004034 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_EN , irq_suspend_en, +0x00004034 +0x1000 *GSI_EE_AP ,0x0004 );/* Valid bits defined by ipa->available */ -IPA_REG (IRQ_SUSPEND_CLR , irq_suspend_clr,0x00004038 +0x1000 *GSI_EE_AP ); +IPA_REG_STRIDE (IRQ_SUSPEND_CLR , irq_suspend_clr, +0x00004038 +0x1000 *GSI_EE_AP ,0x0004 );static const struct ipa_reg *ipa_reg_array[] = { [COMP_CFG ] = &ipa_reg_comp_cfg,
Signature · 1 line
2.34.1
PATCH v2 5/9 net: ipa: use a bitmap for defined endpoints
In reply to Alex ElderIPA v5.0 supports more than 32 endpoints, so we will be unable to represent endpoints defined in the configuration data with a 32-bit value. To prepare for that, convert the field in the IPA structure representing defined endpoints to be a Linux bitmap.
Convert loops based on that field into for_each_set_bit() calls over the new bitmap. Note that the loop in ipa_endpoint_config() still assumes there are 32 or fewer endpoints (when comparing against the available endpoint bit mask); that assumption goes away in the next patch.
---
v2: - Don't print a message on bitmap allocation error
drivers/net/ipa/ipa.h | 6 ++--- drivers/net/ipa/ipa_endpoint.c | 46 +++++++++++++--------------------- 2 files changed, 21 insertions(+), 31 deletions(-)
drivers/net/ipa/ipa.h +3 -3
@@ -62,7 +62,7 @@ struct ipa_interrupt;* @zero_virt: Virtual address of preallocated zero-filled memory * @zero_size: Size (bytes) of preallocated zero-filled memory * @endpoint_count: Number of endpoints represented by bit masks below -* @defined: Bit mask indicating endpoints defined in config data +* @defined: Bitmap of endpoints defined in config data * @available: Bit mask indicating endpoints hardware supports * @filter_map: Bit mask indicating endpoints that support filtering * @set_up: Bit mask indicating endpoints set up
@@ -117,9 +117,9 @@ struct ipa {void *zero_virt;size_t zero_size; -/* Bit masks indicating endpoint state */ +/* Bitmaps indicating endpoint state */ u32 endpoint_count; -u32 defined;/* Defined in configuration data */ +unsigned long *defined;/* Defined in configuration data */ u32 available;/* Supported by hardware */ u32 filter_map;u32 set_up;
drivers/net/ipa/ipa_endpoint.c +18 -28
113 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 6/9 net: ipa: use a bitmap for available endpoints
In reply to Alex ElderSimilar to the previous patch, replace the 32-bit unsigned used to track endpoints supported by hardware with a Linux bitmap, to allow an arbitrary number of endpoints to be represented.
Move ipa_endpoint_deconfig() above ipa_endpoint_config() and use it in the error path of the latter function.
---
v2: - Use ipa_endpoint_deconfig() in ipa_endpoint_config() cleanup
drivers/net/ipa/ipa.h | 8 ++++-- drivers/net/ipa/ipa_endpoint.c | 49 ++++++++++++++++++++++----------- drivers/net/ipa/ipa_interrupt.c | 8 ++++-- 3 files changed, 43 insertions(+), 22 deletions(-)
drivers/net/ipa/ipa.h +5 -3
@@ -61,9 +61,10 @@ struct ipa_interrupt;* @zero_addr: DMA address of preallocated zero-filled memory * @zero_virt: Virtual address of preallocated zero-filled memory * @zero_size: Size (bytes) of preallocated zero-filled memory -* @endpoint_count: Number of endpoints represented by bit masks below +* @endpoint_count: Number of defined bits in most bitmaps below +* @available_count: Number of defined bits in the available bitmap * @defined: Bitmap of endpoints defined in config data -* @available: Bit mask indicating endpoints hardware supports +* @available: Bitmap of endpoints supported by hardware * @filter_map: Bit mask indicating endpoints that support filtering * @set_up: Bit mask indicating endpoints set up * @enabled: Bit mask indicating endpoints enabled
@@ -119,8 +120,9 @@ struct ipa {/* Bitmaps indicating endpoint state */ u32 endpoint_count; +u32 available_count;unsigned long *defined;/* Defined in configuration data */ -u32 available;/* Supported by hardware */ +unsigned long *available;/* Supported by hardware */ u32 filter_map;u32 set_up;u32 enabled;
drivers/net/ipa/ipa_endpoint.c +33 -16
109 lines not on this page · raw message
drivers/net/ipa/ipa_interrupt.c +5 -3
@@ -132,14 +132,13 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt, u32 endpoint_id, bool enable) {struct ipa *ipa = interrupt->ipa; -u32 mask =BIT (endpoint_id %32 );u32 unit = endpoint_id /32 ;const struct ipa_reg *reg;u32 offset; +u32 mask;u32 val; -/* This works until we actually have more than 32 endpoints */ -WARN_ON (!(mask & ipa->available)); +WARN_ON (!test_bit (endpoint_id, ipa->available));/* IPA version 3.0 does not support TX_SUSPEND interrupt control */ if (ipa->version ==IPA_VERSION_3_0 )
@@ -148,10 +147,13 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt, reg =ipa_reg (ipa,IRQ_SUSPEND_EN ); offset =ipa_reg_n_offset (reg, unit); val =ioread32 (ipa->reg_virt + offset); + + mask =BIT (endpoint_id);if (enable) val |= mask;else val &= ~mask; +iowrite32 (val, ipa->reg_virt + offset); }
Signature · 1 line
2.34.1
PATCH v2 7/9 net: ipa: support more filtering endpoints
In reply to Alex ElderPrior to IPA v5.0, there could be no more than 32 endpoints.
A filter table begins with a bitmap indicating which endpoints have a filter defined. That bitmap is currently assumed to fit in a 32-bit value.
Starting with IPA v5.0, more than 32 endpoints are supported, so it's conceivable that a TX endpoint has an ID that exceeds 32. Increase the size of the field representing endpoints that support filtering to 64 bits. Rename the bitmap field "filtered".
Unlike other similar fields, we do not use an (arbitrarily long) Linux bitmap for this purpose. The reason is that if a filter table ever *did* need to support more than 64 TX endpoints, its format would change in ways we can't anticipate.
Have ipa_endpoint_init() return a negative errno rather than a mask that indicates which endpoints support filtering, and have that function assign the "filtered" field directly.
---
v2: - Don't print a message on bitmap allocation failure
- Clean up error handling in ipa_endpoint_init()
drivers/net/ipa/ipa.h | 4 ++-- drivers/net/ipa/ipa_endpoint.c | 22 +++++++++++++--------- drivers/net/ipa/ipa_endpoint.h | 2 +- drivers/net/ipa/ipa_main.c | 7 ++----- drivers/net/ipa/ipa_table.c | 23 +++++++++++------------ drivers/net/ipa/ipa_table.h | 6 +++--- 6 files changed, 32 insertions(+), 32 deletions(-)
drivers/net/ipa/ipa.h +2 -2
@@ -65,7 +65,7 @@ struct ipa_interrupt;* @available_count: Number of defined bits in the available bitmap * @defined: Bitmap of endpoints defined in config data * @available: Bitmap of endpoints supported by hardware -* @filter_map: Bit mask indicating endpoints that support filtering +* @filtered: Bitmap of endpoints that support filtering * @set_up: Bit mask indicating endpoints set up * @enabled: Bit mask indicating endpoints enabled * @modem_tx_count: Number of defined modem TX endoints
@@ -123,7 +123,7 @@ struct ipa {u32 available_count;unsigned long *defined;/* Defined in configuration data */ unsigned long *available;/* Supported by hardware */ -u32 filter_map; +u64 filtered;/* Support filtering (AP and modem) */ u32 set_up;u32 enabled;
drivers/net/ipa/ipa_endpoint.c +13 -9
@@ -1973,6 +1973,8 @@ void ipa_endpoint_exit(struct ipa *ipa) {u32 endpoint_id; + ipa->filtered =0 ; +for_each_set_bit (endpoint_id, ipa->defined, ipa->endpoint_count)ipa_endpoint_exit_one (&ipa->endpoint[endpoint_id]);
@@ -1984,25 +1986,25 @@ void ipa_endpoint_exit(struct ipa *ipa) }/* Returns a bitmask of endpoints that support filtering, or 0 on error */ -u32 ipa_endpoint_init (struct ipa *ipa,u32 count, +int ipa_endpoint_init (struct ipa *ipa,u32 count,const struct ipa_gsi_endpoint_data *data) {enum ipa_endpoint_name name; -u32 filter_map; +u32 filtered;BUILD_BUG_ON (!IPA_REPLENISH_BATCH );/* Number of endpoints is one more than the maximum ID */ ipa->endpoint_count =ipa_endpoint_max (ipa, count, data) +1 ;if (!ipa->endpoint_count) -return 0 ;/* Error */ +return -EINVAL ;/* Initialize the defined endpoint bitmap */ ipa->defined =bitmap_zalloc (ipa->endpoint_count,GFP_KERNEL );if (!ipa->defined) -return 0 ;/* Error */ +return -ENOMEM ; - filter_map =0 ; + filtered =0 ;for (name =0 ; name < count; name++, data++) {if (ipa_gsi_endpoint_data_empty (data))continue ;/* Skip over empty slots */
@@ -2010,18 +2012,20 @@ u32 ipa_endpoint_init(struct ipa *ipa, u32 count,ipa_endpoint_init_one (ipa, name, data);if (data->endpoint.filter_support) - filter_map |=BIT (data->endpoint_id); + filtered |=BIT (data->endpoint_id);if (data->ee_id ==GSI_EE_MODEM && data->toward_ipa) ipa->modem_tx_count++; } -if (!ipa_filter_map_valid (ipa, filter_map)) +if (!ipa_filtered_valid (ipa, filtered)) goto err_endpoint_exit; -return filter_map;/* Non-zero bitmask */ + ipa->filtered = filtered; + +return 0 ; err_endpoint_exit:ipa_endpoint_exit (ipa); -return 0 ;/* Error */ +return -EINVAL ; }
drivers/net/ipa/ipa_endpoint.h +1 -1
@@ -195,7 +195,7 @@ void ipa_endpoint_deconfig(struct ipa *ipa);void ipa_endpoint_default_route_set (struct ipa *ipa,u32 endpoint_id);void ipa_endpoint_default_route_clear (struct ipa *ipa); -u32 ipa_endpoint_init (struct ipa *ipa,u32 count, +int ipa_endpoint_init (struct ipa *ipa,u32 count,const struct ipa_gsi_endpoint_data *data);void ipa_endpoint_exit (struct ipa *ipa);
drivers/net/ipa/ipa_main.c +2 -5
@@ -788,12 +788,9 @@ static int ipa_probe(struct platform_device *pdev) goto err_mem_exit;/* Result is a non-zero mask of endpoints that support filtering */ - ipa->filter_map =ipa_endpoint_init (ipa, data->endpoint_count, - data->endpoint_data); -if (!ipa->filter_map) { - ret = -EINVAL ; + ret =ipa_endpoint_init (ipa, data->endpoint_count, data->endpoint_data); +if (ret) goto err_gsi_exit; - } ret =ipa_table_init (ipa);if (ret)
drivers/net/ipa/ipa_table.c +11 -12
@@ -161,20 +161,20 @@ ipa_table_mem(struct ipa *ipa, bool filter, bool hashed, bool ipv6)return ipa_mem_find (ipa, mem_id); } -bool ipa_filter_map_valid (struct ipa *ipa,u32 filter_map) +bool ipa_filtered_valid (struct ipa *ipa,u64 filtered) {struct device *dev = &ipa->pdev->dev;u32 count; -if (!filter_map) { +if (!filtered) {dev_err (dev,"at least one filtering endpoint is required\n" );return false; } - count =hweight32 (filter_map); + count =hweight64 (filtered);if (count > ipa->filter_count) { -dev_err (dev,"too many filtering endpoints (%u, max %u)\n" , +dev_err (dev,"too many filtering endpoints (%u > %u)\n" , count, ipa->filter_count);return false;
@@ -230,12 +230,11 @@ static void ipa_table_reset_add(struct gsi_trans *trans, bool filter,static int ipa_filter_reset_table (struct ipa *ipa,bool hashed,bool ipv6,bool modem) { -u32 ep_mask = ipa->filter_map; -u32 count =hweight32 (ep_mask); +u64 ep_mask = ipa->filtered;struct gsi_trans *trans;enum gsi_ee_id ee_id; - trans =ipa_cmd_trans_alloc (ipa, count); + trans =ipa_cmd_trans_alloc (ipa,hweight64 (ep_mask));if (!trans) { dev_err(&ipa->pdev->dev, "no transaction for %s filter reset\n",
@@ -405,7 +404,7 @@ static void ipa_table_init_add(struct gsi_trans *trans, bool filter, bool ipv6)* to hold the bitmap itself. The size of the hashed filter * table is either the same as the non-hashed one, or zero. */ - count =1 +hweight32 (ipa->filter_map); + count =1 +hweight64 (ipa->filtered); hash_count = hash_mem && hash_mem->size ? count :0 ; }else {/* The size of a route table region determines the number
@@ -503,7 +502,7 @@ static void ipa_filter_tuple_zero(struct ipa_endpoint *endpoint)static void ipa_filter_config (struct ipa *ipa,bool modem) {enum gsi_ee_id ee_id = modem ?GSI_EE_MODEM :GSI_EE_AP ; -u32 ep_mask = ipa->filter_map; +u64 ep_mask = ipa->filtered;if (!ipa_table_hash_support (ipa))return ;
@@ -615,7 +614,7 @@ bool ipa_table_mem_valid(struct ipa *ipa, bool filter)/* Filter tables must able to hold the endpoint bitmap plus * an entry for each endpoint that supports filtering */ -if (count <1 +hweight32 (ipa->filter_map)) +if (count <1 +hweight64 (ipa->filtered))return false; }else {/* Routing tables must be able to hold all modem entries,
@@ -720,9 +719,9 @@ int ipa_table_init(struct ipa *ipa)* that option, so there's no shifting required. */ if (ipa->version <IPA_VERSION_5_0 ) - *virt++ =cpu_to_le64 ((u64 )ipa->filter_map <<1 ); + *virt++ =cpu_to_le64 (ipa->filtered <<1 );else - *virt++ =cpu_to_le64 ((u64 )ipa->filter_map); + *virt++ =cpu_to_le64 (ipa->filtered);/* All the rest contain the DMA address of the zero rule */ le_addr =cpu_to_le64 (addr);
drivers/net/ipa/ipa_table.h +3 -3
@@ -11,13 +11,13 @@struct ipa ;/** -* ipa_filter_map_valid() - Validate a filter table endpoint bitmap +* ipa_filtered_valid() - Validate a filter table endpoint bitmap * @ipa: IPA pointer -* @filter_mask: Filter table endpoint bitmap to check +* @filtered: Filter table endpoint bitmap to check * * Return: true if all regions are valid, false otherwise */ -bool ipa_filter_map_valid (struct ipa *ipa,u32 filter_mask); +bool ipa_filtered_valid (struct ipa *ipa,u64 filtered);/** * ipa_table_hash_support() - Return true if hashed tables are supported
Signature · 1 line
2.34.1
PATCH v2 8/9 net: ipa: use a bitmap for set-up endpoints
In reply to Alex ElderReplace the 32-bit unsigned used to track endpoints that have completed setup with a Linux bitmap, to allow an arbitrary number of endpoints to be represented.
Rework the error handling in ipa_endpoint_init() so the defined endpoint bitmap is freed if an error occurs early. Once endpoints have been initialized, ipa_endpoint_exit() is used to recover if the set of filtered endpoints is invalid.
--- drivers/net/ipa/ipa.h | 4 ++-- drivers/net/ipa/ipa_endpoint.c | 38 +++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 19 deletions(-)
drivers/net/ipa/ipa.h +2 -2
@@ -66,7 +66,7 @@ struct ipa_interrupt;* @defined: Bitmap of endpoints defined in config data * @available: Bitmap of endpoints supported by hardware * @filtered: Bitmap of endpoints that support filtering -* @set_up: Bit mask indicating endpoints set up +* @set_up: Bitmap of endpoints that are set up for use * @enabled: Bit mask indicating endpoints enabled * @modem_tx_count: Number of defined modem TX endoints * @endpoint: Array of endpoint information
@@ -124,7 +124,7 @@ struct ipa {unsigned long *defined;/* Defined in configuration data */ unsigned long *available;/* Supported by hardware */ u64 filtered;/* Support filtering (AP and modem) */ -u32 set_up; +unsigned long *set_up;u32 enabled;u32 modem_tx_count;
drivers/net/ipa/ipa_endpoint.c +21 -17
@@ -1802,12 +1802,12 @@ static void ipa_endpoint_setup_one(struct ipa_endpoint *endpoint)ipa_endpoint_program (endpoint); - endpoint->ipa->set_up |=BIT (endpoint->endpoint_id); +__set_bit (endpoint->endpoint_id, endpoint->ipa->set_up); }static void ipa_endpoint_teardown_one (struct ipa_endpoint *endpoint) { - endpoint->ipa->set_up &= ~BIT (endpoint->endpoint_id); +__clear_bit (endpoint->endpoint_id, endpoint->ipa->set_up);if (!endpoint->toward_ipa)cancel_delayed_work_sync (&endpoint->replenish_work);
@@ -1819,23 +1819,16 @@ void ipa_endpoint_setup(struct ipa *ipa) {u32 endpoint_id; - ipa->set_up =0 ;for_each_set_bit (endpoint_id, ipa->defined, ipa->endpoint_count)ipa_endpoint_setup_one (&ipa->endpoint[endpoint_id]); }void ipa_endpoint_teardown (struct ipa *ipa) { -u32 set_up = ipa->set_up; - -while (set_up) { -u32 endpoint_id =__fls (set_up); - - set_up ^=BIT (endpoint_id); +u32 endpoint_id; +for_each_set_bit (endpoint_id, ipa->set_up, ipa->endpoint_count)ipa_endpoint_teardown_one (&ipa->endpoint[endpoint_id]); - } - ipa->set_up =0 ; }void ipa_endpoint_deconfig (struct ipa *ipa)
@@ -1978,6 +1971,8 @@ void ipa_endpoint_exit(struct ipa *ipa)for_each_set_bit (endpoint_id, ipa->defined, ipa->endpoint_count)ipa_endpoint_exit_one (&ipa->endpoint[endpoint_id]); +bitmap_free (ipa->set_up); + ipa->set_up =NULL ;bitmap_free (ipa->defined); ipa->defined =NULL ;
@@ -1999,11 +1994,15 @@ int ipa_endpoint_init(struct ipa *ipa, u32 count,if (!ipa->endpoint_count)return -EINVAL ; -/* Initialize the defined endpoint bitmap */ +/* Initialize endpoint state bitmaps */ ipa->defined =bitmap_zalloc (ipa->endpoint_count,GFP_KERNEL );if (!ipa->defined)return -ENOMEM ; + ipa->set_up =bitmap_zalloc (ipa->endpoint_count,GFP_KERNEL ); +if (!ipa->set_up) + goto err_free_defined; + filtered =0 ;for (name =0 ; name < count; name++, data++) {if (ipa_gsi_endpoint_data_empty (data))
@@ -2017,15 +2016,20 @@ int ipa_endpoint_init(struct ipa *ipa, u32 count, ipa->modem_tx_count++; } -if (!ipa_filtered_valid (ipa, filtered)) - goto err_endpoint_exit; +/* Make sure the set of filtered endpoints is valid */ +if (!ipa_filtered_valid (ipa, filtered)) { +ipa_endpoint_exit (ipa); + +return -EINVAL ; + } ipa->filtered = filtered;return 0 ; -err_endpoint_exit: -ipa_endpoint_exit (ipa); +err_free_defined: +bitmap_free (ipa->defined); + ipa->defined =NULL ; -return -EINVAL ; +return -ENOMEM ; }
Signature · 1 line
2.34.1
PATCH v2 9/9 net: ipa: use a bitmap for enabled endpoints
In reply to Alex ElderReplace the 32-bit unsigned used to track enabled endpoints with a Linux bitmap, to allow an arbitrary number of endpoints to be represented.
--- drivers/net/ipa/ipa.h | 4 ++-- drivers/net/ipa/ipa_endpoint.c | 32 ++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 14 deletions(-)
drivers/net/ipa/ipa.h +2 -2
@@ -67,7 +67,7 @@ struct ipa_interrupt;* @available: Bitmap of endpoints supported by hardware * @filtered: Bitmap of endpoints that support filtering * @set_up: Bitmap of endpoints that are set up for use -* @enabled: Bit mask indicating endpoints enabled +* @enabled: Bitmap of currently enabled endpoints * @modem_tx_count: Number of defined modem TX endoints * @endpoint: Array of endpoint information * @channel_map: Mapping of GSI channel to IPA endpoint
@@ -125,7 +125,7 @@ struct ipa {unsigned long *available;/* Supported by hardware */ u64 filtered;/* Support filtering (AP and modem) */ unsigned long *set_up; -u32 enabled; +unsigned long *enabled;u32 modem_tx_count;struct ipa_endpoint endpoint[IPA_ENDPOINT_MAX ];
drivers/net/ipa/ipa_endpoint.c +20 -12
@@ -1666,6 +1666,7 @@ static void ipa_endpoint_program(struct ipa_endpoint *endpoint)int ipa_endpoint_enable_one (struct ipa_endpoint *endpoint) { +u32 endpoint_id = endpoint->endpoint_id;struct ipa *ipa = endpoint->ipa;struct gsi *gsi = &ipa->gsi;int ret;
@@ -1675,37 +1676,35 @@ int ipa_endpoint_enable_one(struct ipa_endpoint *endpoint)dev_err (&ipa->pdev->dev,"error %d starting %cX channel %u for endpoint %u\n" , ret, endpoint->toward_ipa ?'T' :'R' , - endpoint->channel_id, endpoint->endpoint_id); + endpoint->channel_id, endpoint_id);return ret; }if (!endpoint->toward_ipa) { -ipa_interrupt_suspend_enable (ipa->interrupt, - endpoint->endpoint_id); +ipa_interrupt_suspend_enable (ipa->interrupt, endpoint_id);ipa_endpoint_replenish_enable (endpoint); } - ipa->enabled |=BIT (endpoint->endpoint_id); +__set_bit (endpoint_id, ipa->enabled);return 0 ; }void ipa_endpoint_disable_one (struct ipa_endpoint *endpoint) { -u32 mask =BIT (endpoint->endpoint_id); +u32 endpoint_id = endpoint->endpoint_id;struct ipa *ipa = endpoint->ipa;struct gsi *gsi = &ipa->gsi;int ret; -if (!(ipa->enabled & mask)) +if (!test_bit (endpoint_id, ipa->enabled))return ; - ipa->enabled ^= mask; +__clear_bit (endpoint_id, endpoint->ipa->enabled);if (!endpoint->toward_ipa) {ipa_endpoint_replenish_disable (endpoint); -ipa_interrupt_suspend_disable (ipa->interrupt, - endpoint->endpoint_id); +ipa_interrupt_suspend_disable (ipa->interrupt, endpoint_id); }/* Note that if stop fails, the channel's state is not well-defined */
@@ -1713,7 +1712,7 @@ void ipa_endpoint_disable_one(struct ipa_endpoint *endpoint)if (ret)dev_err (&ipa->pdev->dev,"error %d attempting to stop endpoint %u\n" , ret, - endpoint->endpoint_id); + endpoint_id); }void ipa_endpoint_suspend_one (struct ipa_endpoint *endpoint)
@@ -1722,7 +1721,7 @@ void ipa_endpoint_suspend_one(struct ipa_endpoint *endpoint)struct gsi *gsi = &endpoint->ipa->gsi;int ret; -if (!(endpoint->ipa->enabled &BIT (endpoint->endpoint_id))) +if (!test_bit (endpoint->endpoint_id, endpoint->ipa->enabled))return ;if (!endpoint->toward_ipa) {
@@ -1742,7 +1741,7 @@ void ipa_endpoint_resume_one(struct ipa_endpoint *endpoint)struct gsi *gsi = &endpoint->ipa->gsi;int ret; -if (!(endpoint->ipa->enabled &BIT (endpoint->endpoint_id))) +if (!test_bit (endpoint->endpoint_id, endpoint->ipa->enabled))return ;if (!endpoint->toward_ipa)
@@ -1971,6 +1970,8 @@ void ipa_endpoint_exit(struct ipa *ipa)for_each_set_bit (endpoint_id, ipa->defined, ipa->endpoint_count)ipa_endpoint_exit_one (&ipa->endpoint[endpoint_id]); +bitmap_free (ipa->enabled); + ipa->enabled =NULL ;bitmap_free (ipa->set_up); ipa->set_up =NULL ;bitmap_free (ipa->defined);
@@ -2003,6 +2004,10 @@ int ipa_endpoint_init(struct ipa *ipa, u32 count,if (!ipa->set_up) goto err_free_defined; + ipa->enabled =bitmap_zalloc (ipa->endpoint_count,GFP_KERNEL ); +if (!ipa->enabled) + goto err_free_set_up; + filtered =0 ;for (name =0 ; name < count; name++, data++) {if (ipa_gsi_endpoint_data_empty (data))
@@ -2027,6 +2032,9 @@ int ipa_endpoint_init(struct ipa *ipa, u32 count,return 0 ; +err_free_set_up: +bitmap_free (ipa->set_up); + ipa->set_up =NULL ; err_free_defined:bitmap_free (ipa->defined); ipa->defined =NULL ;
Signature · 1 line
2.34.1
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Wed, 2 Nov 2022 17:11:30 -0500 you wrote:
This series adds support for more than 32 IPA endpoints. To do this, five registers whose bits represent endpoint state are replicated as needed to represent endpoints beyond 32. For existing platforms, the number of endpoints is never greater than 32, so there is just one of each register. IPA v5.0+ supports more than that though; these changes prepare the code for that.
[...]
Here is the summary with links:
- [net-next,v2,1/9] net: ipa: reduce arguments to ipa_table_init_add()
https://git.kernel.org/netdev/net-next/c/5cb76899fb47 - [net-next,v2,2/9] net: ipa: use ipa_table_mem() in ipa_table_reset_add() https://git.kernel.org/netdev/net-next/c/6337b147828b - [net-next,v2,3/9] net: ipa: add a parameter to aggregation registers https://git.kernel.org/netdev/net-next/c/1d8f16dbdf36 - [net-next,v2,4/9] net: ipa: add a parameter to suspend registers (no matching commit) - [net-next,v2,5/9] net: ipa: use a bitmap for defined endpoints (no matching commit) - [net-next,v2,6/9] net: ipa: use a bitmap for available endpoints https://git.kernel.org/netdev/net-next/c/88de7672404d - [net-next,v2,7/9] net: ipa: support more filtering endpoints https://git.kernel.org/netdev/net-next/c/0f97fbd47858 - [net-next,v2,8/9] net: ipa: use a bitmap for set-up endpoints https://git.kernel.org/netdev/net-next/c/ae5108e9b7fa - [net-next,v2,9/9] net: ipa: use a bitmap for enabled endpoints https://git.kernel.org/netdev/net-next/c/9b7a00653651
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html