UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'pci/host-hv' into next 

* pci/host-hv:
  PCI: hv: Do not sleep in compose_msi_msg()
This commit is contained in:
Bjorn Helgaas 2017-09-07 13:23:59 -05:00
parent 6238e057d4 80bfeeb9dd
commit b7c19476bd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/host/pci-hyperv.c
View File

@ -50,6 +50,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h>
#include <linux/semaphore.h> #include <linux/semaphore.h>
#include <linux/irqdomain.h> #include <linux/irqdomain.h>
#include <asm/irqdomain.h> #include <asm/irqdomain.h>
@ -1159,7 +1160,12 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
goto free_int_desc; goto free_int_desc;
} }
wait_for_completion(&comp.comp_pkt.host_event); /*
* Since this function is called with IRQ locks held, can't
* do normal wait for completion; instead poll.
*/
while (!try_wait_for_completion(&comp.comp_pkt.host_event))
udelay(100);
if (comp.comp_pkt.completion_status < 0) { if (comp.comp_pkt.completion_status < 0) {
dev_err(&hbus->hdev->device, dev_err(&hbus->hdev->device,