mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
5b173cf927
1) Fixed following sparse warnings:
lio_main.c:213:6: warning: symbol 'octeon_droq_bh' was not
declared. Should it be static?
lio_main.c:233:5: warning: symbol 'lio_wait_for_oq_pkts' was
not declared. Should it be static?
lio_main.c:3083:5: warning: symbol 'lio_nic_info' was not
declared. Should it be static?
lio_main.c:2618:16: warning: cast from restricted __be16
octeon_device.c:466:6: warning: symbol 'oct_set_config_info'
was not declared. Should it be static?
octeon_device.c:573:25: warning: cast to restricted __be32
octeon_device.c:582:29: warning: cast to restricted __be32
octeon_device.c:584:39: warning: cast to restricted __be32
octeon_device.c:594:13: warning: cast to restricted __be32
octeon_device.c:596:25: warning: cast to restricted __be32
octeon_device.c:613:25: warning: cast to restricted __be32
octeon_device.c:614:29: warning: cast to restricted __be64
octeon_device.c:615:29: warning: cast to restricted __be32
octeon_device.c:619:37: warning: cast to restricted __be32
octeon_device.c:623:33: warning: cast to restricted __be32
cn66xx_device.c:540:6: warning: symbol
'lio_cn6xxx_get_pcie_qlmport' was not declared. Should it be s
octeon_mem_ops.c:181:16: warning: cast to restricted __be64
octeon_mem_ops.c:190:16: warning: cast to restricted __be32
octeon_mem_ops.c:196:17: warning: incorrect type in initializer
2) Fix build errors corresponding to vmalloc on linux-next 4.1.
3) Liquidio now supports 64 bit only, modified Kconfig accordingly.
4) Fix some code alignment issues based on kernel build warnings.
Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
58 lines
1.9 KiB
C
58 lines
1.9 KiB
C
/**********************************************************************
|
|
* Author: Cavium, Inc.
|
|
*
|
|
* Contact: support@cavium.com
|
|
* Please include "LiquidIO" in the subject.
|
|
*
|
|
* Copyright (c) 2003-2015 Cavium, Inc.
|
|
*
|
|
* This file 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.
|
|
*
|
|
* This file is distributed in the hope that it will be useful, but
|
|
* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or
|
|
* NONINFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* This file may also be available under a different license from Cavium.
|
|
* Contact Cavium, Inc. for more information
|
|
**********************************************************************/
|
|
#ifndef _LIQUIDIO_IMAGE_H_
|
|
#define _LIQUIDIO_IMAGE_H_
|
|
|
|
#define LIO_MAX_FW_TYPE_LEN (8)
|
|
#define LIO_MAX_FW_FILENAME_LEN (256)
|
|
#define LIO_FW_DIR "liquidio/"
|
|
#define LIO_FW_BASE_NAME "lio_"
|
|
#define LIO_FW_NAME_SUFFIX ".bin"
|
|
#define LIO_FW_NAME_TYPE_NIC "nic"
|
|
#define LIO_FW_NAME_TYPE_NONE "none"
|
|
#define LIO_MAX_FIRMWARE_VERSION_LEN 16
|
|
|
|
#define LIO_MAX_BOOTCMD_LEN 1024
|
|
#define LIO_MAX_IMAGES 16
|
|
#define LIO_NIC_MAGIC 0x434E4943 /* "CNIC" */
|
|
struct octeon_firmware_desc {
|
|
__be64 addr;
|
|
__be32 len;
|
|
__be32 crc32; /* crc32 of image */
|
|
};
|
|
|
|
/* Following the header is a list of 64-bit aligned binary images,
|
|
* as described by the desc field.
|
|
* Numeric fields are in network byte order.
|
|
*/
|
|
struct octeon_firmware_file_header {
|
|
__be32 magic;
|
|
char version[LIO_MAX_FIRMWARE_VERSION_LEN];
|
|
char bootcmd[LIO_MAX_BOOTCMD_LEN];
|
|
__be32 num_images;
|
|
struct octeon_firmware_desc desc[LIO_MAX_IMAGES];
|
|
__be32 pad;
|
|
__be32 crc32; /* header checksum */
|
|
};
|
|
|
|
#endif /* _LIQUIDIO_IMAGE_H_ */
|