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

Commit 592a4ceb authored by Intiyaz Basha's avatar Intiyaz Basha Committed by David S. Miller
Browse files

liquidio: Moved common function if_cfg_callback to lio_core.c 



Moved common function if_cfg_callback to lio_core.c
and renamed it to lio_if_cfg_callback.

Signed-off-by: default avatarIntiyaz Basha <intiyaz.basha@cavium.com>
Acked-by: default avatarDerek Chickles <derek.chickles@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ac305c3

drivers/net/ethernet/cavium/liquidio/lio_core.c

+32 −0
Original line number Diff line number Diff line
@@ -29,6 +29,38 @@ 
/* OOM task polling interval */

#define LIO_OOM_POLL_INTERVAL_MS 250



/**

 * \brief Callback for getting interface configuration

 * @param status status of request

 * @param buf pointer to resp structure

 */

void lio_if_cfg_callback(struct octeon_device *oct,

			 u32 status __attribute__((unused)), void *buf)

{

	struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;

	struct liquidio_if_cfg_context *ctx;

	struct liquidio_if_cfg_resp *resp;



	resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;

	ctx = (struct liquidio_if_cfg_context *)sc->ctxptr;



	oct = lio_get_device(ctx->octeon_id);

	if (resp->status)

		dev_err(&oct->pci_dev->dev, "nic if cfg instruction failed. Status: %llx\n",

			CVM_CAST64(resp->status));

	WRITE_ONCE(ctx->cond, 1);



	snprintf(oct->fw_info.liquidio_firmware_version, 32, "%s",

		 resp->cfg_info.liquidio_firmware_version);



	/* This barrier is required to be sure that the response has been

	 * written fully before waking up the handler

	 */

	wmb();



	wake_up_interruptible(&ctx->wc);

}



int liquidio_set_feature(struct net_device *netdev, int cmd, u16 param1)

{

	struct lio *lio = GET_LIO(netdev);

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −34
Original line number Diff line number Diff line
@@ -1941,39 +1941,6 @@ static int load_firmware(struct octeon_device *oct) 
	return ret;

}



/**

 * \brief Callback for getting interface configuration

 * @param status status of request

 * @param buf pointer to resp structure

 */

static void if_cfg_callback(struct octeon_device *oct,

			    u32 status __attribute__((unused)),

			    void *buf)

{

	struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;

	struct liquidio_if_cfg_resp *resp;

	struct liquidio_if_cfg_context *ctx;



	resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;

	ctx = (struct liquidio_if_cfg_context *)sc->ctxptr;



	oct = lio_get_device(ctx->octeon_id);

	if (resp->status)

		dev_err(&oct->pci_dev->dev, "nic if cfg instruction failed. Status: 0x%llx (0x%08x)\n",

			CVM_CAST64(resp->status), status);

	WRITE_ONCE(ctx->cond, 1);



	snprintf(oct->fw_info.liquidio_firmware_version, 32, "%s",

		 resp->cfg_info.liquidio_firmware_version);



	/* This barrier is required to be sure that the response has been

	 * written fully before waking up the handler

	 */

	wmb();



	wake_up_interruptible(&ctx->wc);

}



/**

 * \brief Poll routine for checking transmit queue status

 * @param work work_struct data structure
@@ -3576,7 +3543,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
					    OPCODE_NIC_IF_CFG, 0,

					    if_cfg.u64, 0);



		sc->callback = if_cfg_callback;

		sc->callback = lio_if_cfg_callback;

		sc->callback_arg = sc;

		sc->wait_time = 3000;

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+1 −33
Original line number Diff line number Diff line
@@ -1058,38 +1058,6 @@ static void free_netsgbuf_with_resp(void *buf) 
	/* Don't free the skb yet */

}



/**

 * \brief Callback for getting interface configuration

 * @param status status of request

 * @param buf pointer to resp structure

 */

static void if_cfg_callback(struct octeon_device *oct,

			    u32 status __attribute__((unused)), void *buf)

{

	struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;

	struct liquidio_if_cfg_context *ctx;

	struct liquidio_if_cfg_resp *resp;



	resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;

	ctx = (struct liquidio_if_cfg_context *)sc->ctxptr;



	oct = lio_get_device(ctx->octeon_id);

	if (resp->status)

		dev_err(&oct->pci_dev->dev, "nic if cfg instruction failed. Status: %llx\n",

			CVM_CAST64(resp->status));

	WRITE_ONCE(ctx->cond, 1);



	snprintf(oct->fw_info.liquidio_firmware_version, 32, "%s",

		 resp->cfg_info.liquidio_firmware_version);



	/* This barrier is required to be sure that the response has been

	 * written fully before waking up the handler

	 */

	wmb();



	wake_up_interruptible(&ctx->wc);

}



/**

 * \brief Net device open for LiquidIO

 * @param netdev network device
@@ -2171,7 +2139,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
					    OPCODE_NIC_IF_CFG, 0, if_cfg.u64,

					    0);



		sc->callback = if_cfg_callback;

		sc->callback = lio_if_cfg_callback;

		sc->callback_arg = sc;

		sc->wait_time = 5000;

drivers/net/ethernet/cavium/liquidio/octeon_network.h

+4 −0
Original line number Diff line number Diff line
@@ -199,6 +199,10 @@ int lio_wait_for_clean_oq(struct octeon_device *oct); 
 */

void liquidio_set_ethtool_ops(struct net_device *netdev);



void lio_if_cfg_callback(struct octeon_device *oct,

			 u32 status __attribute__((unused)),

			 void *buf);



/**

 * \brief Net device change_mtu

 * @param netdev network device