Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d854908 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '3.8-pci-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI updates from Bjorn Helgaas:
 "The most important is a fix for a pciehp deadlock that occurs when
  unplugging a Thunderbolt adapter.  We also applied the same fix to
  shpchp, removed CONFIG_EXPERIMENTAL dependencies, fixed a
  pcie_aspm=force problem, and fixed a refcount leak.

  Details:

   - Hotplug
      PCI: pciehp: Use per-slot workqueues to avoid deadlock
      PCI: shpchp: Make shpchp_wq non-ordered
      PCI: shpchp: Handle push button event asynchronously
      PCI: shpchp: Use per-slot workqueues to avoid deadlock

   - Power management
      PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported

   - Misc
      PCI/AER: pci_get_domain_bus_and_slot() call missing required pci_dev_put()
      PCI: remove depends on CONFIG_EXPERIMENTAL"

* tag '3.8-pci-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: remove depends on CONFIG_EXPERIMENTAL
  PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported
  PCI: shpchp: Use per-slot workqueues to avoid deadlock
  PCI: shpchp: Handle push button event asynchronously
  PCI: shpchp: Make shpchp_wq non-ordered
  PCI/AER: pci_get_domain_bus_and_slot() call missing required pci_dev_put()
  PCI: pciehp: Use per-slot workqueues to avoid deadlock
parents f56c3196 444ee9bd

drivers/pci/hotplug/pciehp.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ extern bool pciehp_poll_mode; 
extern int pciehp_poll_time;

extern bool pciehp_debug;

extern bool pciehp_force;

extern struct workqueue_struct *pciehp_wq;



#define dbg(format, arg...)						\

do {									\
@@ -78,6 +77,7 @@ struct slot { 
	struct hotplug_slot *hotplug_slot;

	struct delayed_work work;	/* work for button event */

	struct mutex lock;

	struct workqueue_struct *wq;

};



struct event_info {

drivers/pci/hotplug/pciehp_core.c

+2 −9
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ bool pciehp_debug; 
bool pciehp_poll_mode;

int pciehp_poll_time;

bool pciehp_force;

struct workqueue_struct *pciehp_wq;



#define DRIVER_VERSION	"0.4"

#define DRIVER_AUTHOR	"Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
@@ -340,18 +339,13 @@ static int __init pcied_init(void) 
{

	int retval = 0;



	pciehp_wq = alloc_workqueue("pciehp", 0, 0);

	if (!pciehp_wq)

		return -ENOMEM;



	pciehp_firmware_init();

	retval = pcie_port_service_register(&hpdriver_portdrv);

 	dbg("pcie_port_service_register = %d\n", retval);

  	info(DRIVER_DESC " version: " DRIVER_VERSION "\n");

 	if (retval) {

		destroy_workqueue(pciehp_wq);

	if (retval)

		dbg("Failure to register service\n");

	}



	return retval;

}
@@ -359,7 +353,6 @@ static void __exit pcied_cleanup(void) 
{

	dbg("unload_pciehpd()\n");

	pcie_port_service_unregister(&hpdriver_portdrv);

	destroy_workqueue(pciehp_wq);

	info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");

}

drivers/pci/hotplug/pciehp_ctrl.c

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type) 
	info->p_slot = p_slot;

	INIT_WORK(&info->work, interrupt_event_handler);



	queue_work(pciehp_wq, &info->work);

	queue_work(p_slot->wq, &info->work);



	return 0;

}
@@ -344,7 +344,7 @@ void pciehp_queue_pushbutton_work(struct work_struct *work) 
		kfree(info);

		goto out;

	}

	queue_work(pciehp_wq, &info->work);

	queue_work(p_slot->wq, &info->work);

 out:

	mutex_unlock(&p_slot->lock);

}
@@ -377,7 +377,7 @@ static void handle_button_press_event(struct slot *p_slot) 
		if (ATTN_LED(ctrl))

			pciehp_set_attention_status(p_slot, 0);



		queue_delayed_work(pciehp_wq, &p_slot->work, 5*HZ);

		queue_delayed_work(p_slot->wq, &p_slot->work, 5*HZ);

		break;

	case BLINKINGOFF_STATE:

	case BLINKINGON_STATE:
@@ -439,7 +439,7 @@ static void handle_surprise_event(struct slot *p_slot) 
	else

		p_slot->state = POWERON_STATE;



	queue_work(pciehp_wq, &info->work);

	queue_work(p_slot->wq, &info->work);

}



static void interrupt_event_handler(struct work_struct *work)

drivers/pci/hotplug/pciehp_hpc.c

+10 −1
Original line number Diff line number Diff line
@@ -773,23 +773,32 @@ static void pcie_shutdown_notification(struct controller *ctrl) 
static int pcie_init_slot(struct controller *ctrl)

{

	struct slot *slot;

	char name[32];



	slot = kzalloc(sizeof(*slot), GFP_KERNEL);

	if (!slot)

		return -ENOMEM;



	snprintf(name, sizeof(name), "pciehp-%u", PSN(ctrl));

	slot->wq = alloc_workqueue(name, 0, 0);

	if (!slot->wq)

		goto abort;



	slot->ctrl = ctrl;

	mutex_init(&slot->lock);

	INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);

	ctrl->slot = slot;

	return 0;

abort:

	kfree(slot);

	return -ENOMEM;

}



static void pcie_cleanup_slot(struct controller *ctrl)

{

	struct slot *slot = ctrl->slot;

	cancel_delayed_work(&slot->work);

	flush_workqueue(pciehp_wq);

	destroy_workqueue(slot->wq);

	kfree(slot);

}

drivers/pci/hotplug/shpchp.h

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
extern bool shpchp_poll_mode;

extern int shpchp_poll_time;

extern bool shpchp_debug;

extern struct workqueue_struct *shpchp_wq;

extern struct workqueue_struct *shpchp_ordered_wq;



#define dbg(format, arg...)						\

do {									\
@@ -91,6 +89,7 @@ struct slot { 
	struct list_head	slot_list;

	struct delayed_work work;	/* work for button event */

	struct mutex lock;

	struct workqueue_struct *wq;

	u8 hp_slot;

};