Commit d91e6562 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v6.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull pci fix from Bjorn Helgaas:

 - Revert lockdep checking on locking that protects device resets from
   user-space config accesses; it exposed issues for which fixes are in
   the works but are too risky for this cycle (Dan Williams)

* tag 'pci-v6.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI: Revert the cfg_access_lock lockdep mechanism
parents d30d0e49 c9d52fb3

drivers/pci/access.c

+0 −4
Original line number Diff line number Diff line
@@ -289,8 +289,6 @@ void pci_cfg_access_lock(struct pci_dev *dev) 
{

	might_sleep();



	lock_map_acquire(&dev->cfg_access_lock);



	raw_spin_lock_irq(&pci_lock);

	if (dev->block_cfg_access)

		pci_wait_cfg(dev);
@@ -345,8 +343,6 @@ void pci_cfg_access_unlock(struct pci_dev *dev) 
	raw_spin_unlock_irqrestore(&pci_lock, flags);



	wake_up_all(&pci_cfg_wait);



	lock_map_release(&dev->cfg_access_lock);

}

EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);

drivers/pci/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -4883,7 +4883,6 @@ void __weak pcibios_reset_secondary_bus(struct pci_dev *dev) 
 */

int pci_bridge_secondary_bus_reset(struct pci_dev *dev)

{

	lock_map_assert_held(&dev->cfg_access_lock);

	pcibios_reset_secondary_bus(dev);



	return pci_bridge_wait_for_secondary_bus(dev, "bus reset");

drivers/pci/probe.c

+0 −3
Original line number Diff line number Diff line
@@ -2546,9 +2546,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) 
	dev->dev.dma_mask = &dev->dma_mask;

	dev->dev.dma_parms = &dev->dma_parms;

	dev->dev.coherent_dma_mask = 0xffffffffull;

	lockdep_register_key(&dev->cfg_access_key);

	lockdep_init_map(&dev->cfg_access_lock, dev_name(&dev->dev),

			 &dev->cfg_access_key, 0);



	dma_set_max_seg_size(&dev->dev, 65536);

	dma_set_seg_boundary(&dev->dev, 0xffffffff);

include/linux/lockdep.h

+0 −5
Original line number Diff line number Diff line
@@ -297,9 +297,6 @@ extern void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie); 
		.wait_type_inner = _wait_type,		\

		.lock_type = LD_LOCK_WAIT_OVERRIDE, }



#define lock_map_assert_held(l)		\

	lockdep_assert(lock_is_held(l) != LOCK_STATE_NOT_HELD)



#else /* !CONFIG_LOCKDEP */



static inline void lockdep_init_task(struct task_struct *task)
@@ -391,8 +388,6 @@ extern int lockdep_is_held(const void *); 
#define DEFINE_WAIT_OVERRIDE_MAP(_name, _wait_type)	\

	struct lockdep_map __maybe_unused _name = {}



#define lock_map_assert_held(l)			do { (void)(l); } while (0)



#endif /* !LOCKDEP */



#ifdef CONFIG_PROVE_LOCKING

include/linux/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -413,8 +413,6 @@ struct pci_dev { 
	struct resource driver_exclusive_resource;	 /* driver exclusive resource ranges */



	bool		match_driver;		/* Skip attaching driver */

	struct lock_class_key cfg_access_key;

	struct lockdep_map cfg_access_lock;



	unsigned int	transparent:1;		/* Subtractive decode bridge */

	unsigned int	io_window:1;		/* Bridge has I/O window */