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

Commit 48ce5634 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Add more information to many warnings using WARN() and netdev_WARN() 



In case of certain hardware and firmware errors it can be useful to
have more context than just the file and line number.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
parent bbbe7149

drivers/net/ethernet/sfc/ef10.c

+20 −10
Original line number Diff line number Diff line
@@ -1252,7 +1252,8 @@ static void efx_ef10_tx_init(struct efx_tx_queue *tx_queue) 
	return;



fail:

	WARN_ON(true);

	netdev_WARN(efx->net_dev, "failed to initialise TXQ %d\n",

		    tx_queue->queue);

}



static void efx_ef10_tx_fini(struct efx_tx_queue *tx_queue)
@@ -1492,9 +1493,9 @@ static void efx_ef10_rx_init(struct efx_rx_queue *rx_queue) 


	rc = efx_mcdi_rpc(efx, MC_CMD_INIT_RXQ, inbuf, inlen,

			  outbuf, sizeof(outbuf), &outlen);

	WARN_ON(rc);



	return;

	if (rc)

		netdev_WARN(efx->net_dev, "failed to initialise RXQ %d\n",

			    efx_rx_queue_index(rx_queue));

}



static void efx_ef10_rx_fini(struct efx_rx_queue *rx_queue)
@@ -1718,8 +1719,6 @@ static void efx_ef10_handle_rx_abort(struct efx_rx_queue *rx_queue) 
{

	unsigned int rx_desc_ptr;



	WARN_ON(rx_queue->scatter_n == 0);



	netif_dbg(rx_queue->efx, hw, rx_queue->efx->net_dev,

		  "scattered RX aborted (dropping %u buffers)\n",

		  rx_queue->scatter_n);
@@ -1755,7 +1754,10 @@ static int efx_ef10_handle_rx_event(struct efx_channel *channel, 
	rx_l4_class = EFX_QWORD_FIELD(*event, ESF_DZ_RX_L4_CLASS);

	rx_cont = EFX_QWORD_FIELD(*event, ESF_DZ_RX_CONT);



	WARN_ON(EFX_QWORD_FIELD(*event, ESF_DZ_RX_DROP_EVENT));

	if (EFX_QWORD_FIELD(*event, ESF_DZ_RX_DROP_EVENT))

		netdev_WARN(efx->net_dev, "saw RX_DROP_EVENT: event="

			    EFX_QWORD_FMT "\n",

			    EFX_QWORD_VAL(*event));



	rx_queue = efx_channel_get_rx_queue(channel);
@@ -1770,7 +1772,12 @@ static int efx_ef10_handle_rx_event(struct efx_channel *channel, 


		/* detect rx abort */

		if (unlikely(n_descs == rx_queue->scatter_n)) {

			WARN_ON(rx_bytes != 0);

			if (rx_queue->scatter_n == 0 || rx_bytes != 0)

				netdev_WARN(efx->net_dev,

					    "invalid RX abort: scatter_n=%u event="

					    EFX_QWORD_FMT "\n",

					    rx_queue->scatter_n,

					    EFX_QWORD_VAL(*event));

			efx_ef10_handle_rx_abort(rx_queue);

			return 0;

		}
@@ -3035,8 +3042,11 @@ static void efx_ef10_filter_table_remove(struct efx_nic *efx) 
			       table->entry[filter_idx].handle);

		rc = efx_mcdi_rpc(efx, MC_CMD_FILTER_OP, inbuf, sizeof(inbuf),

				  NULL, 0, NULL);



		WARN_ON(rc != 0);

		if (rc)

			netdev_WARN(efx->net_dev,

				    "filter_idx=%#x handle=%#llx\n",

				    filter_idx,

				    table->entry[filter_idx].handle);

		kfree(spec);

	}