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

Commit f5253d92 authored by Ben Hutchings's avatar Ben Hutchings
Browse files

sfc: Define and use MCDI_POPULATE_DWORD_{1,2,3,4,5,6,7} 



There is only one user now, but we're about to add many more.

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

drivers/net/ethernet/sfc/mcdi.h

+54 −0
Original line number Diff line number Diff line
@@ -128,6 +128,60 @@ extern void efx_mcdi_sensor_event(struct efx_nic *efx, efx_qword_t *ev); 
	EFX_POPULATE_DWORD_1(*_MCDI_DWORD(_buf, _field), EFX_DWORD_0, _value)

#define MCDI_DWORD(_buf, _field)					\

	EFX_DWORD_FIELD(*_MCDI_DWORD(_buf, _field), EFX_DWORD_0)

#define MCDI_POPULATE_DWORD_1(_buf, _field, _name1, _value1)		\

	EFX_POPULATE_DWORD_1(*_MCDI_DWORD(_buf, _field),		\

			     MC_CMD_ ## _name1, _value1)

#define MCDI_POPULATE_DWORD_2(_buf, _field, _name1, _value1,		\

			      _name2, _value2)				\

	EFX_POPULATE_DWORD_2(*_MCDI_DWORD(_buf, _field),		\

			     MC_CMD_ ## _name1, _value1,		\

			     MC_CMD_ ## _name2, _value2)

#define MCDI_POPULATE_DWORD_3(_buf, _field, _name1, _value1,		\

			      _name2, _value2, _name3, _value3)		\

	EFX_POPULATE_DWORD_3(*_MCDI_DWORD(_buf, _field),		\

			     MC_CMD_ ## _name1, _value1,		\

			     MC_CMD_ ## _name2, _value2,		\

			     MC_CMD_ ## _name3, _value3)

#define MCDI_POPULATE_DWORD_4(_buf, _field, _name1, _value1,		\

			      _name2, _value2, _name3, _value3,		\

			      _name4, _value4)				\

	EFX_POPULATE_DWORD_4(*_MCDI_DWORD(_buf, _field),		\

			     MC_CMD_ ## _name1, _value1,		\

			     MC_CMD_ ## _name2, _value2,		\

			     MC_CMD_ ## _name3, _value3,		\

			     MC_CMD_ ## _name4, _value4)

#define MCDI_POPULATE_DWORD_5(_buf, _field, _name1, _value1,		\

			      _name2, _value2, _name3, _value3,		\

			      _name4, _value4, _name5, _value5)		\

	EFX_POPULATE_DWORD_5(*_MCDI_DWORD(_buf, _field),		\

			     MC_CMD_ ## _name1, _value1,		\

			     MC_CMD_ ## _name2, _value2,		\

			     MC_CMD_ ## _name3, _value3,		\

			     MC_CMD_ ## _name4, _value4,		\

			     MC_CMD_ ## _name5, _value5)

#define MCDI_POPULATE_DWORD_6(_buf, _field, _name1, _value1,		\

			      _name2, _value2, _name3, _value3,		\

			      _name4, _value4, _name5, _value5,		\

			      _name6, _value6)				\

	EFX_POPULATE_DWORD_6(*_MCDI_DWORD(_buf, _field),		\

			     MC_CMD_ ## _name1, _value1,		\

			     MC_CMD_ ## _name2, _value2,		\

			     MC_CMD_ ## _name3, _value3,		\

			     MC_CMD_ ## _name4, _value4,		\

			     MC_CMD_ ## _name5, _value5,		\

			     MC_CMD_ ## _name6, _value6)

#define MCDI_POPULATE_DWORD_7(_buf, _field, _name1, _value1,		\

			      _name2, _value2, _name3, _value3,		\

			      _name4, _value4, _name5, _value5,		\

			      _name6, _value6, _name7, _value7)		\

	EFX_POPULATE_DWORD_7(*_MCDI_DWORD(_buf, _field),		\

			     MC_CMD_ ## _name1, _value1,		\

			     MC_CMD_ ## _name2, _value2,		\

			     MC_CMD_ ## _name3, _value3,		\

			     MC_CMD_ ## _name4, _value4,		\

			     MC_CMD_ ## _name5, _value5,		\

			     MC_CMD_ ## _name6, _value6,		\

			     MC_CMD_ ## _name7, _value7)

#define MCDI_SET_QWORD(_buf, _field, _value)				\

	do {								\

		EFX_POPULATE_DWORD_1(_MCDI_DWORD(_buf, _field)[0],	\

drivers/net/ethernet/sfc/mcdi_port.c

+8 −10
Original line number Diff line number Diff line
@@ -926,21 +926,19 @@ static int efx_mcdi_mac_stats(struct efx_nic *efx, dma_addr_t dma_addr, 
{

	MCDI_DECLARE_BUF(inbuf, MC_CMD_MAC_STATS_IN_LEN);

	int rc;

	efx_dword_t *cmd_ptr;

	int period = enable ? 1000 : 0;



	BUILD_BUG_ON(MC_CMD_MAC_STATS_OUT_DMA_LEN != 0);



	MCDI_SET_QWORD(inbuf, MAC_STATS_IN_DMA_ADDR, dma_addr);

	cmd_ptr = (efx_dword_t *)MCDI_PTR(inbuf, MAC_STATS_IN_CMD);

	EFX_POPULATE_DWORD_7(*cmd_ptr,

			     MC_CMD_MAC_STATS_IN_DMA, !!enable,

			     MC_CMD_MAC_STATS_IN_CLEAR, clear,

			     MC_CMD_MAC_STATS_IN_PERIODIC_CHANGE, 1,

			     MC_CMD_MAC_STATS_IN_PERIODIC_ENABLE, !!enable,

			     MC_CMD_MAC_STATS_IN_PERIODIC_CLEAR, 0,

			     MC_CMD_MAC_STATS_IN_PERIODIC_NOEVENT, 1,

			     MC_CMD_MAC_STATS_IN_PERIOD_MS, period);

	MCDI_POPULATE_DWORD_7(inbuf, MAC_STATS_IN_CMD,

			      MAC_STATS_IN_DMA, !!enable,

			      MAC_STATS_IN_CLEAR, clear,

			      MAC_STATS_IN_PERIODIC_CHANGE, 1,

			      MAC_STATS_IN_PERIODIC_ENABLE, !!enable,

			      MAC_STATS_IN_PERIODIC_CLEAR, 0,

			      MAC_STATS_IN_PERIODIC_NOEVENT, 1,

			      MAC_STATS_IN_PERIOD_MS, period);

	MCDI_SET_DWORD(inbuf, MAC_STATS_IN_DMA_LEN, dma_len);



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