Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e01b16a7 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: remove EFX_BUG_ON_PARANOID, use EFX_WARN_ON_[ONCE_]PARANOID instead 



Logically, EFX_BUG_ON_PARANOID can never be correct.  For, BUG_ON should
 only be used if it is not possible to continue without potential harm;
 and since the non-DEBUG driver will continue regardless (as the BUG_ON is
 compiled out), clearly the BUG_ON cannot be needed in the DEBUG driver.
So, replace every EFX_BUG_ON_PARANOID with either an EFX_WARN_ON_PARANOID
 or the newly defined EFX_WARN_ON_ONCE_PARANOID.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 816fba35

drivers/net/ethernet/sfc/ef10.c

+1 −1
Original line number Diff line number Diff line
@@ -2100,7 +2100,7 @@ static int efx_ef10_tx_tso_desc(struct efx_tx_queue *tx_queue, 
	u32 seqnum;

	u32 mss;



	EFX_BUG_ON_PARANOID(tx_queue->tso_version != 2);

	EFX_WARN_ON_ONCE_PARANOID(tx_queue->tso_version != 2);



	mss = skb_shinfo(skb)->gso_size;

drivers/net/ethernet/sfc/efx.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static int efx_probe_eventq(struct efx_channel *channel) 
	/* Build an event queue with room for one event per tx and rx buffer,

	 * plus some extra for link state events and MCDI completions. */

	entries = roundup_pow_of_two(efx->rxq_entries + efx->txq_entries + 128);

	EFX_BUG_ON_PARANOID(entries > EFX_MAX_EVQ_SIZE);

	EFX_WARN_ON_PARANOID(entries > EFX_MAX_EVQ_SIZE);

	channel->eventq_mask = max(entries, EFX_MIN_EVQ_SIZE) - 1;



	return efx_nic_probe_eventq(channel);

drivers/net/ethernet/sfc/ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -333,12 +333,12 @@ static int efx_ethtool_fill_self_tests(struct efx_nic *efx, 
		      "core", 0, "registers", NULL);



	if (efx->phy_op->run_tests != NULL) {

		EFX_BUG_ON_PARANOID(efx->phy_op->test_name == NULL);

		EFX_WARN_ON_PARANOID(efx->phy_op->test_name == NULL);



		for (i = 0; true; ++i) {

			const char *name;



			EFX_BUG_ON_PARANOID(i >= EFX_MAX_PHY_TESTS);

			EFX_WARN_ON_PARANOID(i >= EFX_MAX_PHY_TESTS);

			name = efx->phy_op->test_name(efx, i);

			if (name == NULL)

				break;

drivers/net/ethernet/sfc/farch.c

+3 −3
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ efx_init_special_buffer(struct efx_nic *efx, struct efx_special_buffer *buffer) 
	dma_addr_t dma_addr;

	int i;



	EFX_BUG_ON_PARANOID(!buffer->buf.addr);

	EFX_WARN_ON_PARANOID(!buffer->buf.addr);



	/* Write buffer descriptors to NIC */

	for (i = 0; i < buffer->entries; i++) {
@@ -332,7 +332,7 @@ void efx_farch_tx_write(struct efx_tx_queue *tx_queue) 
		txd = efx_tx_desc(tx_queue, write_ptr);

		++tx_queue->write_count;



		EFX_BUG_ON_PARANOID(buffer->flags & EFX_TX_BUF_OPTION);

		EFX_WARN_ON_ONCE_PARANOID(buffer->flags & EFX_TX_BUF_OPTION);



		/* Create TX descriptor ring entry */

		BUILD_BUG_ON(EFX_TX_BUF_CONT != 1);
@@ -2041,7 +2041,7 @@ efx_farch_filter_from_gen_spec(struct efx_farch_filter_spec *spec, 
		__be32 rhost, host1, host2;

		__be16 rport, port1, port2;



		EFX_BUG_ON_PARANOID(!(gen_spec->flags & EFX_FILTER_FLAG_RX));

		EFX_WARN_ON_PARANOID(!(gen_spec->flags & EFX_FILTER_FLAG_RX));



		if (gen_spec->ether_type != htons(ETH_P_IP))

			return -EPROTONOSUPPORT;

drivers/net/ethernet/sfc/mcdi.h

+2 −2
Original line number Diff line number Diff line
@@ -129,14 +129,14 @@ struct efx_mcdi_data { 


static inline struct efx_mcdi_iface *efx_mcdi(struct efx_nic *efx)

{

	EFX_BUG_ON_PARANOID(!efx->mcdi);

	EFX_WARN_ON_PARANOID(!efx->mcdi);

	return &efx->mcdi->iface;

}



#ifdef CONFIG_SFC_MCDI_MON

static inline struct efx_mcdi_mon *efx_mcdi_mon(struct efx_nic *efx)

{

	EFX_BUG_ON_PARANOID(!efx->mcdi);

	EFX_WARN_ON_PARANOID(!efx->mcdi);

	return &efx->mcdi->hwmon;

}

#endif