For this series,

Acked-by: Xie XiuQi <xiexiuqi@huawei.com>

@Leizhen,

Please help to apply this two patches to kernel-4.19 & openEuler-1.0-LTS branches.

Thanks.

On 2021/3/9 19:13, zhenpengzheng@net-swift.com wrote:

> to谢工，

> 已清理所有提交文件中“huawei” “intel” “HiNIC”等字样与本次提交无关的注释。

> toLei工，

> 已删除所有提交文件末尾空行。

> 谢谢大家的意见，附件为改动后最新的patch。

> 振鹏

> ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

> ****************************************************************

> 郑振鹏(zheng zhenpeng)

> 北京网迅科技有限公司杭州分公司软件工程师

> 浙江省杭州市西湖区文三路478号华星时代广场A座507室 310013

> Beijing WangXun Technology Co., Ltd. Software Engineer.

> Room A507, HuaXing Times Square, No.478 West Wensan Road.

> West Lake District, Hangzhou City, 310013 ZHEJIANG, P.R.CHINA.

> Office: +86(0571)89807901-8014

> Mobile: +86-13656681762

> E-Mail: z <mailto:jianwang@trustnetic.com>henpengzheng@net-swift.com

> ****************************************************************

> *发件人：* Leizhen (ThunderTown) <mailto:thunder.leizhen@huawei.com>

> *发送时间：* 2021-03-09 17:59

> *收件人：* zhenpengzheng@net-swift.com <mailto:zhenpengzheng@net-swift.com>; Xie XiuQi <mailto:xiexiuqi@huawei.com>

> *抄送：* liuyuan36 <mailto:liuyuan36@huawei.com>; Cheng Jian <mailto:cj.chengjian@huawei.com>; Libin (Huawei) <mailto:huawei.libin@huawei.com>; Yang Yingliang <mailto:yangyingliang@huawei.com>; Dukaitian (Dukaitian, Intelligent Computing R&D) <mailto:dukaitian@huawei.com>; neil.yao@huawei.com <mailto:neil.yao@huawei.com>

> *主题：* Re: Fwd: 网迅万兆网卡驱动合入openeuler-4.19内核申请

> On 2021/3/9 16:38, zhenpengzheng@net-swift.com wrote:

> > 谢工，lei工

> > 您好，附件是我按照社区要求整改的patch，第一份较大的patch是不包含openeuler_config(x86)文件修改的驱动主代码，第二份patch仅含openeuler_config(x86)文件修改，arm的配置暂未修改，后续我尽快测完再发patch开启arm配置。

> >

> > 针对社区反馈的问题1，我查过patch中确实存在一处告警所说明的违规（即指向patch90行那处），其余违规处对照后未发现异常，我检查过代码本身应无段尾出现空白的情况，不知道如何进一步确认patch是否合规，请在邮件中告知，谢谢。

> drivers/net/ethernet/netswift/txgbe/txgbe_bp.h

> drivers/net/ethernet/netswift/txgbe/txgbe_ethtool.c

> drivers/net/ethernet/netswift/txgbe/txgbe_hw.c

> drivers/net/ethernet/netswift/txgbe/txgbe_lib.c

> drivers/net/ethernet/netswift/txgbe/txgbe_main.c

> drivers/net/ethernet/netswift/txgbe/txgbe_mtd.c

> drivers/net/ethernet/netswift/txgbe/txgbe_mtd.h

> 这个告警是文件末尾有空行。每个文件打开一下，shift+G到末尾check下就好了。

> >

> > 振鹏

> >

> > ****************************************************************

> >

> > 郑振鹏(zheng zhenpeng)

> >

> > 北京网迅科技有限公司杭州分公司软件工程师

> >

> > 浙江省杭州市西湖区文三路478号华星时代广场A座507室 310013

> >

> > Beijing WangXun Technology Co., Ltd. Software Engineer.

> >

> > Room A507, HuaXing Times Square, No.478 West Wensan Road.

> >

> > West Lake District, Hangzhou City, 310013 ZHEJIANG, P.R.CHINA.

> >

> > Office: +86(0571)89807901-8014

> >

> > Mobile: +86-13656681762

> >

> > E-Mail: z <mailto:jianwang@trustnetic.com>henpengzheng@net-swift.com

> >

> > ****************************************************************

> >

