From patchwork Mon Sep 5 05:57:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 665622 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sSJtD28dMz9sDG for ; Mon, 5 Sep 2016 15:57:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.b=BQwS5/rT; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754115AbcIEF5n (ORCPT ); Mon, 5 Sep 2016 01:57:43 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34455 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752861AbcIEF5m (ORCPT ); Mon, 5 Sep 2016 01:57:42 -0400 Received: by mail-pa0-f54.google.com with SMTP id to9so20440562pac.1 for ; Sun, 04 Sep 2016 22:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=Xk+JQWn4c7QOe7d/1FJueAqKuPmkezfZvRHu/jKYvvY=; b=BQwS5/rTzf/GYJxMo2K27j7yMQcBTtegi333v6s7zIofOmc865KO8n6nS7G0xzWp/P BrJfnrsa5a0Fz+exeVjxC/TlU7sXWljB8S+F+I5y5RYrZ4RaDMbg5ARpA/5BFesh+B9a 4ZyF8PqEaf40d5FPgOvzDMaTpqzXvai//XckQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Xk+JQWn4c7QOe7d/1FJueAqKuPmkezfZvRHu/jKYvvY=; b=btn/hKnzoP6gE2HtggPhTZmhqn7GxjC3EJlvtRGxpftg0zItrI7uKwkQciRylfryLy a+FAJlEDRaJYavACowSTpwtRMu4horWgusqCll2wUhZkQaDLesCsKHGrAvPAvlas3QwD k6gn/nxBBgCb/fewURKdu3Lr1UMb+eM0V+60j/Q/lI00Iv/i2Ubm+JpGnO4tYtjaXmiZ 26aulJe6U9C40SdKD1dBHTde1f3i4IOwcoB+oX+nKaaMSuts5qoKAd/sSXclxRK/8/Tw 6rX426U9+dsxEDzaJ7E79xuUI2DwKkFXgQ4ifmiXB/+KwTJX2hzo5VbeCdHZDAsCy24s PCUQ== X-Gm-Message-State: AE9vXwNzAA6N6FQpiHSIYUh1nQcxZW/OKskvcwUlu/5Q3tE7RjGe8neUHWj7JjshXNDFK4oq X-Received: by 10.66.5.5 with SMTP id o5mr4209286pao.38.1473055061734; Sun, 04 Sep 2016 22:57:41 -0700 (PDT) Received: from localhost.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id u89sm13372291pfi.0.2016.09.04.22.57.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Sep 2016 22:57:41 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH net] bnxt_en: Fix TX push operation on ARM64. Date: Mon, 5 Sep 2016 01:57:35 -0400 Message-Id: <1473055055-28605-1-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Michael Chan --- 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);