From patchwork Wed Mar 10 03:26:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dean Nelson X-Patchwork-Id: 47206 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 C3967B7D30 for ; Wed, 10 Mar 2010 14:26:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756200Ab0CJD0o (ORCPT ); Tue, 9 Mar 2010 22:26:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53538 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756137Ab0CJD0m (ORCPT ); Tue, 9 Mar 2010 22:26:42 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2A3Qgqx012206 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 9 Mar 2010 22:26:42 -0500 Received: from [127.0.0.1] (vpn-250-65.phx2.redhat.com [10.3.250.65]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2A3QePl012172; Tue, 9 Mar 2010 22:26:41 -0500 Date: Tue, 9 Mar 2010 22:26:40 -0500 From: Dean Nelson To: jbarnes@virtuousgeek.org Cc: netdev@vger.kernel.org, linux-pci@vger.kernel.org Message-Id: <20100310032640.6331.39506.send-patch@aqua> In-Reply-To: <20100310032632.6331.15414.send-patch@aqua> References: <20100310032632.6331.15414.send-patch@aqua> Subject: [PATCH 1/3] pci: fix return value from pcix_get_max_mmrbc() X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For the PCI_X_STATUS register, pcix_get_max_mmrbc() is returning an incorrect value, which is based on: (stat & PCI_X_STATUS_MAX_READ) >> 12 Valid return values are 512, 1024, 2048, 4096, which correspond to a 'stat' (masked and right shifted by 21) of 0, 1, 2, 3, respectively. A right shift by 11 would generate the correct return value when 'stat' (masked and right shifted by 21) has a value of 1 or 2. But for a value of 0 or 3 it's not possible to generate the correct return value by only right shifting. Fix is based on pcix_get_mmrbc()'s similar dealings with the PCI_X_CMD register. Signed-off-by: Dean Nelson --- drivers/pci/pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 5b548ae..1decd4f 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2571,7 +2571,7 @@ int pcix_get_max_mmrbc(struct pci_dev *dev) if (err) return -EINVAL; - return (stat & PCI_X_STATUS_MAX_READ) >> 12; + return 512 << ((stat & PCI_X_STATUS_MAX_READ) >> 21); } EXPORT_SYMBOL(pcix_get_max_mmrbc);