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

Commit 83101ce3 authored by Raghu Vatsavayi's avatar Raghu Vatsavayi Committed by David S. Miller
Browse files

liquidio: Firmware version management 



This patch contains changes for firmware version management.

Signed-off-by: default avatarDerek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: default avatarRaghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32581245

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

+10 −2
Original line number Diff line number Diff line
@@ -3230,8 +3230,9 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
	union oct_nic_if_cfg if_cfg;

	unsigned int base_queue;

	unsigned int gmx_port_id;

	u32 resp_size, ctx_size;

	u32 resp_size, ctx_size, data_size;

	u32 ifidx_or_pfnum;

	struct lio_version *vdata;



	/* This is to handle link status changes */

	octeon_register_dispatch_fn(octeon_dev, OPCODE_NIC,
@@ -3253,11 +3254,18 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
	for (i = 0; i < octeon_dev->ifcount; i++) {

		resp_size = sizeof(struct liquidio_if_cfg_resp);

		ctx_size = sizeof(struct liquidio_if_cfg_context);

		data_size = sizeof(struct lio_version);

		sc = (struct octeon_soft_command *)

			octeon_alloc_soft_command(octeon_dev, 0,

			octeon_alloc_soft_command(octeon_dev, data_size,

						  resp_size, ctx_size);

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

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

		vdata = (struct lio_version *)sc->virtdptr;



		*((u64 *)vdata) = 0;

		vdata->major = cpu_to_be16(LIQUIDIO_BASE_MAJOR_VERSION);

		vdata->minor = cpu_to_be16(LIQUIDIO_BASE_MINOR_VERSION);

		vdata->micro = cpu_to_be16(LIQUIDIO_BASE_MICRO_VERSION);



		num_iqueues =

			CFG_GET_NUM_TXQS_NIC_IF(octeon_get_conf(octeon_dev), i);

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

+17 −3
Original line number Diff line number Diff line
@@ -30,10 +30,24 @@ 


#include "octeon_config.h"



#define LIQUIDIO_BASE_VERSION   "1.4"

#define LIQUIDIO_MICRO_VERSION  ".1"

#define LIQUIDIO_PACKAGE ""

#define LIQUIDIO_VERSION  "1.4.1"

#define LIQUIDIO_BASE_MAJOR_VERSION 1

#define LIQUIDIO_BASE_MINOR_VERSION 4

#define LIQUIDIO_BASE_MICRO_VERSION 1

#define LIQUIDIO_BASE_VERSION   __stringify(LIQUIDIO_BASE_MAJOR_VERSION) "." \

				__stringify(LIQUIDIO_BASE_MINOR_VERSION)

#define LIQUIDIO_MICRO_VERSION  "." __stringify(LIQUIDIO_BASE_MICRO_VERSION)

#define LIQUIDIO_VERSION        LIQUIDIO_PACKAGE \

				__stringify(LIQUIDIO_BASE_MAJOR_VERSION) "." \

				__stringify(LIQUIDIO_BASE_MINOR_VERSION) \

				"." __stringify(LIQUIDIO_BASE_MICRO_VERSION)



struct lio_version {

	u16  major;

	u16  minor;

	u16  micro;

	u16  reserved;

};



#define CONTROL_IQ 0

/** Tag types used by Octeon cores in its work. */