From patchwork Sun Aug 18 13:41:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Wu X-Patchwork-Id: 268036 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 77C6C2C025E for ; Sun, 18 Aug 2013 23:41:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755425Ab3HRNlo (ORCPT ); Sun, 18 Aug 2013 09:41:44 -0400 Received: from mail-ea0-f169.google.com ([209.85.215.169]:50078 "EHLO mail-ea0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755370Ab3HRNln (ORCPT ); Sun, 18 Aug 2013 09:41:43 -0400 Received: by mail-ea0-f169.google.com with SMTP id k11so379299eaj.14 for ; Sun, 18 Aug 2013 06:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=zxIRxzlvcVm7hvmW0kV2OTYou0LILO0i07TyTG/toyc=; b=W17JKJUmiwm6DZn2y90wPnjstfzAG5CQRlD9/ldhsGScmX27I30ULLb/W9I6RGgf0w l4aCfwjA5rc/9A9x5aEERHEiYYLAAjQjxe5mtTnAORFkAe2cQrEjkDgnRu6fiSdddg9d KCfO/eBdd+3QEqE9kOapJQDttszKcew2mi+Vd3tkAnxttO7ny85vE68GeVveRKiH0DRj XDyonpdUmirqZmPKiXxdXp37m9HHNWrT3dgnLzqAmiG/u5t2Dx4WFoeyEMdS0sSZIo9J z2LWD1n6iKzmDbrKfCSzwPkEng9yJ0TF7//+WAGKBLVbOfh4g28MJpZSrGk5njYWG6I9 aJzQ== X-Received: by 10.14.200.132 with SMTP id z4mr14377721een.14.1376833302425; Sun, 18 Aug 2013 06:41:42 -0700 (PDT) Received: from localhost.localdomain (ip4da018ae.direct-adsl.nl. [77.160.24.174]) by mx.google.com with ESMTPSA id l47sm10387484eex.15.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 18 Aug 2013 06:41:41 -0700 (PDT) From: Peter Wu To: Francois Romieu , Ben Hutchings Cc: lekensteyn@gmail.com, netdev@vger.kernel.org, nic_swsd Subject: [PATCH v3] r8169: fix invalid register dump Date: Sun, 18 Aug 2013 15:41:38 +0200 Message-Id: <1376833298-7321-1-git-send-email-lekensteyn@gmail.com> X-Mailer: git-send-email 1.8.3.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For some reason, my PCIe RTL8111E onboard NIC on a GA-Z68X-UD3H-B3 motherboard reads as FFs when reading from MMIO with a block size larger than 7. Therefore change to reading blocks of four bytes. Ben Hutchings noted that the buffer is large enough to hold all registers, so now all registers are read. Since regs->len is not used anymore, drop the superfluous range check as well. (ethtool would already ensure that regs->len <= R8169_REGS_SIZE). Signed-off-by: Peter Wu --- Hi, This partly obsoletes "r8169,sis190: remove unnecessary length check"[1]. I do not have sis190 hardware, but since that is based on this r8169 driver, would it make sense to apply this patch to sis190 too? Regards, Peter [1]: http://www.spinics.net/lists/netdev/msg246824.html --- drivers/net/ethernet/realtek/r8169.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index b5eb419..c0c9e14 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1897,12 +1897,13 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) { struct rtl8169_private *tp = netdev_priv(dev); - - if (regs->len > R8169_REGS_SIZE) - regs->len = R8169_REGS_SIZE; + u32 __iomem *data = tp->mmio_addr; + u32 *dw = p; + int i; rtl_lock_work(tp); - memcpy_fromio(p, tp->mmio_addr, regs->len); + for (i = 0; i < R8169_REGS_SIZE; i += 4) + memcpy_fromio(dw++, data++, 4); rtl_unlock_work(tp); }