Skip to contentSkip to conversation

mei: Enable msi when supported

staging Maarten Lankhorst 2 participants 4 messages Jul 7, 2011 – Jul 13, 2011 Staging

lore
Share & tools
lore

Maarten Lankhorst

author
#0 lore raw
Signed-off-by Maarten Lankhorst <[email protected]>

---
Tested suspend/resume, driver (re/un)loading. Comments welcome. :)

drivers/staging/mei/main.c +11 -3
index bfd1b46..58106bf 100644
@@ -121,6 +121,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
 {
 	struct mei_device *dev;
 	int err;
+	unsigned long flags = 0;
 
 	mutex_lock(&mei_mutex);
 	if (mei_device) {

@@ -154,11 +155,13 @@ static int __devinit mei_probe(struct pci_dev *pdev,
 		err = -ENOMEM;
 		goto free_device;
 	}
+	if (pci_enable_msi(pdev) < 0)
+		flags |= IRQF_SHARED;
 	/* request and enable interrupt   */
 	err = request_threaded_irq(pdev->irq,
 			mei_interrupt_quick_handler,
 			mei_interrupt_thread_handler,
-			IRQF_SHARED, mei_driver_name, dev);
+			flags, mei_driver_name, dev);
 	if (err) {
 		printk(KERN_ERR "mei: request_threaded_irq failure. irq = %d\n",
 		       pdev->irq);

@@ -186,6 +189,7 @@ release_irq:
 	mei_disable_interrupts(dev);
 	flush_scheduled_work();
 	free_irq(pdev->irq, dev);
+	pci_disable_msi(pdev);
 unmap_memory:
 	pci_iounmap(pdev, dev->mem_addr);
 free_device:

@@ -250,6 +254,7 @@ static void __devexit mei_remove(struct pci_dev *pdev)
 	mei_disable_interrupts(dev);
 
 	free_irq(pdev->irq, dev);
+	pci_disable_msi(pdev);
 	pci_set_drvdata(pdev, NULL);
 
 	if (dev->mem_addr)

@@ -1103,7 +1108,7 @@ static int mei_pci_suspend(struct device *device)
 	mutex_unlock(&dev->device_lock);
 
 	free_irq(pdev->irq, dev);
-
+	pci_disable_msi(pdev);
 
 	return err;
 }

@@ -1113,16 +1118,19 @@ static int mei_pci_resume(struct device *device)
 	struct pci_dev *pdev = to_pci_dev(device);
 	struct mei_device *dev;
 	int err;
+	unsigned long flags = 0;
 
 	dev = pci_get_drvdata(pdev);
 	if (!dev)
 		return -ENODEV;
 
+	if (pci_enable_msi(pdev) < 0)
+		flags |= IRQF_SHARED;
 	/* request and enable interrupt   */
 	err = request_threaded_irq(pdev->irq,
 			mei_interrupt_quick_handler,
 			mei_interrupt_thread_handler,
-			IRQF_SHARED, mei_driver_name, dev);
+			flags, mei_driver_name, dev);
 	if (err) {
 		printk(KERN_ERR "mei: Request_irq failure. irq = %d\n",
 		       pdev->irq);
#1 lore raw
Quoted 9 lines

-----Original Message-----
From: Maarten Lankhorst [mailto:[email protected]]
Sent: Thursday, July 07, 2011 2:32 PM
To: Winkler, Tomas
Cc: [email protected]; Linux Kernel Mailing List
Subject: [staging] mei: Enable msi when supported

Quoted 3 lines
Signed-off-by Maarten Lankhorst <[email protected]>

---
Tested suspend/resume, driver (re/un)loading. Comments welcome. :)

Sounds good, but I believe in case where MSI is enabled we also can kill the quick handler. Let me check before I ack this.

Quoted 68 lines
drivers/staging/mei/main.c index renamed from drivers/staging/mei/main.c +0 -0

bfd1b46..58106bf 100644

