From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yisen Zhuang Subject: Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics Date: Wed, 22 Jun 2016 09:43:49 +0800 Message-ID: <5769ED55.3000408@huawei.com> References: <1466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com> <1466481399-70080-11-git-send-email-Yisen.Zhuang@huawei.com> <1466505178.30123.201.camel@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: , , , , , , , , , , , To: Andy Shevchenko , , , Return-path: In-Reply-To: <1466505178.30123.201.camel@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org =E5=9C=A8 2016/6/21 18:32, Andy Shevchenko =E5=86=99=E9=81=93: > On Tue, 2016-06-21 at 11:56 +0800, Yisen Zhuang wrote: >> From: Daode Huang >> >> For SoC hip06, PFC pause handled in dsaf, while hip05 in XGMAC, >> so change the statistics of pfc pause in dsaf and remove the old >> pfc pause frame statistics. >> >=20 >=20 >> +static char *hns_dsaf_get_node_stats_strings(char *data, int node, >> + struct dsaf_device >> *dsaf_dev) >> { >> char *buff =3D data; >> + int i; >> + bool is_ver1 =3D AE_IS_VER1(dsaf_dev->dsaf_ver); >> =20 >> snprintf(buff, ETH_GSTRING_LEN, "innod%d_pad_drop_pkts", >> node); >> buff =3D buff + ETH_GSTRING_LEN; >> @@ -2502,6 +2530,18 @@ static char >> *hns_dsaf_get_node_stats_strings(char *data, int node) >> buff =3D buff + ETH_GSTRING_LEN; >> snprintf(buff, ETH_GSTRING_LEN, "innod%d_stp_drop_pkts", >> node); >> buff =3D buff + ETH_GSTRING_LEN; >> + if ((node < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { >=20 > Redundant parens. >=20 >> + for (i =3D 0; i < DSAF_PRIO_NR; i++) { >> + snprintf(buff, ETH_GSTRING_LEN, >> + "inod%d_pfc_prio%d_pkts", node, i); >> + buff =3D buff + ETH_GSTRING_LEN; >=20 > buff +=3D ... >=20 >> + } >> + for (i =3D 0; i < DSAF_PRIO_NR; i++) { >> + snprintf(buff, ETH_GSTRING_LEN, >> + "onod%d_pfc_prio%d_pkts", node, i); >> + buff =3D buff + ETH_GSTRING_LEN; >=20 > Ditto. >=20 >> { >> u64 *p =3D data; >> + int i; >> struct dsaf_hw_stats *hw_stats =3D &ddev->hw_stats[node_num]; >> + bool is_ver1 =3D AE_IS_VER1(ddev->dsaf_ver); >> =20 >> p[0] =3D hw_stats->pad_drop; >> p[1] =3D hw_stats->man_pkts; >> @@ -2527,8 +2569,16 @@ static u64 *hns_dsaf_get_node_stats(struct >> dsaf_device *ddev, u64 *data, >> p[10] =3D hw_stats->local_addr_false; >> p[11] =3D hw_stats->vlan_drop; >> p[12] =3D hw_stats->stp_drop; >> - p[13] =3D hw_stats->tx_pkts; >> + if ((node_num < DSAF_SERVICE_NW_NUM) && (!is_ver1)) { >> + for (i =3D 0; i < DSAF_PRIO_NR; i++) { >> + p[13 + i] =3D hw_stats->rx_pfc[i]; >> + p[13 + i + DSAF_PRIO_NR] =3D hw_stats- >>> tx_pfc[i]; >> + } >=20 > Two different approaches how to assign data. Above uses 2 for-loops, > here you put everything to one. Above cann't be merged to 1 for-loop, because lenght of the string is u= nknowable. And here we put everything to one to reduce codes. I will generate a new patch to fix other comments. Thanks, Yisen >=20 >> + p[29] =3D hw_stats->tx_pkts; >> + return &p[30]; >> + } >> =20 >> + p[13] =3D hw_stats->tx_pkts; >> return &p[14]; >> } >=20