[PATCH net] bnxt_en: Fix TX push operation on ARM64.

Subsystems: broadcom bnxt_en 50 gigabit ethernet driver, networking drivers, the rest

STALE3688d

2 messages, 2 authors, 2016-09-06 · open the first message on its own page

[PATCH net] bnxt_en: Fix TX push operation on ARM64.

From: Michael Chan <michael.chan@broadcom.com>
Date: 2016-09-05 05:57:42

There is a code path where we are calling __iowrite64_copy() on
an address that is not 64-bit aligned.  This causes an exception on
some architectures such as arm64.  Fix that code path by using
__iowrite32_copy().

Reported-by: JD Zheng <redacted>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---

Please consider this for stable as well.  Thanks.

 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 2cf7910..228c964 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -353,8 +353,8 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		push_len = (length + sizeof(*tx_push) + 7) / 8;
 		if (push_len > 16) {
 			__iowrite64_copy(txr->tx_doorbell, tx_push_buf, 16);
-			__iowrite64_copy(txr->tx_doorbell + 4, tx_push_buf + 1,
-					 push_len - 16);
+			__iowrite32_copy(txr->tx_doorbell + 4, tx_push_buf + 1,
+					 (push_len - 16) << 1);
 		} else {
 			__iowrite64_copy(txr->tx_doorbell, tx_push_buf,
 					 push_len);
-- 
1.8.3.1

Re: [PATCH net] bnxt_en: Fix TX push operation on ARM64.

From: David Miller <davem@davemloft.net>
Date: 2016-09-06 20:59:39

From: Michael Chan <michael.chan@broadcom.com>
Date: Mon,  5 Sep 2016 01:57:35 -0400
There is a code path where we are calling __iowrite64_copy() on
an address that is not 64-bit aligned.  This causes an exception on
some architectures such as arm64.  Fix that code path by using
__iowrite32_copy().

Reported-by: JD Zheng <redacted>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Applied and queued up for -stable, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help