> > *发件人：* Xie XiuQi <mailto:xiexiuqi@huawei.com>

> > *发送时间：* 2021-03-08 16:29

> > *收件人：* zhenpengzheng@net-swift.com <mailto:zhenpengzheng@net-swift.com>; Leizhen (ThunderTown) <mailto:thunder.leizhen@huawei.com>

> > *抄送：* liuyuan36 <mailto:liuyuan36@huawei.com>; Cheng Jian <mailto:cj.chengjian@huawei.com>; Libin (Huawei) <mailto:huawei.libin@huawei.com>; Yang Yingliang <mailto:yangyingliang@huawei.com>; Dukaitian (Dukaitian, Intelligent Computing R&D) <mailto:dukaitian@huawei.com>; neil.yao@huawei.com <mailto:neil.yao@huawei.com>

> > *主题：* Re: Fwd: 网迅万兆网卡驱动合入openeuler-4.19内核申请

> > Hi，

> >

> > On 2021/3/8 11:12, zhenpengzheng@net-swift.com wrote:

> > > 适用arm64，但这份驱动我只在x86指令集的机器上测试过，我先改好，稍后安排ARM的适配测试。

> >

> > 好的，在 x86 上测试过，就先在 x86 上 enable 吧。

> > ARM64 的测试过之后，可以再 enable。

> >

> > >

> >

> > >

> > > ****************************************************************

> > >

> > > 郑振鹏(zheng zhenpeng)

> > >

> > > 北京网迅科技有限公司杭州分公司软件工程师

> > >

> > > 浙江省杭州市西湖区文三路478号华星时代广场A座507室 310013

> > >

> > > Beijing WangXun Technology Co., Ltd. Software Engineer.

> > >

> > > Room A507, HuaXing Times Square, No.478 West Wensan Road.

> > >

> > > West Lake District, Hangzhou City, 310013 ZHEJIANG, P.R.CHINA.

> > >

> > > Office: +86(0571)89807901-8014

> > >

> > > Mobile: +86-13656681762

> > >

> > > E-Mail: z <mailto:jianwang@trustnetic.com>henpengzheng@net-swift.com

> > >

> > > ****************************************************************

> > >

> > > *发件人：* Xie XiuQi <mailto:xiexiuqi@huawei.com>

> > > *发送时间：* 2021-03-08 10:30

> > > *收件人：* zhenpengzheng@net-swift.com <mailto:zhenpengzheng@net-swift.com>; Leizhen (ThunderTown) <mailto:thunder.leizhen@huawei.com>

> > > *抄送：* liuyuan36 <mailto:liuyuan36@huawei.com>; Cheng Jian <mailto:cj.chengjian@huawei.com>; Libin (Huawei) <mailto:huawei.libin@huawei.com>; Yang Yingliang <mailto:yangyingliang@huawei.com>; Dukaitian (Dukaitian, Intelligent Computing R&D) <mailto:dukaitian@huawei.com>; neil.yao@huawei.com <mailto:neil.yao@huawei.com>

> > > *主题：* Re: Fwd: 网迅万兆网卡驱动合入openeuler-4.19内核申请

> > > Hi,

> > >

> > > 网讯网卡驱动在 arm64 上也是适用的吧？

> > > 是的话，arm64 的config，也打开吧。

> > >

> > > arch/arm64/configs/openeuler_defconfig

> > >

> > > On 2021/3/8 9:42, zhenpengzheng@net-swift.com wrote:

> > > > 好的，对于问题2，我分割成两个patch再发一次，谢谢。

> > > >

> > >

> >

> > > >

> > > > ****************************************************************

> > > >

> > > > 郑振鹏(zheng zhenpeng)

> > > >

> > > > 北京网迅科技有限公司杭州分公司软件工程师

> > > >

> > > > 浙江省杭州市西湖区文三路478号华星时代广场A座507室 310013

> > > >

> > > > Beijing WangXun Technology Co., Ltd. Software Engineer.

> > > >

> > > > Room A507, HuaXing Times Square, No.478 West Wensan Road.

> > > >

> > > > West Lake District, Hangzhou City, 310013 ZHEJIANG, P.R.CHINA.

> > > >

> > > > Office: +86(0571)89807901-8014

> > > >

> > > > Mobile: +86-13656681762

> > > >

