* [PATCH net-next 0/2] net: fix some bugs in HNS drivers
@ 2015-10-08 6:17 huangdaode
2015-10-08 6:17 ` [PATCH net-next 1/2] net: Fix Hisilicon Network Subsystem compilation warning huangdaode
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: huangdaode @ 2015-10-08 6:17 UTC (permalink / raw)
To: davem
Cc: liguozhu, Yisen.Zhuang, netdev, linuxarm, salil.mehta,
huangdaode, kenneth-lee-2012, xuwei5, lisheng011, linux-kernel
This patchset fixes the two bugs in HNS driver, one is for fixing the
compilation warning bug on arm 32-bit platform, another is fixing the wrong
mac port judgement bug which is found during internal tests.
huangdaode (2):
net: Fix Hisilicon Network Subsystem compilation warning
net: fix a bug on Hisilicon Network Subsystem
drivers/net/ethernet/hisilicon/hns/hnae.c | 12 ++++++------
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next 1/2] net: Fix Hisilicon Network Subsystem compilation warning
2015-10-08 6:17 [PATCH net-next 0/2] net: fix some bugs in HNS drivers huangdaode
@ 2015-10-08 6:17 ` huangdaode
2015-10-08 6:17 ` [PATCH net-next 2/2] net: fix a bug on Hisilicon Network Subsystem huangdaode
2015-10-11 12:02 ` [PATCH net-next 0/2] net: fix some bugs in HNS drivers David Miller
2 siblings, 0 replies; 5+ messages in thread
From: huangdaode @ 2015-10-08 6:17 UTC (permalink / raw)
To: davem
Cc: liguozhu, Yisen.Zhuang, netdev, linuxarm, salil.mehta,
huangdaode, kenneth-lee-2012, xuwei5, lisheng011, linux-kernel
This patch fix a compilation warning on arm 32-bit platform
Signed-off-by: huangdaode <huangdaode@hisilicon.com>
Signed-off-by: yankejian <yankejian@huawei.com>
---
drivers/net/ethernet/hisilicon/hns/hnae.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c b/drivers/net/ethernet/hisilicon/hns/hnae.c
index 0a0a9e8..ccbb666 100644
--- a/drivers/net/ethernet/hisilicon/hns/hnae.c
+++ b/drivers/net/ethernet/hisilicon/hns/hnae.c
@@ -448,12 +448,12 @@ static ssize_t handles_show(struct device *dev,
s += sprintf(buf + s, "handle %d (eport_id=%u from %s):\n",
i++, h->eport_id, h->dev->name);
for (j = 0; j < h->q_num; j++) {
- s += sprintf(buf + s, "\tqueue[%d] on 0x%llx\n",
- j, (u64)h->qs[i]->io_base);
-#define HANDEL_TX_MSG "\t\ttx_ring on 0x%llx:%u,%u,%u,%u,%u,%llu,%llu\n"
+ s += sprintf(buf + s, "\tqueue[%d] on 0x%p\n",
+ j, h->qs[i]->io_base);
+#define HANDEL_TX_MSG "\t\ttx_ring on 0x%p:%u,%u,%u,%u,%u,%llu,%llu\n"
s += sprintf(buf + s,
HANDEL_TX_MSG,
- (u64)h->qs[i]->tx_ring.io_base,
+ h->qs[i]->tx_ring.io_base,
h->qs[i]->tx_ring.buf_size,
h->qs[i]->tx_ring.desc_num,
h->qs[i]->tx_ring.max_desc_num_per_pkt,
@@ -462,8 +462,8 @@ static ssize_t handles_show(struct device *dev,
h->qs[i]->tx_ring.stats.sw_err_cnt,
h->qs[i]->tx_ring.stats.io_err_cnt);
s += sprintf(buf + s,
- "\t\trx_ring on 0x%llx:%u,%u,%llu,%llu,%llu\n",
- (u64)h->qs[i]->rx_ring.io_base,
+ "\t\trx_ring on 0x%p:%u,%u,%llu,%llu,%llu\n",
+ h->qs[i]->rx_ring.io_base,
h->qs[i]->rx_ring.buf_size,
h->qs[i]->rx_ring.desc_num,
h->qs[i]->rx_ring.stats.sw_err_cnt,
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 2/2] net: fix a bug on Hisilicon Network Subsystem
2015-10-08 6:17 [PATCH net-next 0/2] net: fix some bugs in HNS drivers huangdaode
2015-10-08 6:17 ` [PATCH net-next 1/2] net: Fix Hisilicon Network Subsystem compilation warning huangdaode
@ 2015-10-08 6:17 ` huangdaode
2015-10-11 12:02 ` [PATCH net-next 0/2] net: fix some bugs in HNS drivers David Miller
2 siblings, 0 replies; 5+ messages in thread
From: huangdaode @ 2015-10-08 6:17 UTC (permalink / raw)
To: davem
Cc: liguozhu, Yisen.Zhuang, netdev, linuxarm, salil.mehta,
huangdaode, kenneth-lee-2012, xuwei5, lisheng011, linux-kernel
This patch fixes a bug in hns driver during internal testing of the
driver.
Signed-off-by: huangdaode <huangdaode@hisilicon.com>
Signed-off-by: yankejian <yankejian@huawei.com>
---
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
index 95bf42a..e162e4a 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
@@ -179,7 +179,7 @@ static int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb,
return -EINVAL;
}
} else if (mac_cb->dsaf_dev->dsaf_mode < DSAF_MODE_MAX) {
- if (mac_cb->mac_id <= DSAF_MAX_PORT_NUM_PER_CHIP) {
+ if (mac_cb->mac_id >= DSAF_MAX_PORT_NUM_PER_CHIP) {
dev_err(mac_cb->dev,
"input invalid,%s mac%d vmid%d!\n",
mac_cb->dsaf_dev->ae_dev.name,
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/2] net: fix some bugs in HNS drivers
2015-10-08 6:17 [PATCH net-next 0/2] net: fix some bugs in HNS drivers huangdaode
2015-10-08 6:17 ` [PATCH net-next 1/2] net: Fix Hisilicon Network Subsystem compilation warning huangdaode
2015-10-08 6:17 ` [PATCH net-next 2/2] net: fix a bug on Hisilicon Network Subsystem huangdaode
@ 2015-10-11 12:02 ` David Miller
2015-10-12 2:34 ` huangdaode
2 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2015-10-11 12:02 UTC (permalink / raw)
To: huangdaode
Cc: liguozhu, Yisen.Zhuang, netdev, linuxarm, salil.mehta,
kenneth-lee-2012, xuwei5, lisheng011, linux-kernel
From: huangdaode <huangdaode@hisilicon.com>
Date: Thu, 8 Oct 2015 14:17:23 +0800
> This patchset fixes the two bugs in HNS driver, one is for fixing the
> compilation warning bug on arm 32-bit platform, another is fixing the wrong
> mac port judgement bug which is found during internal tests.
This patch series does not apply to the net-next tree at all.
Also, both patches should use a subsystem prefix of "hisilicon: "
in the Subject lines.
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/2] net: fix some bugs in HNS drivers
2015-10-11 12:02 ` [PATCH net-next 0/2] net: fix some bugs in HNS drivers David Miller
@ 2015-10-12 2:34 ` huangdaode
0 siblings, 0 replies; 5+ messages in thread
From: huangdaode @ 2015-10-12 2:34 UTC (permalink / raw)
To: David Miller
Cc: liguozhu, Yisen.Zhuang, netdev, linuxarm, salil.mehta,
kenneth-lee-2012, xuwei5, lisheng011, linux-kernel
On 2015/10/11 20:02, David Miller wrote:
> From: huangdaode <huangdaode@hisilicon.com>
> Date: Thu, 8 Oct 2015 14:17:23 +0800
>
>> This patchset fixes the two bugs in HNS driver, one is for fixing the
>> compilation warning bug on arm 32-bit platform, another is fixing the wrong
>> mac port judgement bug which is found during internal tests.
> This patch series does not apply to the net-next tree at all.
>
> Also, both patches should use a subsystem prefix of "hisilicon: "
> in the Subject lines.
>
> Thanks.
>
> .
>
Thanks David,
Because it conflicts with arnd's patches, which fixes this bug.
in the mail, Joe Perches advised another fix, we will send out the patch
soon.
thanks
--
Best Regards
Daode Huang
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-12 2:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-08 6:17 [PATCH net-next 0/2] net: fix some bugs in HNS drivers huangdaode
2015-10-08 6:17 ` [PATCH net-next 1/2] net: Fix Hisilicon Network Subsystem compilation warning huangdaode
2015-10-08 6:17 ` [PATCH net-next 2/2] net: fix a bug on Hisilicon Network Subsystem huangdaode
2015-10-11 12:02 ` [PATCH net-next 0/2] net: fix some bugs in HNS drivers David Miller
2015-10-12 2:34 ` huangdaode
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.