diff options
author | Dean Nelson <dnelson@redhat.com> | 2010-03-09 22:26:48 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 15:58:45 -0700 |
commit | d548d479f2240e1aaf3ef29606ca98ef22a2b129 (patch) | |
tree | b8b66794bcb7a74308e274ddbad3cb49925f1551 /drivers/pci/slot.c | |
parent | aa6760432ad3a02d191b61bf224bb36f952fa0c9 (diff) |
PCI: fix access of PCI_X_CMD by pcix get and set mmrbc functions
commit bdc2bda7c4dd253026cc1fce45fc939304749029 upstream.
An e1000 driver on a system with a PCI-X bus was always being returned
a value of 135 from both pcix_get_mmrbc() and pcix_set_mmrbc(). This
value reflects an error return of PCIBIOS_BAD_REGISTER_NUMBER from
pci_bus_read_config_dword(,, cap + PCI_X_CMD,).
This is because for a dword, the following portion of the PCI_OP_READ()
macro:
if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;
expands to:
if (pos & 3) return PCIBIOS_BAD_REGISTER_NUMBER;
And is always true for 'cap + PCI_X_CMD', which is 0xe4 + 2 = 0xe6. ('cap' is
the result of calling pci_find_capability(, PCI_CAP_ID_PCIX).)
The same problem exists for pci_bus_write_config_dword(,, cap + PCI_X_CMD,).
In both cases, instead of calling _dword(), _word() should be called.
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/pci/slot.c')
0 files changed, 0 insertions, 0 deletions