drivers/staging/mei/main.c +4 -1
@@ -121,6 +121,7 @@ static int __devinit mei_probe(struct pci_dev *pdev,
 {
 	struct mei_device *dev;
 	int err;
+	unsigned long flags = 0;
 
 	mutex_lock(&mei_mutex);
 	if (mei_device) {

@@ -154,11 +155,13 @@ static int __devinit mei_probe(struct pci_dev
 *pdev,
 		err = -ENOMEM;
 		goto free_device;
 	}
+	if (pci_enable_msi(pdev) < 0)
+		flags |= IRQF_SHARED;
 	/* request and enable interrupt   */
 	err = request_threaded_irq(pdev->irq,
 			mei_interrupt_quick_handler,
 			mei_interrupt_thread_handler,
-			IRQF_SHARED, mei_driver_name, dev);
+			flags, mei_driver_name, dev);
 	if (err) {
 		printk(KERN_ERR "mei: request_threaded_irq failure. irq =

%d\n",

drivers/staging/mei/main.c +2 -0
 		       pdev->irq);

@@ -186,6 +189,7 @@ release_irq:
 	mei_disable_interrupts(dev);
 	flush_scheduled_work();
 	free_irq(pdev->irq, dev);
+	pci_disable_msi(pdev);
 unmap_memory:
 	pci_iounmap(pdev, dev->mem_addr);
 free_device:

@@ -250,6 +254,7 @@ static void __devexit mei_remove(struct pci_dev
 *pdev)
 	mei_disable_interrupts(dev);
 
 	free_irq(pdev->irq, dev);
+	pci_disable_msi(pdev);
 	pci_set_drvdata(pdev, NULL);
drivers/staging/mei/main.c +3 -1
 	if (dev->mem_addr)

@@ -1103,7 +1108,7 @@ static int mei_pci_suspend(struct device *device)
 	mutex_unlock(&dev->device_lock);
 
 	free_irq(pdev->irq, dev);
-
+	pci_disable_msi(pdev);
 
 	return err;
 }

@@ -1113,16 +1118,19 @@ static int mei_pci_resume(struct device *device)
 	struct pci_dev *pdev = to_pci_dev(device);
 	struct mei_device *dev;
 	int err;
+	unsigned long flags = 0;
 
 	dev = pci_get_drvdata(pdev);
 	if (!dev)
 		return -ENODEV;
 
+	if (pci_enable_msi(pdev) < 0)

drivers/staging/mei/main.c static int mei_pci_resume(struct device *device) · line 1136

Quoted 10 lines
drivers/staging/mei/main.c +2 -1
+		flags |= IRQF_SHARED;
 	/* request and enable interrupt   */
 	err = request_threaded_irq(pdev->irq,
 			mei_interrupt_quick_handler,
 			mei_interrupt_thread_handler,
-			IRQF_SHARED, mei_driver_name, dev);
+			flags, mei_driver_name, dev);
 	if (err) {
 		printk(KERN_ERR "mei: Request_irq failure. irq = %d\n",
 		       pdev->irq);

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

author
#2 lore raw

Hi Tomas,

Quoted 7 lines · Tomas
Quoted 7 lines

-----Original Message-----
From: Maarten Lankhorst [mailto:[email protected]]
Sent: Thursday, July 07, 2011 2:32 PM
To: Winkler, Tomas
Cc: [email protected]; Linux Kernel Mailing List
Subject: [staging] mei: Enable msi when supported

Quoted 5 lines
Quoted 3 lines
Signed-off-by Maarten Lankhorst <[email protected]>

---
Tested suspend/resume, driver (re/un)loading. Comments welcome. :)

Sounds good, but I believe in case where MSI is enabled we also can kill the quick handler. Let me check before I ack this.

Figured I'd bump because I haven't heard anything back.

Cheers,
Maarten

#3 lore raw
Quoted 19 lines

-----Original Message-----
From: Maarten Lankhorst [mailto:[email protected]]
Sent: Tuesday, July 12, 2011 4:14 PM
To: Winkler, Tomas
Cc: [email protected]; Linux Kernel Mailing List; Weil, Oren jer
Subject: Re: [staging] mei: Enable msi when supported

Hi Tomas,

Quoted 7 lines · Tomas
Quoted 7 lines

-----Original Message-----
From: Maarten Lankhorst [mailto:[email protected]]
Sent: Thursday, July 07, 2011 2:32 PM
To: Winkler, Tomas
Cc: [email protected]; Linux Kernel Mailing List
Subject: [staging] mei: Enable msi when supported

Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
Signed-off-by Maarten Lankhorst <[email protected]>

---
Tested suspend/resume, driver (re/un)loading. Comments welcome. :)

Sounds good, but I believe in case where MSI is enabled we also can kill the

quick handler.

Quoted 1 line

Let me check before I ack this.

Figured I'd bump because I haven't heard anything back.

Sorry I was sick now I'm getting through my backlog Will have answers tomorrow.

Thanks
Tomas

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.