diff options
author | Jan Beulich <JBeulich@novell.com> | 2011-07-22 03:13:05 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-07-22 11:25:41 -0400 |
commit | db34a363b992e0c8063f432607561520d79fbfb8 (patch) | |
tree | d57b4e848eeccade7dd81e39832215bdec3f52b7 /arch/x86/pci/direct.c | |
parent | 688398bb7b9c6ac115da7749ea808d3ef69e029f (diff) |
x86/PCI: config space accessor functions should not ignore the segment argument
Without this change, the majority of the raw PCI config space access
functions silently ignore a non-zero segment argument, which is
certainly wrong.
Apart from pci_direct_conf1, all other non-MMCFG access methods get
used only for non-extended accesses (i.e. assigned to raw_pci_ops
only). Consequently, with the way raw_pci_{read,write}() work, it would
be a coding error to call these functions with a non-zero segment (with
the current call flow this cannot happen afaict).
The access method 1 accessor, as it can be used for extended accesses
(on AMD systems) instead gets checks added for the passed in segment to
be zero. This would be the case when on such a system having multiple
PCI segments (don't know whether any exist in practice) MMCFG for some
reason is not usable, and method 1 gets selected for doing extended
accesses. Rather than accessing the wrong device's config space, the
function will now error out.
v2: Convert BUG_ON() to WARN_ON(), and extend description as per Ingo's
request.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci/direct.c')
-rw-r--r-- | arch/x86/pci/direct.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c index e6fd8473fb7b..4f2c70439d7f 100644 --- a/arch/x86/pci/direct.c +++ b/arch/x86/pci/direct.c | |||
@@ -22,7 +22,7 @@ static int pci_conf1_read(unsigned int seg, unsigned int bus, | |||
22 | { | 22 | { |
23 | unsigned long flags; | 23 | unsigned long flags; |
24 | 24 | ||
25 | if ((bus > 255) || (devfn > 255) || (reg > 4095)) { | 25 | if (seg || (bus > 255) || (devfn > 255) || (reg > 4095)) { |
26 | *value = -1; | 26 | *value = -1; |
27 | return -EINVAL; | 27 | return -EINVAL; |
28 | } | 28 | } |
@@ -53,7 +53,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus, | |||
53 | { | 53 | { |
54 | unsigned long flags; | 54 | unsigned long flags; |
55 | 55 | ||
56 | if ((bus > 255) || (devfn > 255) || (reg > 4095)) | 56 | if (seg || (bus > 255) || (devfn > 255) || (reg > 4095)) |
57 | return -EINVAL; | 57 | return -EINVAL; |
58 | 58 | ||
59 | raw_spin_lock_irqsave(&pci_config_lock, flags); | 59 | raw_spin_lock_irqsave(&pci_config_lock, flags); |
@@ -97,6 +97,7 @@ static int pci_conf2_read(unsigned int seg, unsigned int bus, | |||
97 | unsigned long flags; | 97 | unsigned long flags; |
98 | int dev, fn; | 98 | int dev, fn; |
99 | 99 | ||
100 | WARN_ON(seg); | ||
100 | if ((bus > 255) || (devfn > 255) || (reg > 255)) { | 101 | if ((bus > 255) || (devfn > 255) || (reg > 255)) { |
101 | *value = -1; | 102 | *value = -1; |
102 | return -EINVAL; | 103 | return -EINVAL; |
@@ -138,6 +139,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus, | |||
138 | unsigned long flags; | 139 | unsigned long flags; |
139 | int dev, fn; | 140 | int dev, fn; |
140 | 141 | ||
142 | WARN_ON(seg); | ||
141 | if ((bus > 255) || (devfn > 255) || (reg > 255)) | 143 | if ((bus > 255) || (devfn > 255) || (reg > 255)) |
142 | return -EINVAL; | 144 | return -EINVAL; |
143 | 145 | ||