Commit 37a5f9dc authored by Alex Maftei (amaftei)'s avatar Alex Maftei (amaftei) Committed by David S. Miller
Browse files

sfc: move MCDI VI alloc/free code 



One function was renamed here, the other contains code extracted from
another.

Signed-off-by: default avatarAlexandru-Mihai Maftei <amaftei@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1cf0f76a

drivers/net/ethernet/sfc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ sfc-y += efx.o efx_common.o efx_channels.o nic.o \ 
			   tx.o tx_common.o rx.o rx_common.o \

			   selftest.o ethtool.o ptp.o tx_tso.o \

			   mcdi.o mcdi_port.o mcdi_port_common.o \

			   mcdi_mon.o

			   mcdi_functions.o mcdi_mon.o

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_SRIOV)	+= sriov.o siena_sriov.o ef10_sriov.o

drivers/net/ethernet/sfc/ef10.c

+6 −39
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "mcdi.h"

#include "mcdi_pcol.h"

#include "mcdi_port_common.h"

#include "mcdi_functions.h"

#include "nic.h"

#include "workarounds.h"

#include "selftest.h"
@@ -834,22 +835,6 @@ static int efx_ef10_probe(struct efx_nic *efx) 
	return rc;

}



static int efx_ef10_free_vis(struct efx_nic *efx)

{

	MCDI_DECLARE_BUF_ERR(outbuf);

	size_t outlen;

	int rc = efx_mcdi_rpc_quiet(efx, MC_CMD_FREE_VIS, NULL, 0,

				    outbuf, sizeof(outbuf), &outlen);



	/* -EALREADY means nothing to free, so ignore */

	if (rc == -EALREADY)

		rc = 0;

	if (rc)

		efx_mcdi_display_error(efx, MC_CMD_FREE_VIS, 0, outbuf, outlen,

				       rc);

	return rc;

}



#ifdef EFX_USE_PIO



static void efx_ef10_free_piobufs(struct efx_nic *efx)
@@ -1092,7 +1077,7 @@ static void efx_ef10_remove(struct efx_nic *efx) 
	if (nic_data->wc_membase)

		iounmap(nic_data->wc_membase);



	rc = efx_ef10_free_vis(efx);

	rc = efx_mcdi_free_vis(efx);

	WARN_ON(rc != 0);



	if (!nic_data->must_restore_piobufs)
@@ -1263,28 +1248,10 @@ static int efx_ef10_probe_vf(struct efx_nic *efx __attribute__ ((unused))) 
static int efx_ef10_alloc_vis(struct efx_nic *efx,

			      unsigned int min_vis, unsigned int max_vis)

{

	MCDI_DECLARE_BUF(inbuf, MC_CMD_ALLOC_VIS_IN_LEN);

	MCDI_DECLARE_BUF(outbuf, MC_CMD_ALLOC_VIS_OUT_LEN);

	struct efx_ef10_nic_data *nic_data = efx->nic_data;

	size_t outlen;

	int rc;



	MCDI_SET_DWORD(inbuf, ALLOC_VIS_IN_MIN_VI_COUNT, min_vis);

	MCDI_SET_DWORD(inbuf, ALLOC_VIS_IN_MAX_VI_COUNT, max_vis);

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

			  outbuf, sizeof(outbuf), &outlen);

	if (rc != 0)

		return rc;



	if (outlen < MC_CMD_ALLOC_VIS_OUT_LEN)

		return -EIO;



	netif_dbg(efx, drv, efx->net_dev, "base VI is A0x%03x\n",

		  MCDI_DWORD(outbuf, ALLOC_VIS_OUT_VI_BASE));



	nic_data->vi_base = MCDI_DWORD(outbuf, ALLOC_VIS_OUT_VI_BASE);

	nic_data->n_allocated_vis = MCDI_DWORD(outbuf, ALLOC_VIS_OUT_VI_COUNT);

	return 0;

	return efx_mcdi_alloc_vis(efx, min_vis, max_vis, &nic_data->vi_base,

				  &nic_data->n_allocated_vis);

}



/* Note that the failure path of this function does not free
@@ -1366,7 +1333,7 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx) 
	}



	/* In case the last attached driver failed to free VIs, do it now */

	rc = efx_ef10_free_vis(efx);

	rc = efx_mcdi_free_vis(efx);

	if (rc != 0)

		return rc;
@@ -1387,7 +1354,7 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx) 
		efx->max_tx_channels =

			nic_data->n_allocated_vis / EFX_TXQ_TYPES;



		efx_ef10_free_vis(efx);

		efx_mcdi_free_vis(efx);

		return -EAGAIN;

	}

drivers/net/ethernet/sfc/mcdi_functions.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/****************************************************************************

 * Driver for Solarflare network controllers and boards

 * Copyright 2019 Solarflare Communications Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published

 * by the Free Software Foundation, incorporated herein by reference.

 */



#include "net_driver.h"

#include "efx.h"

#include "nic.h"

#include "mcdi_functions.h"

#include "mcdi.h"

#include "mcdi_pcol.h"



int efx_mcdi_free_vis(struct efx_nic *efx)

{

	MCDI_DECLARE_BUF_ERR(outbuf);

	size_t outlen;

	int rc = efx_mcdi_rpc_quiet(efx, MC_CMD_FREE_VIS, NULL, 0,

				    outbuf, sizeof(outbuf), &outlen);



	/* -EALREADY means nothing to free, so ignore */

	if (rc == -EALREADY)

		rc = 0;

	if (rc)

		efx_mcdi_display_error(efx, MC_CMD_FREE_VIS, 0, outbuf, outlen,

				       rc);

	return rc;

}



int efx_mcdi_alloc_vis(struct efx_nic *efx, unsigned int min_vis,

		       unsigned int max_vis, unsigned int *vi_base,

		       unsigned int *allocated_vis)

{

	MCDI_DECLARE_BUF(outbuf, MC_CMD_ALLOC_VIS_OUT_LEN);

	MCDI_DECLARE_BUF(inbuf, MC_CMD_ALLOC_VIS_IN_LEN);

	size_t outlen;

	int rc;



	MCDI_SET_DWORD(inbuf, ALLOC_VIS_IN_MIN_VI_COUNT, min_vis);

	MCDI_SET_DWORD(inbuf, ALLOC_VIS_IN_MAX_VI_COUNT, max_vis);

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

			  outbuf, sizeof(outbuf), &outlen);

	if (rc != 0)

		return rc;



	if (outlen < MC_CMD_ALLOC_VIS_OUT_LEN)

		return -EIO;



	netif_dbg(efx, drv, efx->net_dev, "base VI is A0x%03x\n",

		  MCDI_DWORD(outbuf, ALLOC_VIS_OUT_VI_BASE));



	if (vi_base)

		*vi_base = MCDI_DWORD(outbuf, ALLOC_VIS_OUT_VI_BASE);

	if (allocated_vis)

		*allocated_vis = MCDI_DWORD(outbuf, ALLOC_VIS_OUT_VI_COUNT);

	return 0;

}