New upstream version 18.02

[deb_dpdk.git] / drivers / net / sfc / base / siena_flash.h

diff --git a/drivers/net/sfc/base/siena_flash.h b/drivers/net/sfc/base/siena_flash.h
index e270055..91a9fe0 100644 (file)
--- a/drivers/net/sfc/base/siena_flash.h
+++ b/drivers/net/sfc/base/siena_flash.h
@@ -1,31 +1,7 @@
-/*
- * Copyright (c) 2007-2016 Solarflare Communications Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+/* SPDX-License-Identifier: BSD-3-Clause
  *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the FreeBSD Project.
+ * Copyright (c) 2007-2018 Solarflare Communications Inc.
+ * All rights reserved.
  */
 
 #ifndef        _SYS_SIENA_FLASH_H
@@ -113,15 +89,21 @@ typedef struct siena_mc_boot_hdr_s {               /* GENERATED BY scripts/genfwdef */
        efx_word_t      checksum;               /* of whole header area + firmware image */
        efx_word_t      firmware_version_d;
        efx_byte_t      mcfw_subtype;
-       efx_byte_t      generation;             /* Valid for medford, SBZ for earlier chips */
+       efx_byte_t      generation;             /* MC (Medford and later): MC partition generation when */
+                                               /* written to NVRAM. */
+                                               /* MUM & SUC images: subtype. */
+                                               /* (Otherwise set to 0) */
        efx_dword_t     firmware_text_offset;   /* offset to firmware .text */
        efx_dword_t     firmware_text_size;     /* length of firmware .text, in bytes */
        efx_dword_t     firmware_data_offset;   /* offset to firmware .data */
        efx_dword_t     firmware_data_size;     /* length of firmware .data, in bytes */
        efx_byte_t      spi_rate;               /* SPI rate for reading image, 0 is BootROM default */
        efx_byte_t      spi_phase_adj;          /* SPI SDO/SCL phase adjustment, 0 is default (no adj) */
-       efx_word_t      xpm_sector;             /* The sector that contains the key, or 0xffff if unsigned (medford) SBZ (earlier) */
-       efx_dword_t     reserved_c[7];          /* (set to 0) */
+       efx_word_t      xpm_sector;             /* XPM (MEDFORD and later): The sector that contains */
+                                               /* the key, or 0xffff if unsigned. (Otherwise set to 0) */
+       efx_byte_t      mumfw_subtype;          /* MUM & SUC images: subtype. (Otherwise set to 0) */
+       efx_byte_t      reserved_b[3];          /* (set to 0) */
+       efx_dword_t     reserved_c[6];          /* (set to 0) */
 } siena_mc_boot_hdr_t;
 
 #define        SIENA_MC_BOOT_HDR_PADDING \