[PATCH] PCI: Block config access during BIST

Some PCI adapters (eg.  ipr scsi adapters) have an exposure today in that they
issue BIST to the adapter to reset the card.  If, during the time it takes to
complete BIST, userspace attempts to access PCI config space, the host bus
bridge will master abort the access since the ipr adapter does not respond on
the PCI bus for a brief period of time when running BIST.  On PPC64 hardware,
this master abort results in the host PCI bridge isolating that PCI device
from the rest of the system, making the device unusable until Linux is
rebooted.  This patch is an attempt to close that exposure by introducing some
blocking code in the PCI code.  When blocked, writes will be humored and reads
will return the cached value.  Ben Herrenschmidt has also mentioned that he
plans to use this in PPC power management.

Signed-off-by: Brian King <brking@us.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

 drivers/pci/access.c    |   89 ++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci-sysfs.c |   20 +++++-----
 drivers/pci/pci.h       |    7 +++
 drivers/pci/proc.c      |   28 +++++++--------
 drivers/pci/syscall.c   |   14 +++----
 include/linux/pci.h     |    7 +++
 6 files changed, 134 insertions(+), 31 deletions(-)

1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 9613f666c11..9eb465727fc 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -80,7 +80,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
 
         if ((pos & 1) && cnt) {
                 unsigned char val;
-                pci_read_config_byte(dev, pos, &val);
+                pci_user_read_config_byte(dev, pos, &val);
                 __put_user(val, buf);
                 buf++;
                 pos++;
@@ -89,7 +89,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
 
         if ((pos & 3) && cnt > 2) {
                 unsigned short val;
-                pci_read_config_word(dev, pos, &val);
+                pci_user_read_config_word(dev, pos, &val);
                 __put_user(cpu_to_le16(val), (unsigned short __user *) buf);
                 buf += 2;
                 pos += 2;
@@ -98,7 +98,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
 
         while (cnt >= 4) {
                 unsigned int val;
-                pci_read_config_dword(dev, pos, &val);
+                pci_user_read_config_dword(dev, pos, &val);
                 __put_user(cpu_to_le32(val), (unsigned int __user *) buf);
                 buf += 4;
                 pos += 4;
@@ -107,7 +107,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
 
         if (cnt >= 2) {
                 unsigned short val;
-                pci_read_config_word(dev, pos, &val);
+                pci_user_read_config_word(dev, pos, &val);
                 __put_user(cpu_to_le16(val), (unsigned short __user *) buf);
                 buf += 2;
                 pos += 2;
@@ -116,7 +116,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
 
         if (cnt) {
                 unsigned char val;
-                pci_read_config_byte(dev, pos, &val);
+                pci_user_read_config_byte(dev, pos, &val);
                 __put_user(val, buf);
                 buf++;
                 pos++;
@@ -151,7 +151,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
         if ((pos & 1) && cnt) {
                 unsigned char val;
                 __get_user(val, buf);
-                pci_write_config_byte(dev, pos, val);
+                pci_user_write_config_byte(dev, pos, val);
                 buf++;
                 pos++;
                 cnt--;
@@ -160,7 +160,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
         if ((pos & 3) && cnt > 2) {
                 unsigned short val;
                 __get_user(val, (unsigned short __user *) buf);
-                pci_write_config_word(dev, pos, le16_to_cpu(val));
+                pci_user_write_config_word(dev, pos, le16_to_cpu(val));
                 buf += 2;
                 pos += 2;
                 cnt -= 2;
@@ -169,7 +169,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
         while (cnt >= 4) {
                 unsigned int val;
                 __get_user(val, (unsigned int __user *) buf);
-                pci_write_config_dword(dev, pos, le32_to_cpu(val));
+                pci_user_write_config_dword(dev, pos, le32_to_cpu(val));
                 buf += 4;
                 pos += 4;
                 cnt -= 4;
@@ -178,7 +178,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
         if (cnt >= 2) {
                 unsigned short val;
                 __get_user(val, (unsigned short __user *) buf);
-                pci_write_config_word(dev, pos, le16_to_cpu(val));
+                pci_user_write_config_word(dev, pos, le16_to_cpu(val));
                 buf += 2;
                 pos += 2;
                 cnt -= 2;
@@ -187,7 +187,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
         if (cnt) {
                 unsigned char val;
                 __get_user(val, buf);
-                pci_write_config_byte(dev, pos, val);
+                pci_user_write_config_byte(dev, pos, val);
                 buf++;
                 pos++;
                 cnt--;
@@ -484,10 +484,10 @@ static int show_dev_config(struct seq_file *m, void *v)
 
         drv = pci_dev_driver(dev);
 
-        pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
-        pci_read_config_byte (dev, PCI_LATENCY_TIMER, &latency);
-        pci_read_config_byte (dev, PCI_MIN_GNT, &min_gnt);
-        pci_read_config_byte (dev, PCI_MAX_LAT, &max_lat);
+        pci_user_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
+        pci_user_read_config_byte (dev, PCI_LATENCY_TIMER, &latency);
+        pci_user_read_config_byte (dev, PCI_MIN_GNT, &min_gnt);
+        pci_user_read_config_byte (dev, PCI_MAX_LAT, &max_lat);
         seq_printf(m, "  Bus %2d, device %3d, function %2d:\n",
                dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
         seq_printf(m, "    Class %04x", class_rev >> 16);