New upstream version 18.05

[deb_dpdk.git] / drivers / net / sfc / base / siena_mac.c

diff --git a/drivers/net/sfc/base/siena_mac.c b/drivers/net/sfc/base/siena_mac.c
index 29bbff8..f8857cd 100644 (file)
--- a/drivers/net/sfc/base/siena_mac.c
+++ b/drivers/net/sfc/base/siena_mac.c
@@ -1,31 +1,7 @@
-/*
- * Copyright (c) 2009-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:
- *
- * 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.
+/* SPDX-License-Identifier: BSD-3-Clause
  *
- * 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) 2009-2018 Solarflare Communications Inc.
+ * All rights reserved.
  */
 
 #include "efx.h"
@@ -269,16 +245,28 @@ siena_mac_stats_update(
        __inout_ecount(EFX_MAC_NSTATS)  efsys_stat_t *stat,
        __inout_opt                     uint32_t *generationp)
 {
-       efx_qword_t value;
+       const efx_nic_cfg_t *encp = &enp->en_nic_cfg;
        efx_qword_t generation_start;
        efx_qword_t generation_end;
+       efx_qword_t value;
+       efx_rc_t rc;
 
-       _NOTE(ARGUNUSED(enp))
+       if (encp->enc_mac_stats_nstats < MC_CMD_MAC_NSTATS) {
+               /* MAC stats count too small */
+               rc = ENOSPC;
+               goto fail1;
+       }
+       if (EFSYS_MEM_SIZE(esmp) <
+           (encp->enc_mac_stats_nstats * sizeof (efx_qword_t))) {
+               /* DMA buffer too small */
+               rc = ENOSPC;
+               goto fail2;
+       }
 
        /* Read END first so we don't race with the MC */
-       EFSYS_DMA_SYNC_FOR_KERNEL(esmp, 0, EFX_MAC_STATS_SIZE);
-       SIENA_MAC_STAT_READ(esmp, MC_CMD_MAC_GENERATION_END,
-                           &generation_end);
+       EFSYS_DMA_SYNC_FOR_KERNEL(esmp, 0, EFSYS_MEM_SIZE(esmp));
+       SIENA_MAC_STAT_READ(esmp, (encp->enc_mac_stats_nstats - 1),
+           &generation_end);
        EFSYS_MEM_READ_BARRIER();
 
        /* TX */
@@ -446,7 +434,7 @@ siena_mac_stats_update(
        SIENA_MAC_STAT_READ(esmp, MC_CMD_MAC_RX_NODESC_DROPS, &value);
        EFSYS_STAT_SET_QWORD(&(stat[EFX_MAC_RX_NODESC_DROP_CNT]), &value);
 
-       EFSYS_DMA_SYNC_FOR_KERNEL(esmp, 0, EFX_MAC_STATS_SIZE);
+       EFSYS_DMA_SYNC_FOR_KERNEL(esmp, 0, EFSYS_MEM_SIZE(esmp));
        EFSYS_MEM_READ_BARRIER();
        SIENA_MAC_STAT_READ(esmp, MC_CMD_MAC_GENERATION_START,
                            &generation_start);
@@ -461,6 +449,13 @@ siena_mac_stats_update(
                *generationp = EFX_QWORD_FIELD(generation_start, EFX_DWORD_0);
 
        return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
 }
 
 #endif /* EFSYS_OPT_MAC_STATS */