summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDean Nelson <dnelson@redhat.com>2010-03-09 22:26:40 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-01 15:58:44 -0700
commitaa6760432ad3a02d191b61bf224bb36f952fa0c9 (patch)
tree5c4ac5f0f557323c0cb4c916a93c752fd490b3e1 /drivers
parent2a3046b3ac262a2af01b857071401200f876da65 (diff)
downloadlwn-aa6760432ad3a02d191b61bf224bb36f952fa0c9.tar.gz
lwn-aa6760432ad3a02d191b61bf224bb36f952fa0c9.zip
PCI: fix return value from pcix_get_max_mmrbc()
commit 25daeb550b69e89aff59bc6a84218a12b5203531 upstream. 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 <dnelson@redhat.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 64777220a719..f16204b293a4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2361,7 +2361,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);