leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IA64] Require SAL 3.2 in order to do extended config space ops

Browse Source 
We had assumed that SAL firmware would return an error if it didn't
understand extended config space.  Unfortunately, the SAL on the SGI 750
doesn't do that, it panics the machine.  So, condition the extended PCI
config space accesses on SAL revision 3.2.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Tested-by: Brad Spengler <spender@grsecurity.net>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Matthew Wilcox 2009-10-12 08:24:30 -06:00 committed by Tony Luck
parent dec1798f81
commit adcd740341
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/ia64/pci/pci.c
View File

@ -56,10 +56,13 @@ int raw_pci_read(unsigned int seg, unsigned int bus, unsigned int devfn,
if ((seg | reg) <= 255) { if ((seg | reg) <= 255) {
addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg); addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg);
mode = 0; mode = 0;
} else { } else if (sal_revision >= SAL_VERSION_CODE(3,2)) {
addr = PCI_SAL_EXT_ADDRESS(seg, bus, devfn, reg); addr = PCI_SAL_EXT_ADDRESS(seg, bus, devfn, reg);
mode = 1; mode = 1;
} else {
return -EINVAL;
} }
result = ia64_sal_pci_config_read(addr, mode, len, &data); result = ia64_sal_pci_config_read(addr, mode, len, &data);
if (result != 0) if (result != 0)
return -EINVAL; return -EINVAL;
@ -80,9 +83,11 @@ int raw_pci_write(unsigned int seg, unsigned int bus, unsigned int devfn,
if ((seg | reg) <= 255) { if ((seg | reg) <= 255) {
addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg); addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg);
mode = 0; mode = 0;
} else { } else if (sal_revision >= SAL_VERSION_CODE(3,2)) {
addr = PCI_SAL_EXT_ADDRESS(seg, bus, devfn, reg); addr = PCI_SAL_EXT_ADDRESS(seg, bus, devfn, reg);
mode = 1; mode = 1;
} else {
return -EINVAL;
} }
result = ia64_sal_pci_config_write(addr, mode, len, value); result = ia64_sal_pci_config_write(addr, mode, len, value);
if (result != 0) if (result != 0)