From: Brian King <brking@us.ibm.com>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Andi Kleen <ak@muc.de>,
paulus@samba.org, benh@kernel.crashing.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
brking@us.ibm.com
Subject: Re: [PATCH 1/1] pci: Block config access during BIST (resend)
Date: Wed, 26 Jan 2005 10:34:41 -0600 [thread overview]
Message-ID: <41F7C6A1.9070102@us.ibm.com> (raw)
In-Reply-To: <1106161249.3341.9.camel@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]
Alan Cox wrote:
> On Maw, 2005-01-18 at 15:14, Brian King wrote:
>
>>Alan - are you satisfied with the most recent patch, or would you prefer
>>the patch not returning failure return codes and just bit bucketing
>>writes and returning all ff's on reads? Either way works for me.
>
>
> Which was the last one. For userspace we need to block while we finish
> the BIST.
>
>
Here is the last one. I've looked at making userspace sleep until BIST
is finished. The downside I see to this is that is complicates the patch
due to the following reasons:
1. In order to also make this work for Ben's PPC power management usage
would require an additional flag and additional APIs to set and clear
the flag.
2. Since BIST can be run at interrupt context, the interfaces to block
and unblock userspace accesses across BIST must be callable from
interrupt context. This prevents the usage of semaphores or simple
wait_event macros and requires new macros that carefully check the new
pci device flag and manage the spinlock.
--
Brian King
eServer Storage I/O
IBM Linux Technology Center
[-- Attachment #2: pci_block_user_config_io_during_bist_again.patch --]
[-- Type: text/plain, Size: 13293 bytes --]
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>
---
Signed-off-by: Brian King <brking@us.ibm.com>
---
linux-2.6.11-rc1-bjking1/drivers/pci/access.c | 81 +++++++++++++++++++++++
linux-2.6.11-rc1-bjking1/drivers/pci/pci-sysfs.c | 10 +-
linux-2.6.11-rc1-bjking1/drivers/pci/proc.c | 28 +++----
linux-2.6.11-rc1-bjking1/drivers/pci/syscall.c | 12 +--
linux-2.6.11-rc1-bjking1/include/linux/pci.h | 12 +++
5 files changed, 117 insertions(+), 26 deletions(-)
diff -puN drivers/pci/access.c~pci_block_user_config_io_during_bist_again drivers/pci/access.c
--- linux-2.6.11-rc1/drivers/pci/access.c~pci_block_user_config_io_during_bist_again 2005-01-13 15:57:15.000000000 -0600
+++ linux-2.6.11-rc1-bjking1/drivers/pci/access.c 2005-01-13 15:57:54.000000000 -0600
@@ -60,3 +60,84 @@ EXPORT_SYMBOL(pci_bus_read_config_dword)
EXPORT_SYMBOL(pci_bus_write_config_byte);
EXPORT_SYMBOL(pci_bus_write_config_word);
EXPORT_SYMBOL(pci_bus_write_config_dword);
+
+#define PCI_USER_READ_CONFIG(size,type) \
+int pci_user_read_config_##size \
+ (struct pci_dev *dev, int pos, type *val) \
+{ \
+ unsigned long flags; \
+ int ret = 0; \
+ u32 data = -1; \
+ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \
+ spin_lock_irqsave(&pci_lock, flags); \
+ if (likely(!dev->block_ucfg_access)) \
+ ret = dev->bus->ops->read(dev->bus, dev->devfn, pos, sizeof(type), &data); \
+ else if (pos < sizeof(dev->saved_config_space)) \
+ data = dev->saved_config_space[pos/sizeof(dev->saved_config_space[0])]; \
+ spin_unlock_irqrestore(&pci_lock, flags); \
+ *val = (type)data; \
+ return ret; \
+}
+
+#define PCI_USER_WRITE_CONFIG(size,type) \
+int pci_user_write_config_##size \
+ (struct pci_dev *dev, int pos, type val) \
+{ \
+ unsigned long flags; \
+ int ret = 0; \
+ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \
+ spin_lock_irqsave(&pci_lock, flags); \
+ if (likely(!dev->block_ucfg_access)) \
+ ret = dev->bus->ops->write(dev->bus, dev->devfn, pos, sizeof(type), val); \
+ spin_unlock_irqrestore(&pci_lock, flags); \
+ return ret; \
+}
+
+PCI_USER_READ_CONFIG(byte, u8)
+PCI_USER_READ_CONFIG(word, u16)
+PCI_USER_READ_CONFIG(dword, u32)
+PCI_USER_WRITE_CONFIG(byte, u8)
+PCI_USER_WRITE_CONFIG(word, u16)
+PCI_USER_WRITE_CONFIG(dword, u32)
+
+/**
+ * pci_block_user_cfg_access - Block userspace PCI config reads/writes
+ * @dev: pci device struct
+ *
+ * This function blocks any userspace PCI config accesses from occurring.
+ * When blocked, any writes will return -EBUSY and reads will return the
+ * data saved using pci_save_state for the first 64 bytes of config
+ * space and return -EBUSY for all other config reads.
+ *
+ * Return value:
+ * nothing
+ **/
+void pci_block_user_cfg_access(struct pci_dev *dev)
+{
+ unsigned long flags;
+
+ pci_save_state(dev);
+ spin_lock_irqsave(&pci_lock, flags);
+ dev->block_ucfg_access = 1;
+ spin_unlock_irqrestore(&pci_lock, flags);
+}
+EXPORT_SYMBOL(pci_block_user_cfg_access);
+
+/**
+ * pci_unblock_user_cfg_access - Unblock userspace PCI config reads/writes
+ * @dev: pci device struct
+ *
+ * This function allows userspace PCI config accesses to resume.
+ *
+ * Return value:
+ * nothing
+ **/
+void pci_unblock_user_cfg_access(struct pci_dev *dev)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&pci_lock, flags);
+ dev->block_ucfg_access = 0;
+ spin_unlock_irqrestore(&pci_lock, flags);
+}
+EXPORT_SYMBOL(pci_unblock_user_cfg_access);
diff -puN drivers/pci/pci-sysfs.c~pci_block_user_config_io_during_bist_again drivers/pci/pci-sysfs.c
--- linux-2.6.11-rc1/drivers/pci/pci-sysfs.c~pci_block_user_config_io_during_bist_again 2005-01-13 15:57:15.000000000 -0600
+++ linux-2.6.11-rc1-bjking1/drivers/pci/pci-sysfs.c 2005-01-13 15:57:15.000000000 -0600
@@ -110,7 +110,7 @@ pci_read_config(struct kobject *kobj, ch
while (off & 3) {
unsigned char val;
- pci_read_config_byte(dev, off, &val);
+ pci_user_read_config_byte(dev, off, &val);
buf[off - init_off] = val;
off++;
if (--size == 0)
@@ -119,7 +119,7 @@ pci_read_config(struct kobject *kobj, ch
while (size > 3) {
unsigned int val;
- pci_read_config_dword(dev, off, &val);
+ pci_user_read_config_dword(dev, off, &val);
buf[off - init_off] = val & 0xff;
buf[off - init_off + 1] = (val >> 8) & 0xff;
buf[off - init_off + 2] = (val >> 16) & 0xff;
@@ -130,7 +130,7 @@ pci_read_config(struct kobject *kobj, ch
while (size > 0) {
unsigned char val;
- pci_read_config_byte(dev, off, &val);
+ pci_user_read_config_byte(dev, off, &val);
buf[off - init_off] = val;
off++;
--size;
@@ -154,7 +154,7 @@ pci_write_config(struct kobject *kobj, c
}
while (off & 3) {
- pci_write_config_byte(dev, off, buf[off - init_off]);
+ pci_user_write_config_byte(dev, off, buf[off - init_off]);
off++;
if (--size == 0)
break;
@@ -171,7 +171,7 @@ pci_write_config(struct kobject *kobj, c
}
while (size > 0) {
- pci_write_config_byte(dev, off, buf[off - init_off]);
+ pci_user_write_config_byte(dev, off, buf[off - init_off]);
off++;
--size;
}
diff -puN drivers/pci/proc.c~pci_block_user_config_io_during_bist_again drivers/pci/proc.c
--- linux-2.6.11-rc1/drivers/pci/proc.c~pci_block_user_config_io_during_bist_again 2005-01-13 15:57:15.000000000 -0600
+++ linux-2.6.11-rc1-bjking1/drivers/pci/proc.c 2005-01-13 15:57:15.000000000 -0600
@@ -79,7 +79,7 @@ proc_bus_pci_read(struct file *file, cha
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++;
@@ -88,7 +88,7 @@ proc_bus_pci_read(struct file *file, cha
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;
@@ -97,7 +97,7 @@ proc_bus_pci_read(struct file *file, cha
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;
@@ -106,7 +106,7 @@ proc_bus_pci_read(struct file *file, cha
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;
@@ -115,7 +115,7 @@ proc_bus_pci_read(struct file *file, cha
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++;
@@ -150,7 +150,7 @@ proc_bus_pci_write(struct file *file, co
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--;
@@ -159,7 +159,7 @@ proc_bus_pci_write(struct file *file, co
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;
@@ -168,7 +168,7 @@ proc_bus_pci_write(struct file *file, co
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;
@@ -177,7 +177,7 @@ proc_bus_pci_write(struct file *file, co
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;
@@ -186,7 +186,7 @@ proc_bus_pci_write(struct file *file, co
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--;
@@ -474,10 +474,10 @@ static int show_dev_config(struct seq_fi
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));
class = pci_class_name(class_rev >> 16);
diff -puN drivers/pci/syscall.c~pci_block_user_config_io_during_bist_again drivers/pci/syscall.c
--- linux-2.6.11-rc1/drivers/pci/syscall.c~pci_block_user_config_io_during_bist_again 2005-01-13 15:57:15.000000000 -0600
+++ linux-2.6.11-rc1-bjking1/drivers/pci/syscall.c 2005-01-13 15:57:15.000000000 -0600
@@ -38,13 +38,13 @@ sys_pciconfig_read(unsigned long bus, un
lock_kernel();
switch (len) {
case 1:
- cfg_ret = pci_read_config_byte(dev, off, &byte);
+ cfg_ret = pci_user_read_config_byte(dev, off, &byte);
break;
case 2:
- cfg_ret = pci_read_config_word(dev, off, &word);
+ cfg_ret = pci_user_read_config_word(dev, off, &word);
break;
case 4:
- cfg_ret = pci_read_config_dword(dev, off, &dword);
+ cfg_ret = pci_user_read_config_dword(dev, off, &dword);
break;
default:
err = -EINVAL;
@@ -112,7 +112,7 @@ sys_pciconfig_write(unsigned long bus, u
err = get_user(byte, (u8 __user *)buf);
if (err)
break;
- err = pci_write_config_byte(dev, off, byte);
+ err = pci_user_write_config_byte(dev, off, byte);
if (err != PCIBIOS_SUCCESSFUL)
err = -EIO;
break;
@@ -121,7 +121,7 @@ sys_pciconfig_write(unsigned long bus, u
err = get_user(word, (u16 __user *)buf);
if (err)
break;
- err = pci_write_config_word(dev, off, word);
+ err = pci_user_write_config_word(dev, off, word);
if (err != PCIBIOS_SUCCESSFUL)
err = -EIO;
break;
@@ -130,7 +130,7 @@ sys_pciconfig_write(unsigned long bus, u
err = get_user(dword, (u32 __user *)buf);
if (err)
break;
- err = pci_write_config_dword(dev, off, dword);
+ err = pci_user_write_config_dword(dev, off, dword);
if (err != PCIBIOS_SUCCESSFUL)
err = -EIO;
break;
diff -puN include/linux/pci.h~pci_block_user_config_io_during_bist_again include/linux/pci.h
--- linux-2.6.11-rc1/include/linux/pci.h~pci_block_user_config_io_during_bist_again 2005-01-13 15:57:15.000000000 -0600
+++ linux-2.6.11-rc1-bjking1/include/linux/pci.h 2005-01-13 15:57:15.000000000 -0600
@@ -557,7 +557,8 @@ struct pci_dev {
/* keep track of device state */
unsigned int is_enabled:1; /* pci_enable_device has been called */
unsigned int is_busmaster:1; /* device is busmaster */
-
+ unsigned int block_ucfg_access:1; /* userspace config space access is blocked */
+
u32 saved_config_space[16]; /* config space saved at suspend time */
struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */
int rom_attr_enabled; /* has display of the rom attribute been enabled? */
@@ -801,6 +802,13 @@ static inline int pci_write_config_dword
return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val);
}
+int pci_user_read_config_byte(struct pci_dev *dev, int where, u8 *val);
+int pci_user_read_config_word(struct pci_dev *dev, int where, u16 *val);
+int pci_user_read_config_dword(struct pci_dev *dev, int where, u32 *val);
+int pci_user_write_config_byte(struct pci_dev *dev, int where, u8 val);
+int pci_user_write_config_word(struct pci_dev *dev, int where, u16 val);
+int pci_user_write_config_dword(struct pci_dev *dev, int where, u32 val);
+
int pci_enable_device(struct pci_dev *dev);
int pci_enable_device_bars(struct pci_dev *dev, int mask);
void pci_disable_device(struct pci_dev *dev);
@@ -896,6 +904,8 @@ extern void pci_disable_msix(struct pci_
extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
#endif
+extern void pci_block_user_cfg_access(struct pci_dev *dev);
+extern void pci_unblock_user_cfg_access(struct pci_dev *dev);
#endif /* CONFIG_PCI */
/* Include architecture-dependent settings and functions */
_
next prev parent reply other threads:[~2005-01-26 16:36 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-10 14:49 [PATCH 1/1] pci: Block config access during BIST (resend) brking
2005-01-10 16:10 ` Andi Kleen
2005-01-10 16:25 ` Brian King
2005-01-10 16:29 ` Andi Kleen
2005-01-10 22:57 ` Brian King
2005-01-11 14:37 ` Alan Cox
2005-01-11 17:33 ` Andi Kleen
2005-01-11 22:17 ` Brian King
2005-01-13 15:36 ` Alan Cox
2005-01-13 15:35 ` Alan Cox
2005-01-13 18:03 ` Andi Kleen
2005-01-13 18:46 ` Alan Cox
2005-01-13 20:23 ` Andi Kleen
2005-01-13 19:44 ` Alan Cox
2005-01-13 21:50 ` Andi Kleen
2005-01-15 0:33 ` Alan Cox
2005-01-15 1:44 ` Andi Kleen
2005-01-15 1:01 ` Alan Cox
2005-01-15 6:20 ` Benjamin Herrenschmidt
2005-01-16 0:58 ` Alan Cox
2005-01-16 4:01 ` Benjamin Herrenschmidt
2005-01-16 4:48 ` Andi Kleen
2005-01-16 20:53 ` Benjamin Herrenschmidt
2005-01-16 22:07 ` Andi Kleen
2005-01-16 22:14 ` Benjamin Herrenschmidt
2005-01-16 21:10 ` Alan Cox
2005-01-18 15:14 ` Brian King
2005-01-18 23:31 ` Andi Kleen
2005-01-18 23:36 ` Brian King
2005-01-19 22:40 ` Alan Cox
2005-01-26 16:34 ` Brian King [this message]
2005-01-26 22:10 ` Benjamin Herrenschmidt
2005-01-27 15:53 ` Alan Cox
2005-01-27 18:44 ` Brian King
2005-01-27 23:15 ` Benjamin Herrenschmidt
2005-01-28 14:35 ` Brian King
2005-02-01 7:27 ` Greg KH
2005-02-01 15:12 ` Brian King
2005-02-01 15:44 ` Matthew Wilcox
2005-02-01 17:35 ` Brian King
2005-02-01 17:47 ` Matthew Wilcox
2005-02-01 19:01 ` Brian King
2005-02-01 23:00 ` Benjamin Herrenschmidt
2005-02-02 15:33 ` Brian King
2005-02-08 20:08 ` Greg KH
2005-06-21 16:08 ` Brian King
2005-08-23 15:11 ` [PATCH 1/2] " Brian King
2005-08-23 15:14 ` [PATCH 2/2] ipr: " Brian King
2005-09-01 23:03 ` [PATCH 1/2] pci: " Andrew Morton
2005-09-02 23:56 ` Brian King
2005-09-02 22:43 ` Grant Grundler
2005-09-02 23:11 ` Paul Mackerras
2005-09-03 0:08 ` Grant Grundler
2005-09-03 23:37 ` Brian King
2005-09-03 19:39 ` Grant Grundler
2005-09-05 18:31 ` Brian King
2005-09-06 4:48 ` Grant Grundler
2005-09-06 14:28 ` Brian King
2005-09-07 5:49 ` Paul Mackerras
2005-09-07 14:58 ` Grant Grundler
2005-09-07 22:39 ` Paul Mackerras
2005-09-08 1:21 ` Grant Grundler
2005-09-08 3:05 ` Brian King
2005-09-08 4:08 ` Grant Grundler
2005-02-01 18:58 ` [PATCH 1/1] " Greg KH
2005-02-01 23:07 ` Benjamin Herrenschmidt
2005-02-01 22:58 ` Benjamin Herrenschmidt
2005-01-10 19:23 ` Alan Cox
-- strict thread matches above, loose matches on Subject: below --
2004-12-14 19:41 brking
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41F7C6A1.9070102@us.ibm.com \
--to=brking@us.ibm.com \
--cc=ak@muc.de \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).