> > > > E-Mail: z <mailto:jianwang@trustnetic.com>henpengzheng@net-swift.com

> > > >

> > > > ****************************************************************

> > > >

> > > > *发件人：* Leizhen (ThunderTown) <mailto:thunder.leizhen@huawei.com>

> > > > *发送时间：* 2021-03-06 15:05

> > > > *收件人：* Xie XiuQi <mailto:xiexiuqi@huawei.com>; 郑振鹏 <mailto:zhenpengzheng@net-swift.com>

> > > > *抄送：* Liuyuan (Compatibility, Cloud Infrastructure Service Product Dept.) <mailto:liuyuan36@huawei.com>; Cheng Jian <mailto:cj.chengjian@huawei.com>; Libin (Huawei) <mailto:huawei.libin@huawei.com>; Yang Yingliang <mailto:yangyingliang@huawei.com>; Dukaitian (Dukaitian, Intelligent Computing R&D) <mailto:dukaitian@huawei.com>; neil.yao@huawei.com <mailto:neil.yao@huawei.com>

> > > > *主题：* Re: Fwd: 网迅万兆网卡驱动合入openeuler-4.19内核申请

> > > > Hi 振鹏，

> > > > 我review了一下补丁，有几个地方需要改进下：

> > > >

> > > > 1. git am补丁的时候会报几个warning，需要消除一下；

> > > > git am 0001-add-WangXun-XGIG-NIC-driver-for-EulerOS.patch

> > > > Applying: add WangXun XGIG NIC driver for EulerOS

> > > > .git/rebase-apply/patch:90: new blank line at EOF.

> > > > +

> > > > .git/rebase-apply/patch:2331: new blank line at EOF.

> > > > +

> > > > .git/rebase-apply/patch:5755: new blank line at EOF.

> > > > +

> > > > .git/rebase-apply/patch:12891: new blank line at EOF.

> > > > +

> > > > .git/rebase-apply/patch:14134: new blank line at EOF.

> > > > +

> > > > warning: squelched 3 whitespace errors

> > > > warning: 8 lines add whitespace errors.

> > > > 2. 对arch/x86/configs/openeuler_defconfig文件的修改，最好能拆分到一个独立的补丁中去。

> > > > 4. 其它#if 0、//注释掉的代码，最好能清掉。

> > > >

> > > > On 2021/3/1 16:32, Xie XiuQi wrote:

> > > > > Hi 振鹏，

> > > > >

> > > > > Thanks for your patch, we'll review this patch, and give a feedback soon.

> > > > >

> > > > > ---

> > > > > Thanks,

> > > > > Xie XiuQi

> > > > >

> > > > > -------- Forwarded Message --------

> > > > > Subject: 网迅万兆网卡驱动合入openeuler-4.19内核申请

> > > > > Date: Mon, 1 Mar 2021 15:41:09 +0800

> > > > > From: zhenpengzheng@net-swift.com <zhenpengzheng@net-swift.com>

> > > > > To: xiexiuqi <xiexiuqi@huawei.com>, liuyuan36 <liuyuan36@huawei.com>

> > > > >

> > > > > 谢工，刘工：

> > > > >

> > > > > 您好，我已准备好patch，见附件，patch已按照社区要求做checkpatch，报告的错误已消除，commit信息已更新。

> > > > >

> > > > > 振鹏

> > > > >

> > > >

> > >

> >

> > > > >

> > > > > ****************************************************************

> > > > >

> > > > > 郑振鹏(zheng zhenpeng)

> > > > >

> > > > > 北京网迅科技有限公司杭州分公司软件工程师

> > > > >

> > > > > 浙江省杭州市西湖区文三路478号华星时代广场A座507室 310013

> > > > >

> > > > > Beijing WangXun Technology Co., Ltd. Software Engineer.

> > > > >

> > > > > Room A507, HuaXing Times Square, No.478 West Wensan Road.

> > > > >

> > > > > West Lake District, Hangzhou City, 310013 ZHEJIANG, P.R.CHINA.

> > > > >

> > > > > Office: +86(0571)89807901-8014

> > > > >

> > > > > Mobile: +86-13656681762

> > > > >

> > > > > E-Mail: z <mailto:jianwang@trustnetic.com>henpengzheng@net-swift.com

> > > > >

> > > > > ****************************************************************

> > > > >

> > > >

> > >

> >