Commit 5bc55884 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: use WARN_ON() rather than assertions 



I've added commented assertions to record certain properties that
can be assumed to hold in certain places in the IPA code.  Convert
these into real WARN_ON() calls so the assertions are actually
checked, using the standard WARN_ON() mechanism.

Where errors can be returned, return an error if a warning is
triggered.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 442d68eb

drivers/net/ipa/gsi_trans.c

+18 −12
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ static u32 gsi_trans_pool_alloc_common(struct gsi_trans_pool *pool, u32 count) 
{

	u32 offset;



	/* assert(count > 0); */

	/* assert(count <= pool->max_alloc); */

	WARN_ON(!count);

	WARN_ON(count > pool->max_alloc);



	/* Allocate from beginning if wrap would occur */

	if (count > pool->count - pool->free)
@@ -221,9 +221,10 @@ void *gsi_trans_pool_next(struct gsi_trans_pool *pool, void *element) 
{

	void *end = pool->base + pool->count * pool->size;



	/* assert(element >= pool->base); */

	/* assert(element < end); */

	/* assert(pool->max_alloc == 1); */

	WARN_ON(element < pool->base);

	WARN_ON(element >= end);

	WARN_ON(pool->max_alloc != 1);



	element += pool->size;



	return element < end ? element : pool->base;
@@ -328,7 +329,8 @@ struct gsi_trans *gsi_channel_trans_alloc(struct gsi *gsi, u32 channel_id, 
	struct gsi_trans_info *trans_info;

	struct gsi_trans *trans;



	/* assert(tre_count <= gsi_channel_trans_tre_max(gsi, channel_id)); */

	if (WARN_ON(tre_count > gsi_channel_trans_tre_max(gsi, channel_id)))

		return NULL;



	trans_info = &channel->trans_info;
@@ -404,7 +406,7 @@ void gsi_trans_cmd_add(struct gsi_trans *trans, void *buf, u32 size, 
	u32 which = trans->used++;

	struct scatterlist *sg;



	/* assert(which < trans->tre_count); */

	WARN_ON(which >= trans->tre_count);



	/* Commands are quite different from data transfer requests.

	 * Their payloads come from a pool whose memory is allocated
@@ -437,8 +439,10 @@ int gsi_trans_page_add(struct gsi_trans *trans, struct page *page, u32 size, 
	struct scatterlist *sg = &trans->sgl[0];

	int ret;



	/* assert(trans->tre_count == 1); */

	/* assert(!trans->used); */

	if (WARN_ON(trans->tre_count != 1))

		return -EINVAL;

	if (WARN_ON(trans->used))

		return -EINVAL;



	sg_set_page(sg, page, size, offset);

	ret = dma_map_sg(trans->gsi->dev, sg, 1, trans->direction);
@@ -457,8 +461,10 @@ int gsi_trans_skb_add(struct gsi_trans *trans, struct sk_buff *skb) 
	u32 used;

	int ret;



	/* assert(trans->tre_count == 1); */

	/* assert(!trans->used); */

	if (WARN_ON(trans->tre_count != 1))

		return -EINVAL;

	if (WARN_ON(trans->used))

		return -EINVAL;



	/* skb->len will not be 0 (checked early) */

	ret = skb_to_sgvec(skb, sg, 0, skb->len);
@@ -546,7 +552,7 @@ static void __gsi_trans_commit(struct gsi_trans *trans, bool ring_db) 
	u32 avail;

	u32 i;



	/* assert(trans->used > 0); */

	WARN_ON(!trans->used);



	/* Consume the entries.  If we cross the end of the ring while

	 * filling them we'll switch to the beginning to finish.

drivers/net/ipa/ipa_cmd.c

+7 −7
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ static void ipa_cmd_validate_build(void) 
		     field_max(IP_FLTRT_FLAGS_NHASH_SIZE_FMASK));

	BUILD_BUG_ON(field_max(IP_FLTRT_FLAGS_HASH_ADDR_FMASK) !=

		     field_max(IP_FLTRT_FLAGS_NHASH_ADDR_FMASK));



	/* Valid endpoint numbers must fit in the IP packet init command */

	BUILD_BUG_ON(field_max(IPA_PACKET_INIT_DEST_ENDPOINT_FMASK) <

		     IPA_ENDPOINT_MAX - 1);

}



/* Validate a memory region holding a table */
@@ -531,9 +535,6 @@ static void ipa_cmd_ip_packet_init_add(struct gsi_trans *trans, u8 endpoint_id) 
	union ipa_cmd_payload *cmd_payload;

	dma_addr_t payload_addr;



	/* assert(endpoint_id <

		  field_max(IPA_PACKET_INIT_DEST_ENDPOINT_FMASK)); */



	cmd_payload = ipa_cmd_payload_alloc(ipa, &payload_addr);

	payload = &cmd_payload->ip_packet_init;
@@ -557,8 +558,9 @@ void ipa_cmd_dma_shared_mem_add(struct gsi_trans *trans, u32 offset, u16 size, 
	u16 flags;



	/* size and offset must fit in 16 bit fields */

	/* assert(size > 0 && size <= U16_MAX); */

	/* assert(offset <= U16_MAX && ipa->mem_offset <= U16_MAX - offset); */

	WARN_ON(!size);

	WARN_ON(size > U16_MAX);

	WARN_ON(offset > U16_MAX || ipa->mem_offset > U16_MAX - offset);



	offset += ipa->mem_offset;
@@ -597,8 +599,6 @@ static void ipa_cmd_ip_tag_status_add(struct gsi_trans *trans) 
	union ipa_cmd_payload *cmd_payload;

	dma_addr_t payload_addr;



	/* assert(tag <= field_max(IP_PACKET_TAG_STATUS_TAG_FMASK)); */



	cmd_payload = ipa_cmd_payload_alloc(ipa, &payload_addr);

	payload = &cmd_payload->ip_packet_tag_status;

drivers/net/ipa/ipa_endpoint.c

+15 −11
Original line number Diff line number Diff line
@@ -250,17 +250,18 @@ ipa_endpoint_init_ctrl(struct ipa_endpoint *endpoint, bool suspend_delay) 


	/* Suspend is not supported for IPA v4.0+.  Delay doesn't work

	 * correctly on IPA v4.2.

	 *

	 * if (endpoint->toward_ipa)

	 * 	assert(ipa->version != IPA_VERSION_4.2);

	 * else

	 *	assert(ipa->version < IPA_VERSION_4_0);

	 */

	if (endpoint->toward_ipa)

		WARN_ON(ipa->version == IPA_VERSION_4_2);

	else

		WARN_ON(ipa->version >= IPA_VERSION_4_0);



	mask = endpoint->toward_ipa ? ENDP_DELAY_FMASK : ENDP_SUSPEND_FMASK;



	val = ioread32(ipa->reg_virt + offset);

	/* Don't bother if it's already in the requested state */

	state = !!(val & mask);



	/* Don't bother if it's already in the requested state */

	if (suspend_delay != state) {

		val ^= mask;

		iowrite32(val, ipa->reg_virt + offset);
@@ -273,7 +274,7 @@ ipa_endpoint_init_ctrl(struct ipa_endpoint *endpoint, bool suspend_delay) 
static void

ipa_endpoint_program_delay(struct ipa_endpoint *endpoint, bool enable)

{

	/* assert(endpoint->toward_ipa); */

	WARN_ON(!endpoint->toward_ipa);



	/* Delay mode doesn't work properly for IPA v4.2 */

	if (endpoint->ipa->version != IPA_VERSION_4_2)
@@ -287,7 +288,8 @@ static bool ipa_endpoint_aggr_active(struct ipa_endpoint *endpoint) 
	u32 offset;

	u32 val;



	/* assert(mask & ipa->available); */

	WARN_ON(!(mask & ipa->available));



	offset = ipa_reg_state_aggr_active_offset(ipa->version);

	val = ioread32(ipa->reg_virt + offset);
@@ -299,7 +301,8 @@ static void ipa_endpoint_force_close(struct ipa_endpoint *endpoint) 
	u32 mask = BIT(endpoint->endpoint_id);

	struct ipa *ipa = endpoint->ipa;



	/* assert(mask & ipa->available); */

	WARN_ON(!(mask & ipa->available));



	iowrite32(mask, ipa->reg_virt + IPA_REG_AGGR_FORCE_CLOSE_OFFSET);

}
@@ -338,7 +341,7 @@ ipa_endpoint_program_suspend(struct ipa_endpoint *endpoint, bool enable) 
	if (endpoint->ipa->version >= IPA_VERSION_4_0)

		return enable;	/* For IPA v4.0+, no change made */



	/* assert(!endpoint->toward_ipa); */

	WARN_ON(endpoint->toward_ipa);



	suspended = ipa_endpoint_init_ctrl(endpoint, enable);
@@ -1156,7 +1159,8 @@ static bool ipa_endpoint_skb_build(struct ipa_endpoint *endpoint, 
	if (!endpoint->netdev)

		return false;



	/* assert(len <= SKB_WITH_OVERHEAD(IPA_RX_BUFFER_SIZE-NET_SKB_PAD)); */

	WARN_ON(len > SKB_WITH_OVERHEAD(IPA_RX_BUFFER_SIZE - NET_SKB_PAD));



	skb = build_skb(page_address(page), IPA_RX_BUFFER_SIZE);

	if (skb) {

		/* Reserve the headroom and account for the data */

drivers/net/ipa/ipa_interrupt.c

+5 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt, 
	u32 offset;

	u32 val;



	/* assert(mask & ipa->available); */

	WARN_ON(!(mask & ipa->available));



	/* IPA version 3.0 does not support TX_SUSPEND interrupt control */

	if (ipa->version == IPA_VERSION_3_0)
@@ -206,7 +206,8 @@ void ipa_interrupt_add(struct ipa_interrupt *interrupt, 
	struct ipa *ipa = interrupt->ipa;

	u32 offset;



	/* assert(ipa_irq < IPA_IRQ_COUNT); */

	WARN_ON(ipa_irq >= IPA_IRQ_COUNT);



	interrupt->handler[ipa_irq] = handler;



	/* Update the IPA interrupt mask to enable it */
@@ -222,7 +223,8 @@ ipa_interrupt_remove(struct ipa_interrupt *interrupt, enum ipa_irq_id ipa_irq) 
	struct ipa *ipa = interrupt->ipa;

	u32 offset;



	/* assert(ipa_irq < IPA_IRQ_COUNT); */

	WARN_ON(ipa_irq >= IPA_IRQ_COUNT);



	/* Update the IPA interrupt mask to disable it */

	interrupt->enabled &= ~BIT(ipa_irq);

	offset = ipa_reg_irq_en_offset(ipa->version);

drivers/net/ipa/ipa_main.c

+1 −4
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ ipa_hardware_config_qsb(struct ipa *ipa, const struct ipa_data *data) 
	const struct ipa_qsb_data *data1;

	u32 val;



	/* assert(data->qsb_count > 0); */

	/* assert(data->qsb_count < 3); */



	/* QMB 0 represents DDR; QMB 1 (if present) represents PCIe */

	data0 = &data->qsb_data[IPA_QSB_MASTER_DDR];

	if (data->qsb_count > 1)
@@ -293,7 +290,7 @@ ipa_hardware_config_qsb(struct ipa *ipa, const struct ipa_data *data) 
 */

static u32 ipa_aggr_granularity_val(u32 usec)

{

	/* assert(usec != 0); */

	WARN_ON(!usec);



	return DIV_ROUND_CLOSEST(usec * TIMER_FREQUENCY, USEC_PER_SEC) - 1;

}