diff options
| author | Michael Chan | 2016-09-05 07:57:35 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-09-06 22:59:17 +0200 |
| commit | 9d13744bb75078175ab49408f2abb980e4dbccc9 (patch) | |
| tree | 24755e1b449f6e5091229dfc2ce30ef49f652fe5 /drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| parent | net: Don't delete routes in different VRFs (diff) | |
| download | kernel-qcow2-linux-9d13744bb75078175ab49408f2abb980e4dbccc9.tar.gz kernel-qcow2-linux-9d13744bb75078175ab49408f2abb980e4dbccc9.tar.xz kernel-qcow2-linux-9d13744bb75078175ab49408f2abb980e4dbccc9.zip | |
bnxt_en: Fix TX push operation on ARM64.
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 <jiandong.zheng@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 2cf79100c9cb..228c964e709a 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); |