Commit 511dd98c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Jesse Barnes

PCI: Convert pci_lock to raw_spinlock

pci_lock must be a real spinlock in preempt-rt. Convert it to
raw_spinlock. No change for !RT kernels.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 52b265a1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* configuration space. * configuration space.
*/ */
static DEFINE_SPINLOCK(pci_lock); static DEFINE_RAW_SPINLOCK(pci_lock);
/* /*
* Wrappers for all PCI configuration access functions. They just check * Wrappers for all PCI configuration access functions. They just check
...@@ -33,10 +33,10 @@ int pci_bus_read_config_##size \ ...@@ -33,10 +33,10 @@ int pci_bus_read_config_##size \
unsigned long flags; \ unsigned long flags; \
u32 data = 0; \ u32 data = 0; \
if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \
spin_lock_irqsave(&pci_lock, flags); \ raw_spin_lock_irqsave(&pci_lock, flags); \
res = bus->ops->read(bus, devfn, pos, len, &data); \ res = bus->ops->read(bus, devfn, pos, len, &data); \
*value = (type)data; \ *value = (type)data; \
spin_unlock_irqrestore(&pci_lock, flags); \ raw_spin_unlock_irqrestore(&pci_lock, flags); \
return res; \ return res; \
} }
...@@ -47,9 +47,9 @@ int pci_bus_write_config_##size \ ...@@ -47,9 +47,9 @@ int pci_bus_write_config_##size \
int res; \ int res; \
unsigned long flags; \ unsigned long flags; \
if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \
spin_lock_irqsave(&pci_lock, flags); \ raw_spin_lock_irqsave(&pci_lock, flags); \
res = bus->ops->write(bus, devfn, pos, len, value); \ res = bus->ops->write(bus, devfn, pos, len, value); \
spin_unlock_irqrestore(&pci_lock, flags); \ raw_spin_unlock_irqrestore(&pci_lock, flags); \
return res; \ return res; \
} }
...@@ -79,10 +79,10 @@ struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops) ...@@ -79,10 +79,10 @@ struct pci_ops *pci_bus_set_ops(struct pci_bus *bus, struct pci_ops *ops)
struct pci_ops *old_ops; struct pci_ops *old_ops;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&pci_lock, flags); raw_spin_lock_irqsave(&pci_lock, flags);
old_ops = bus->ops; old_ops = bus->ops;
bus->ops = ops; bus->ops = ops;
spin_unlock_irqrestore(&pci_lock, flags); raw_spin_unlock_irqrestore(&pci_lock, flags);
return old_ops; return old_ops;
} }
EXPORT_SYMBOL(pci_bus_set_ops); EXPORT_SYMBOL(pci_bus_set_ops);
...@@ -136,9 +136,9 @@ static noinline void pci_wait_ucfg(struct pci_dev *dev) ...@@ -136,9 +136,9 @@ static noinline void pci_wait_ucfg(struct pci_dev *dev)
__add_wait_queue(&pci_ucfg_wait, &wait); __add_wait_queue(&pci_ucfg_wait, &wait);
do { do {
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
spin_unlock_irq(&pci_lock); raw_spin_unlock_irq(&pci_lock);
schedule(); schedule();
spin_lock_irq(&pci_lock); raw_spin_lock_irq(&pci_lock);
} while (dev->block_ucfg_access); } while (dev->block_ucfg_access);
__remove_wait_queue(&pci_ucfg_wait, &wait); __remove_wait_queue(&pci_ucfg_wait, &wait);
} }
...@@ -150,11 +150,11 @@ int pci_user_read_config_##size \ ...@@ -150,11 +150,11 @@ int pci_user_read_config_##size \
int ret = 0; \ int ret = 0; \
u32 data = -1; \ u32 data = -1; \
if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \
spin_lock_irq(&pci_lock); \ raw_spin_lock_irq(&pci_lock); \
if (unlikely(dev->block_ucfg_access)) pci_wait_ucfg(dev); \ if (unlikely(dev->block_ucfg_access)) pci_wait_ucfg(dev); \
ret = dev->bus->ops->read(dev->bus, dev->devfn, \ ret = dev->bus->ops->read(dev->bus, dev->devfn, \
pos, sizeof(type), &data); \ pos, sizeof(type), &data); \
spin_unlock_irq(&pci_lock); \ raw_spin_unlock_irq(&pci_lock); \
*val = (type)data; \ *val = (type)data; \
return ret; \ return ret; \
} }
...@@ -165,11 +165,11 @@ int pci_user_write_config_##size \ ...@@ -165,11 +165,11 @@ int pci_user_write_config_##size \
{ \ { \
int ret = -EIO; \ int ret = -EIO; \
if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \
spin_lock_irq(&pci_lock); \ raw_spin_lock_irq(&pci_lock); \
if (unlikely(dev->block_ucfg_access)) pci_wait_ucfg(dev); \ if (unlikely(dev->block_ucfg_access)) pci_wait_ucfg(dev); \
ret = dev->bus->ops->write(dev->bus, dev->devfn, \ ret = dev->bus->ops->write(dev->bus, dev->devfn, \
pos, sizeof(type), val); \ pos, sizeof(type), val); \
spin_unlock_irq(&pci_lock); \ raw_spin_unlock_irq(&pci_lock); \
return ret; \ return ret; \
} }
...@@ -396,10 +396,10 @@ void pci_block_user_cfg_access(struct pci_dev *dev) ...@@ -396,10 +396,10 @@ void pci_block_user_cfg_access(struct pci_dev *dev)
unsigned long flags; unsigned long flags;
int was_blocked; int was_blocked;
spin_lock_irqsave(&pci_lock, flags); raw_spin_lock_irqsave(&pci_lock, flags);
was_blocked = dev->block_ucfg_access; was_blocked = dev->block_ucfg_access;
dev->block_ucfg_access = 1; dev->block_ucfg_access = 1;
spin_unlock_irqrestore(&pci_lock, flags); raw_spin_unlock_irqrestore(&pci_lock, flags);
/* If we BUG() inside the pci_lock, we're guaranteed to hose /* If we BUG() inside the pci_lock, we're guaranteed to hose
* the machine */ * the machine */
...@@ -417,7 +417,7 @@ void pci_unblock_user_cfg_access(struct pci_dev *dev) ...@@ -417,7 +417,7 @@ void pci_unblock_user_cfg_access(struct pci_dev *dev)
{ {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&pci_lock, flags); raw_spin_lock_irqsave(&pci_lock, flags);
/* This indicates a problem in the caller, but we don't need /* This indicates a problem in the caller, but we don't need
* to kill them, unlike a double-block above. */ * to kill them, unlike a double-block above. */
...@@ -425,6 +425,6 @@ void pci_unblock_user_cfg_access(struct pci_dev *dev) ...@@ -425,6 +425,6 @@ void pci_unblock_user_cfg_access(struct pci_dev *dev)
dev->block_ucfg_access = 0; dev->block_ucfg_access = 0;
wake_up_all(&pci_ucfg_wait); wake_up_all(&pci_ucfg_wait);
spin_unlock_irqrestore(&pci_lock, flags); raw_spin_unlock_irqrestore(&pci_lock, flags);
} }
EXPORT_SYMBOL_GPL(pci_unblock_user_cfg_access); EXPORT_SYMBOL_GPL(pci_unblock_user_cfg_access);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment