svn commit: r293921 - stable/10/sys/dev/sfxge/common
Andrew Rybchenko
arybchik at FreeBSD.org
Thu Jan 14 14:09:43 UTC 2016
Author: arybchik
Date: Thu Jan 14 14:09:40 2016
New Revision: 293921
URL: https://svnweb.freebsd.org/changeset/base/293921
Log:
MFC r291395
sfxge: cleanup: fix prefast annotations for stats buffers
Submitted by: Andy Moreton <amoreton at solarflare.com>
Sponsored by: Solarflare Communications, Inc.
Modified:
stable/10/sys/dev/sfxge/common/efx.h
stable/10/sys/dev/sfxge/common/efx_mon.c
stable/10/sys/dev/sfxge/common/efx_phy.c
stable/10/sys/dev/sfxge/common/hunt_impl.h
stable/10/sys/dev/sfxge/common/hunt_mac.c
stable/10/sys/dev/sfxge/common/hunt_phy.c
stable/10/sys/dev/sfxge/common/mcdi_mon.c
stable/10/sys/dev/sfxge/common/mcdi_mon.h
stable/10/sys/dev/sfxge/common/siena_impl.h
stable/10/sys/dev/sfxge/common/siena_mac.c
stable/10/sys/dev/sfxge/common/siena_phy.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/sfxge/common/efx.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx.h Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/efx.h Thu Jan 14 14:09:40 2016 (r293921)
@@ -688,7 +688,7 @@ extern __checkReturn int
efx_mon_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_MON_NSTATS) efx_mon_stat_value_t *values);
+ __inout_ecount(EFX_MON_NSTATS) efx_mon_stat_value_t *values);
#endif /* EFSYS_OPT_MON_STATS */
@@ -946,7 +946,7 @@ extern __checkReturn int
efx_phy_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_PHY_NSTATS) uint32_t *stat);
+ __inout_ecount(EFX_PHY_NSTATS) uint32_t *stat);
#endif /* EFSYS_OPT_PHY_STATS */
Modified: stable/10/sys/dev/sfxge/common/efx_mon.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_mon.c Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/efx_mon.c Thu Jan 14 14:09:40 2016 (r293921)
@@ -307,7 +307,7 @@ efx_mon_stat_name(
efx_mon_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_MON_NSTATS) efx_mon_stat_value_t *values)
+ __inout_ecount(EFX_MON_NSTATS) efx_mon_stat_value_t *values)
{
efx_mon_t *emp = &(enp->en_mon);
efx_mon_ops_t *emop = emp->em_emop;
Modified: stable/10/sys/dev/sfxge/common/efx_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/efx_phy.c Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/efx_phy.c Thu Jan 14 14:09:40 2016 (r293921)
@@ -631,7 +631,7 @@ efx_phy_stat_name(
efx_phy_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_PHY_NSTATS) uint32_t *stat)
+ __inout_ecount(EFX_PHY_NSTATS) uint32_t *stat)
{
efx_port_t *epp = &(enp->en_port);
efx_phy_ops_t *epop = epp->ep_epop;
Modified: stable/10/sys/dev/sfxge/common/hunt_impl.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_impl.h Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/hunt_impl.h Thu Jan 14 14:09:40 2016 (r293921)
@@ -236,7 +236,7 @@ extern __checkReturn int
hunt_mac_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_MAC_NSTATS) efsys_stat_t *stat,
+ __inout_ecount(EFX_MAC_NSTATS) efsys_stat_t *stat,
__out_opt uint32_t *generationp);
#endif /* EFSYS_OPT_MAC_STATS */
@@ -485,7 +485,7 @@ extern __checkReturn int
hunt_phy_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_PHY_NSTATS) uint32_t *stat);
+ __inout_ecount(EFX_PHY_NSTATS) uint32_t *stat);
#endif /* EFSYS_OPT_PHY_STATS */
Modified: stable/10/sys/dev/sfxge/common/hunt_mac.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_mac.c Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/hunt_mac.c Thu Jan 14 14:09:40 2016 (r293921)
@@ -371,7 +371,7 @@ fail1:
hunt_mac_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_MAC_NSTATS) efsys_stat_t *stat,
+ __inout_ecount(EFX_MAC_NSTATS) efsys_stat_t *stat,
__out_opt uint32_t *generationp)
{
efx_qword_t value;
Modified: stable/10/sys/dev/sfxge/common/hunt_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/hunt_phy.c Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/hunt_phy.c Thu Jan 14 14:09:40 2016 (r293921)
@@ -495,7 +495,7 @@ hunt_phy_oui_get(
hunt_phy_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_PHY_NSTATS) uint32_t *stat)
+ __inout_ecount(EFX_PHY_NSTATS) uint32_t *stat)
{
/* TBD: no stats support in firmware yet */
_NOTE(ARGUNUSED(enp, esmp))
Modified: stable/10/sys/dev/sfxge/common/mcdi_mon.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/mcdi_mon.c Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/mcdi_mon.c Thu Jan 14 14:09:40 2016 (r293921)
@@ -162,7 +162,7 @@ mcdi_mon_decode_stats(
__in size_t sensor_mask_size,
__in_opt efsys_mem_t *esmp,
__out_ecount_opt(sensor_mask_size) uint32_t *stat_maskp,
- __out_ecount_opt(EFX_MON_NSTATS) efx_mon_stat_value_t *stat)
+ __inout_ecount_opt(EFX_MON_NSTATS) efx_mon_stat_value_t *stat)
{
efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
uint16_t port_mask;
@@ -435,7 +435,7 @@ fail1:
mcdi_mon_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_MON_NSTATS) efx_mon_stat_value_t *values)
+ __inout_ecount(EFX_MON_NSTATS) efx_mon_stat_value_t *values)
{
efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
uint32_t size = encp->enc_mon_stat_dma_buf_size;
Modified: stable/10/sys/dev/sfxge/common/mcdi_mon.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/mcdi_mon.h Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/mcdi_mon.h Thu Jan 14 14:09:40 2016 (r293921)
@@ -63,7 +63,7 @@ extern __checkReturn int
mcdi_mon_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_MON_NSTATS) efx_mon_stat_value_t *values);
+ __inout_ecount(EFX_MON_NSTATS) efx_mon_stat_value_t *values);
#endif /* EFSYS_OPT_MON_STATS */
Modified: stable/10/sys/dev/sfxge/common/siena_impl.h
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_impl.h Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/siena_impl.h Thu Jan 14 14:09:40 2016 (r293921)
@@ -472,7 +472,7 @@ extern __checkReturn int
siena_mac_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_MAC_NSTATS) efsys_stat_t *stat,
+ __inout_ecount(EFX_MAC_NSTATS) efsys_stat_t *stat,
__out_opt uint32_t *generationp);
#endif /* EFSYS_OPT_MAC_STATS */
Modified: stable/10/sys/dev/sfxge/common/siena_mac.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_mac.c Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/siena_mac.c Thu Jan 14 14:09:40 2016 (r293921)
@@ -234,7 +234,7 @@ fail1:
siena_mac_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_MAC_NSTATS) efsys_stat_t *stat,
+ __inout_ecount(EFX_MAC_NSTATS) efsys_stat_t *stat,
__out_opt uint32_t *generationp)
{
efx_qword_t value;
Modified: stable/10/sys/dev/sfxge/common/siena_phy.c
==============================================================================
--- stable/10/sys/dev/sfxge/common/siena_phy.c Thu Jan 14 14:08:57 2016 (r293920)
+++ stable/10/sys/dev/sfxge/common/siena_phy.c Thu Jan 14 14:09:40 2016 (r293921)
@@ -466,7 +466,7 @@ siena_phy_decode_stats(
__in uint32_t vmask,
__in_opt efsys_mem_t *esmp,
__out_opt uint64_t *smaskp,
- __out_ecount_opt(EFX_PHY_NSTATS) uint32_t *stat)
+ __inout_ecount_opt(EFX_PHY_NSTATS) uint32_t *stat)
{
uint64_t smask = 0;
@@ -550,7 +550,7 @@ siena_phy_decode_stats(
siena_phy_stats_update(
__in efx_nic_t *enp,
__in efsys_mem_t *esmp,
- __out_ecount(EFX_PHY_NSTATS) uint32_t *stat)
+ __inout_ecount(EFX_PHY_NSTATS) uint32_t *stat)
{
efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
uint32_t vmask = encp->enc_mcdi_phy_stat_mask;
More information about the svn-src-stable
mailing list