* [PATCH net-next] net: hns: bug fix about hisilicon TSO BD mode
@ 2016-01-18 9:24 Daode Huang
2016-01-18 9:36 ` Andy Shevchenko
2016-01-18 16:55 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Daode Huang @ 2016-01-18 9:24 UTC (permalink / raw)
To: davem
Cc: huangdaode, yisen.zhuang, yankejian, liguozhu, salil.mehta,
geliangtang, lipeng321, andriy.shevchenko, netdev, linux-kernel,
Kenneth-Lee-2012
The current upstreaming code fails to set the tso_mode register
when initilizes, when processes large size packets, the default 4 bd is
not enough, so this patch initilizes it and set the default value to 8 bds
Signed-off-by: Daode Huang <huangdaode@hisilicon.com>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 13 +++++++++++--
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 3 +++
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 5 +++++
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
index d2263c7..1218880 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
@@ -369,8 +369,17 @@ int hns_rcb_common_init_hw(struct rcb_common_cb *rcb_common)
dsaf_write_dev(rcb_common, RCB_COM_CFG_ENDIAN_REG,
HNS_RCB_COMMON_ENDIAN);
- dsaf_write_dev(rcb_common, RCB_COM_CFG_FNA_REG, 0x0);
- dsaf_write_dev(rcb_common, RCB_COM_CFG_FA_REG, 0x1);
+ if (AE_IS_VER1(rcb_common->dsaf_dev->dsaf_ver)) {
+ dsaf_write_dev(rcb_common, RCB_COM_CFG_FNA_REG, 0x0);
+ dsaf_write_dev(rcb_common, RCB_COM_CFG_FA_REG, 0x1);
+ } else {
+ dsaf_set_dev_bit(rcb_common, RCBV2_COM_CFG_USER_REG,
+ RCB_COM_CFG_FNA_B, false);
+ dsaf_set_dev_bit(rcb_common, RCBV2_COM_CFG_USER_REG,
+ RCB_COM_CFG_FA_B, true);
+ dsaf_set_dev_bit(rcb_common, RCBV2_COM_CFG_TSO_MODE_REG,
+ RCB_COM_TSO_MODE_B, HNS_TSO_MODE_8BD_32K);
+ }
return 0;
}
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
index 29041b1..81fe9f8 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
@@ -54,6 +54,9 @@ struct rcb_common_cb;
#define HNS_DUMP_REG_NUM 500
#define HNS_STATIC_REG_NUM 12
+#define HNS_TSO_MODE_8BD_32K 1
+#define HNS_TSO_MDOE_4BD_16K 0
+
enum rcb_int_flag {
RCB_INT_FLAG_TX = 0x1,
RCB_INT_FLAG_RX = (0x1 << 1),
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
index 5d1b746..f0c4f9b 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
@@ -363,6 +363,8 @@
#define RCB_COM_CFG_FA_REG 0x3C
#define RCB_COM_CFG_PKT_TC_BP_REG 0x40
#define RCB_COM_CFG_PPE_TNL_CLKEN_REG 0x44
+#define RCBV2_COM_CFG_USER_REG 0x30
+#define RCBV2_COM_CFG_TSO_MODE_REG 0x50
#define RCB_COM_INTMSK_TX_PKT_REG 0x3A0
#define RCB_COM_RINT_TX_PKT_REG 0x3A8
@@ -860,6 +862,9 @@
#define PPE_COMMON_CNT_CLR_CE_B 0
#define PPE_COMMON_CNT_CLR_SNAP_EN_B 1
+#define RCB_COM_TSO_MODE_B 0
+#define RCB_COM_CFG_FNA_B 1
+#define RCB_COM_CFG_FA_B 0
#define GMAC_DUPLEX_TYPE_B 0
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] net: hns: bug fix about hisilicon TSO BD mode
2016-01-18 9:24 [PATCH net-next] net: hns: bug fix about hisilicon TSO BD mode Daode Huang
@ 2016-01-18 9:36 ` Andy Shevchenko
2016-01-18 9:56 ` huangdaode
2016-01-18 16:55 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2016-01-18 9:36 UTC (permalink / raw)
To: Daode Huang, davem
Cc: yisen.zhuang, yankejian, liguozhu, salil.mehta, geliangtang,
lipeng321, netdev, linux-kernel, Kenneth-Lee-2012
On Mon, 2016-01-18 at 17:24 +0800, Daode Huang wrote:
> The current upstreaming code fails to set the tso_mode register
> when initilizes, when processes large size packets, the default 4 bd
> is
> not enough, so this patch initilizes it and set the default value to
> 8 bds
Please, next time try to thin out the Cc list. I have no intention to
be in it.
>
> Signed-off-by: Daode Huang <huangdaode@hisilicon.com>
> ---
> drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 13 +++++++++++--
> drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 3 +++
> drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 5 +++++
> 3 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
> b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
> index d2263c7..1218880 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
> @@ -369,8 +369,17 @@ int hns_rcb_common_init_hw(struct rcb_common_cb
> *rcb_common)
> dsaf_write_dev(rcb_common, RCB_COM_CFG_ENDIAN_REG,
> HNS_RCB_COMMON_ENDIAN);
>
> - dsaf_write_dev(rcb_common, RCB_COM_CFG_FNA_REG, 0x0);
> - dsaf_write_dev(rcb_common, RCB_COM_CFG_FA_REG, 0x1);
> + if (AE_IS_VER1(rcb_common->dsaf_dev->dsaf_ver)) {
> + dsaf_write_dev(rcb_common, RCB_COM_CFG_FNA_REG,
> 0x0);
> + dsaf_write_dev(rcb_common, RCB_COM_CFG_FA_REG, 0x1);
> + } else {
> + dsaf_set_dev_bit(rcb_common, RCBV2_COM_CFG_USER_REG,
> + RCB_COM_CFG_FNA_B, false);
> + dsaf_set_dev_bit(rcb_common, RCBV2_COM_CFG_USER_REG,
> + RCB_COM_CFG_FA_B, true);
> + dsaf_set_dev_bit(rcb_common,
> RCBV2_COM_CFG_TSO_MODE_REG,
> + RCB_COM_TSO_MODE_B,
> HNS_TSO_MODE_8BD_32K);
> + }
>
> return 0;
> }
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
> b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
> index 29041b1..81fe9f8 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
> @@ -54,6 +54,9 @@ struct rcb_common_cb;
> #define HNS_DUMP_REG_NUM 500
> #define HNS_STATIC_REG_NUM 12
>
> +#define HNS_TSO_MODE_8BD_32K 1
> +#define HNS_TSO_MDOE_4BD_16K 0
Typo: MDOE
> +
> enum rcb_int_flag {
> RCB_INT_FLAG_TX = 0x1,
> RCB_INT_FLAG_RX = (0x1 << 1),
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
> b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
> index 5d1b746..f0c4f9b 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
> @@ -363,6 +363,8 @@
> #define RCB_COM_CFG_FA_REG 0x3C
> #define RCB_COM_CFG_PKT_TC_BP_REG 0x40
> #define RCB_COM_CFG_PPE_TNL_CLKEN_REG 0x44
> +#define RCBV2_COM_CFG_USER_REG 0x30
> +#define RCBV2_COM_CFG_TSO_MODE_REG 0x50
>
> #define RCB_COM_INTMSK_TX_PKT_REG 0x3A0
> #define RCB_COM_RINT_TX_PKT_REG 0x3A8
> @@ -860,6 +862,9 @@
>
> #define PPE_COMMON_CNT_CLR_CE_B 0
> #define PPE_COMMON_CNT_CLR_SNAP_EN_B 1
> +#define RCB_COM_TSO_MODE_B 0
> +#define RCB_COM_CFG_FNA_B 1
> +#define RCB_COM_CFG_FA_B 0
>
> #define GMAC_DUPLEX_TYPE_B 0
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] net: hns: bug fix about hisilicon TSO BD mode
2016-01-18 9:36 ` Andy Shevchenko
@ 2016-01-18 9:56 ` huangdaode
0 siblings, 0 replies; 5+ messages in thread
From: huangdaode @ 2016-01-18 9:56 UTC (permalink / raw)
To: Andy Shevchenko, davem
Cc: yisen.zhuang, yankejian, liguozhu, salil.mehta, geliangtang,
lipeng321, netdev, linux-kernel, Kenneth-Lee-2012
On 2016/1/18 17:36, Andy Shevchenko wrote:
> On Mon, 2016-01-18 at 17:24 +0800, Daode Huang wrote:
>> The current upstreaming code fails to set the tso_mode register
>> when initilizes, when processes large size packets, the default 4 bd
>> is
>> not enough, so this patch initilizes it and set the default value to
>> 8 bds
> Please, next time try to thin out the Cc list. I have no intention to
> be in it.
OK, sorry for interrupt!
thanks.
>> Signed-off-by: Daode Huang <huangdaode@hisilicon.com>
>> ---
>> drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 13 +++++++++++--
>> drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 3 +++
>> drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 5 +++++
>> 3 files changed, 19 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
>> b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
>> index d2263c7..1218880 100644
>> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
>> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
>> @@ -369,8 +369,17 @@ int hns_rcb_common_init_hw(struct rcb_common_cb
>> *rcb_common)
>> dsaf_write_dev(rcb_common, RCB_COM_CFG_ENDIAN_REG,
>> HNS_RCB_COMMON_ENDIAN);
>>
>> - dsaf_write_dev(rcb_common, RCB_COM_CFG_FNA_REG, 0x0);
>> - dsaf_write_dev(rcb_common, RCB_COM_CFG_FA_REG, 0x1);
>> + if (AE_IS_VER1(rcb_common->dsaf_dev->dsaf_ver)) {
>> + dsaf_write_dev(rcb_common, RCB_COM_CFG_FNA_REG,
>> 0x0);
>> + dsaf_write_dev(rcb_common, RCB_COM_CFG_FA_REG, 0x1);
>> + } else {
>> + dsaf_set_dev_bit(rcb_common, RCBV2_COM_CFG_USER_REG,
>> + RCB_COM_CFG_FNA_B, false);
>> + dsaf_set_dev_bit(rcb_common, RCBV2_COM_CFG_USER_REG,
>> + RCB_COM_CFG_FA_B, true);
>> + dsaf_set_dev_bit(rcb_common,
>> RCBV2_COM_CFG_TSO_MODE_REG,
>> + RCB_COM_TSO_MODE_B,
>> HNS_TSO_MODE_8BD_32K);
>> + }
>>
>> return 0;
>> }
>> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
>> b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
>> index 29041b1..81fe9f8 100644
>> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
>> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
>> @@ -54,6 +54,9 @@ struct rcb_common_cb;
>> #define HNS_DUMP_REG_NUM 500
>> #define HNS_STATIC_REG_NUM 12
>>
>> +#define HNS_TSO_MODE_8BD_32K 1
>> +#define HNS_TSO_MDOE_4BD_16K 0
> Typo: MDOE
>
>> +
>> enum rcb_int_flag {
>> RCB_INT_FLAG_TX = 0x1,
>> RCB_INT_FLAG_RX = (0x1 << 1),
>> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
>> b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
>> index 5d1b746..f0c4f9b 100644
>> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
>> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
>> @@ -363,6 +363,8 @@
>> #define RCB_COM_CFG_FA_REG 0x3C
>> #define RCB_COM_CFG_PKT_TC_BP_REG 0x40
>> #define RCB_COM_CFG_PPE_TNL_CLKEN_REG 0x44
>> +#define RCBV2_COM_CFG_USER_REG 0x30
>> +#define RCBV2_COM_CFG_TSO_MODE_REG 0x50
>>
>> #define RCB_COM_INTMSK_TX_PKT_REG 0x3A0
>> #define RCB_COM_RINT_TX_PKT_REG 0x3A8
>> @@ -860,6 +862,9 @@
>>
>> #define PPE_COMMON_CNT_CLR_CE_B 0
>> #define PPE_COMMON_CNT_CLR_SNAP_EN_B 1
>> +#define RCB_COM_TSO_MODE_B 0
>> +#define RCB_COM_CFG_FNA_B 1
>> +#define RCB_COM_CFG_FA_B 0
>>
>> #define GMAC_DUPLEX_TYPE_B 0
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] net: hns: bug fix about hisilicon TSO BD mode
2016-01-18 9:24 [PATCH net-next] net: hns: bug fix about hisilicon TSO BD mode Daode Huang
2016-01-18 9:36 ` Andy Shevchenko
@ 2016-01-18 16:55 ` David Miller
2016-01-19 1:51 ` huangdaode
1 sibling, 1 reply; 5+ messages in thread
From: David Miller @ 2016-01-18 16:55 UTC (permalink / raw)
To: huangdaode
Cc: yisen.zhuang, yankejian, liguozhu, salil.mehta, geliangtang,
lipeng321, andriy.shevchenko, netdev, linux-kernel,
Kenneth-Lee-2012
From: Daode Huang <huangdaode@hisilicon.com>
Date: Mon, 18 Jan 2016 17:24:16 +0800
> The current upstreaming code fails to set the tso_mode register
> when initilizes, when processes large size packets, the default 4 bd is
> not enough, so this patch initilizes it and set the default value to 8 bds
>
> Signed-off-by: Daode Huang <huangdaode@hisilicon.com>
Your insistance of continually using "net-next" in your subject lines
shows you have no idea what GIT trees are active and in what trees
development and bug fixing is actually occurring in.
The 'net' tree is the only tree active now and your driver has been in
there for over a week.
And this is the place where all appropriate bug fixes go.
Therefore if your code is present in the 'net' tree and you are fixing
things in that codebase, then that is the tree you target.
I've been silently applying your patches there instead of net-next,
but I'm not going to do it any more and I will just reject patches not
submitted properly from this point forward.
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] net: hns: bug fix about hisilicon TSO BD mode
2016-01-18 16:55 ` David Miller
@ 2016-01-19 1:51 ` huangdaode
0 siblings, 0 replies; 5+ messages in thread
From: huangdaode @ 2016-01-19 1:51 UTC (permalink / raw)
To: David Miller
Cc: yisen.zhuang, yankejian, liguozhu, salil.mehta, geliangtang,
lipeng321, andriy.shevchenko, netdev, linux-kernel,
Kenneth-Lee-2012
On 2016/1/19 0:55, David Miller wrote:
> From: Daode Huang <huangdaode@hisilicon.com>
> Date: Mon, 18 Jan 2016 17:24:16 +0800
>
>> The current upstreaming code fails to set the tso_mode register
>> when initilizes, when processes large size packets, the default 4 bd is
>> not enough, so this patch initilizes it and set the default value to 8 bds
>>
>> Signed-off-by: Daode Huang <huangdaode@hisilicon.com>
> Your insistance of continually using "net-next" in your subject lines
> shows you have no idea what GIT trees are active and in what trees
> development and bug fixing is actually occurring in.
>
> The 'net' tree is the only tree active now and your driver has been in
> there for over a week.
>
> And this is the place where all appropriate bug fixes go.
>
> Therefore if your code is present in the 'net' tree and you are fixing
> things in that codebase, then that is the tree you target.
>
> I've been silently applying your patches there instead of net-next,
> but I'm not going to do it any more and I will just reject patches not
> submitted properly from this point forward.
>
> Thanks.
>
> .
Hi David,
Thanks for your comments, will pay more attention to it.
Best Regards
Daode.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-01-19 1:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-18 9:24 [PATCH net-next] net: hns: bug fix about hisilicon TSO BD mode Daode Huang
2016-01-18 9:36 ` Andy Shevchenko
2016-01-18 9:56 ` huangdaode
2016-01-18 16:55 ` David Miller
2016-01-19 1:51 ` huangdaode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).