Skip to contentSkip to conversation

mei: migrate to pci_alloc_irq_vectors and smaller improvements

PATCH In review Heiner Kallweit 2 participants 6 messages Aug 3, 2018 – Aug 5, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover mei: migrate to pci_alloc_irq_vectors and smaller improvements

This series migrates the driver to the pci_alloc_irq_vectors API and includes also smaller improvements.

MEI_ME was tested on a Zotac CI321. MEI_TXE is compile-tested only.

Heiner Kallweit (3):
mei: Don't free irq when suspending
mei: Migrate to pci_alloc_irq_vectors API
mei: Improve usage of mei_start

 drivers/misc/mei/pci-me.c  | 51 ++++++++----------------------
 drivers/misc/mei/pci-txe.c | 63 ++++++++++----------------------------
 2 files changed, 30 insertions(+), 84 deletions(-)
Signature · 1 line
2.18.0
#1 lore raw

PATCH 1/3 mei: Don't free irq when suspending

Usually it's not needed to free and re-request the interrupt in a suspend / resume cycle, so remove this.

---
 drivers/misc/mei/pci-me.c  | 20 --------------------
 drivers/misc/mei/pci-txe.c | 27 +--------------------------
 2 files changed, 1 insertion(+), 46 deletions(-)
drivers/misc/mei/pci-me.c +0 -20
index ea4e1522..55ba1c41 100644
@@ -336,9 +336,6 @@ static int mei_me_pci_suspend(struct device *device)
 
 	mei_disable_interrupts(dev);
 
-	free_irq(pdev->irq, dev);
-	pci_disable_msi(pdev);
-
 	return 0;
 }
 
@@ -346,29 +343,12 @@ static int mei_me_pci_resume(struct device *device)
 {
 	struct pci_dev *pdev = to_pci_dev(device);
 	struct mei_device *dev;
-	unsigned int irqflags;
 	int err;
 
 	dev = pci_get_drvdata(pdev);
 	if (!dev)
 		return -ENODEV;
 
-	pci_enable_msi(pdev);
-
-	irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT : IRQF_SHARED;
-
-	/* request and enable interrupt */
-	err = request_threaded_irq(pdev->irq,
-			mei_me_irq_quick_handler,
-			mei_me_irq_thread_handler,
-			irqflags, KBUILD_MODNAME, dev);
-
-	if (err) {
-		dev_err(&pdev->dev, "request_threaded_irq failed: irq = %d.\n",
-				pdev->irq);
-		return err;
-	}
-
 	err = mei_restart(dev);
 	if (err)
 		return err;
drivers/misc/mei/pci-txe.c +1 -26
index e1b90912..b8a49581 100644
@@ -240,9 +240,6 @@ static int mei_txe_pci_suspend(struct device *device)
 
 	mei_disable_interrupts(dev);
 
-	free_irq(pdev->irq, dev);
-	pci_disable_msi(pdev);
-
 	return 0;
 }
 
@@ -250,36 +247,14 @@ static int mei_txe_pci_resume(struct device *device)
 {
 	struct pci_dev *pdev = to_pci_dev(device);
 	struct mei_device *dev;
-	int err;
 
 	dev = pci_get_drvdata(pdev);
 	if (!dev)
 		return -ENODEV;
 
-	pci_enable_msi(pdev);
-
 	mei_clear_interrupts(dev);
 
-	/* request and enable interrupt */
-	if (pci_dev_msi_enabled(pdev))
-		err = request_threaded_irq(pdev->irq,
-			NULL,
-			mei_txe_irq_thread_handler,
-			IRQF_ONESHOT, KBUILD_MODNAME, dev);
-	else
-		err = request_threaded_irq(pdev->irq,
-			mei_txe_irq_quick_handler,
-			mei_txe_irq_thread_handler,
-			IRQF_SHARED, KBUILD_MODNAME, dev);
-	if (err) {
-		dev_err(&pdev->dev, "request_threaded_irq failed: irq = %d.\n",
-				pdev->irq);
-		return err;
-	}
-
-	err = mei_restart(dev);
-
-	return err;
+	return mei_restart(dev);
 }
 #endif /* CONFIG_PM_SLEEP */
 
Signature · 1 line
2.18.0
#2 lore raw

PATCH 2/3 mei: Migrate to pci_alloc_irq_vectors API

In reply to Heiner Kallweit

Update the driver to the pci_alloc_irq_vectors API, this allows to get rid of legacy calls like pci_enable_msi(). Another benefit is that no driver change would be needed in case the hardware starts supporting MSI-X.

---
 drivers/misc/mei/pci-me.c  | 25 +++++++++++--------------
 drivers/misc/mei/pci-txe.c | 30 ++++++++++++++----------------
 2 files changed, 25 insertions(+), 30 deletions(-)
drivers/misc/mei/pci-me.c +11 -14
index 55ba1c41..a60376f0 100644
@@ -149,7 +149,6 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	const struct mei_cfg *cfg;
 	struct mei_device *dev;
 	struct mei_me_hw *hw;
-	unsigned int irqflags;
 	int err;
 
 	cfg = mei_me_get_cfg(ent->driver_data);
@@ -196,18 +195,16 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	hw = to_me_hw(dev);
 	hw->mem_addr = pcim_iomap_table(pdev)[0];
 
-	pci_enable_msi(pdev);
-
-	 /* request and enable interrupt */
-	irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT : IRQF_SHARED;
+	err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
+	if (err < 0)
+		goto end;
 
-	err = request_threaded_irq(pdev->irq,
-			mei_me_irq_quick_handler,
-			mei_me_irq_thread_handler,
-			irqflags, KBUILD_MODNAME, dev);
+	/* request and enable interrupt */
+	err = pci_request_irq(pdev, 0, mei_me_irq_quick_handler,
+			      mei_me_irq_thread_handler, dev, KBUILD_MODNAME);
 	if (err) {
-		dev_err(&pdev->dev, "request_threaded_irq failure. irq = %d\n",
-		       pdev->irq);
+		pci_err(pdev, "pci_request_irq failure. irq = %d\n",
+			pci_irq_vector(pdev, 0));
 		goto end;
 	}
 
@@ -258,7 +255,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 release_irq:
 	mei_cancel_work(dev);
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 end:
 	dev_err(&pdev->dev, "initialization failed.\n");
 	return err;
@@ -287,7 +284,7 @@ static void mei_me_shutdown(struct pci_dev *pdev)
 	mei_me_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 }
 
 /**
@@ -316,7 +313,7 @@ static void mei_me_remove(struct pci_dev *pdev)
 
 	mei_disable_interrupts(dev);
 
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 
 	mei_deregister(dev);
 }
drivers/misc/mei/pci-txe.c +14 -16
index b8a49581..3ea2b8f6 100644
@@ -64,6 +64,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	struct mei_device *dev;
 	struct mei_txe_hw *hw;
+	irq_handler_t qh = NULL;
 	const int mask = BIT(SEC_BAR) | BIT(BRIDGE_BAR);
 	int err;
 
@@ -100,25 +101,22 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	hw = to_txe_hw(dev);
 	hw->mem_addr = pcim_iomap_table(pdev);
 
-	pci_enable_msi(pdev);
+	err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
+	if (err < 0)
+		goto end;
 
 	/* clear spurious interrupts */
 	mei_clear_interrupts(dev);
 
+	if (!pci_dev_msi_enabled(pdev))
+		qh = mei_txe_irq_quick_handler;
+
 	/* request and enable interrupt  */
-	if (pci_dev_msi_enabled(pdev))
-		err = request_threaded_irq(pdev->irq,
-			NULL,
-			mei_txe_irq_thread_handler,
-			IRQF_ONESHOT, KBUILD_MODNAME, dev);
-	else
-		err = request_threaded_irq(pdev->irq,
-			mei_txe_irq_quick_handler,
-			mei_txe_irq_thread_handler,
-			IRQF_SHARED, KBUILD_MODNAME, dev);
+	err = pci_request_irq(pdev, 0, qh, mei_txe_irq_thread_handler,
+			      dev, KBUILD_MODNAME);
 	if (err) {
-		dev_err(&pdev->dev, "mei: request_threaded_irq failure. irq = %d\n",
-			pdev->irq);
+		pci_err(pdev, "mei: pci_request_irq failure. irq = %d\n",
+			pci_irq_vector(pdev, 0));
 		goto end;
 	}
 
@@ -162,7 +160,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 release_irq:
 	mei_cancel_work(dev);
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 end:
 	dev_err(&pdev->dev, "initialization failed.\n");
 	return err;
@@ -191,7 +189,7 @@ static void mei_txe_shutdown(struct pci_dev *pdev)
 	mei_txe_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 }
 
 /**
@@ -219,7 +217,7 @@ static void mei_txe_remove(struct pci_dev *pdev)
 	mei_txe_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 
 	mei_deregister(dev);
 }
Signature · 1 line
2.18.0
#3 lore raw

RE: [PATCH 2/3] mei: Migrate to pci_alloc_irq_vectors API

Quoted 6 lines

Update the driver to the pci_alloc_irq_vectors API, this allows to get rid of legacy calls like pci_enable_msi(). Another benefit is that no driver change would be needed in case the hardware starts supporting MSI-X.

Sorry, we are losing the ONE_SHOT flag here, In spite that pci_enable_msi is marked as deprecated,
I don't see overall action on LKML to actually deprecate it.
For this change I would need to extensice testing on future and legacy devices, frankly I prefer not to dig into it right now. Thanks
Tomas

Quoted 158 lines
---
 drivers/misc/mei/pci-me.c  | 25 +++++++++++--------------
drivers/misc/mei/pci-txe.c | 30 ++++++++++++++----------------
 2 files changed, 25 insertions(+), 30 deletions(-)
drivers/misc/mei/pci-me.c index renamed from drivers/misc/mei/pci-me.c +0 -0

55ba1c41..a60376f0 100644

drivers/misc/mei/pci-me.c +0 -1
@@ -149,7 +149,6 @@ static int mei_me_probe(struct pci_dev *pdev, const
 struct pci_device_id *ent)
 	const struct mei_cfg *cfg;
 	struct mei_device *dev;
 	struct mei_me_hw *hw;
-	unsigned int irqflags;
 	int err;
 

cfg = mei_me_get_cfg(ent->driver_data); @@ -196,18 +195,16 @@
static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

drivers/misc/mei/pci-me.c +0 -4
 	hw = to_me_hw(dev);
 	hw->mem_addr = pcim_iomap_table(pdev)[0];
 
-	pci_enable_msi(pdev);
-
-	 /* request and enable interrupt */
-	irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT :

IRQF_SHARED;

drivers/misc/mei/pci-me.c +6 -4
+	err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
+	if (err < 0)
+		goto end;
 
-	err = request_threaded_irq(pdev->irq,
-			mei_me_irq_quick_handler,
-			mei_me_irq_thread_handler,
-			irqflags, KBUILD_MODNAME, dev);
+	/* request and enable interrupt */
+	err = pci_request_irq(pdev, 0, mei_me_irq_quick_handler,
+			      mei_me_irq_thread_handler, dev,

KBUILD_MODNAME);

drivers/misc/mei/pci-me.c +0 -1
 	if (err) {
-		dev_err(&pdev->dev, "request_threaded_irq failure. irq =

%d\n",

drivers/misc/mei/pci-me.c +3 -2
-		       pdev->irq);
+		pci_err(pdev, "pci_request_irq failure. irq = %d\n",
+			pci_irq_vector(pdev, 0));
 		goto end;
 	}
@@ -258,7 +255,7 @@ static int mei_me_probe(struct pci_dev *pdev, const
 struct pci_device_id *ent)
 release_irq:
 	mei_cancel_work(dev);
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 end:
 	dev_err(&pdev->dev, "initialization failed.\n");
drivers/misc/mei/pci-me.c +2 -2
 	return err;
@@ -287,7 +284,7 @@ static void mei_me_shutdown(struct pci_dev *pdev)
 	mei_me_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 }
 
 /**
@@ -316,7 +313,7 @@ static void mei_me_remove(struct pci_dev *pdev)
 
 	mei_disable_interrupts(dev);
 
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 
 	mei_deregister(dev);
 }
drivers/misc/mei/pci-txe.c index renamed from drivers/misc/mei/pci-txe.c +0 -0

b8a49581..3ea2b8f6 100644

drivers/misc/mei/pci-txe.c +11 -13
@@ -64,6 +64,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const
 struct pci_device_id *ent)  {
 	struct mei_device *dev;
 	struct mei_txe_hw *hw;
+	irq_handler_t qh = NULL;
 	const int mask = BIT(SEC_BAR) | BIT(BRIDGE_BAR);
 	int err;
 
@@ -100,25 +101,22 @@ static int mei_txe_probe(struct pci_dev *pdev,
 const struct pci_device_id *ent)
 	hw = to_txe_hw(dev);
 	hw->mem_addr = pcim_iomap_table(pdev);
 
-	pci_enable_msi(pdev);
+	err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
+	if (err < 0)
+		goto end;
 
 	/* clear spurious interrupts */
 	mei_clear_interrupts(dev);
 
+	if (!pci_dev_msi_enabled(pdev))
+		qh = mei_txe_irq_quick_handler;
+
 	/* request and enable interrupt  */
-	if (pci_dev_msi_enabled(pdev))
-		err = request_threaded_irq(pdev->irq,
-			NULL,
-			mei_txe_irq_thread_handler,
-			IRQF_ONESHOT, KBUILD_MODNAME, dev);
-	else
-		err = request_threaded_irq(pdev->irq,
-			mei_txe_irq_quick_handler,
-			mei_txe_irq_thread_handler,
-			IRQF_SHARED, KBUILD_MODNAME, dev);
+	err = pci_request_irq(pdev, 0, qh, mei_txe_irq_thread_handler,
+			      dev, KBUILD_MODNAME);
 	if (err) {
-		dev_err(&pdev->dev, "mei: request_threaded_irq failure. irq
 = %d\n",
-			pdev->irq);
+		pci_err(pdev, "mei: pci_request_irq failure. irq = %d\n",
+			pci_irq_vector(pdev, 0));
 		goto end;
drivers/misc/mei/pci-txe.c +1 -1
 	}
@@ -162,7 +160,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const
 struct pci_device_id *ent)
 release_irq:
 	mei_cancel_work(dev);
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 end:
 	dev_err(&pdev->dev, "initialization failed.\n");
drivers/misc/mei/pci-txe.c +2 -3
 	return err;
@@ -191,7 +189,7 @@ static void mei_txe_shutdown(struct pci_dev *pdev)
 	mei_txe_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 }
 
 /**
@@ -219,7 +217,7 @@ static void mei_txe_remove(struct pci_dev *pdev)
 	mei_txe_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 
 	mei_deregister(dev);
 }
--

2.18.0

#4 lore raw

Re: [PATCH 2/3] mei: Migrate to pci_alloc_irq_vectors API

Quoted 8 lines · Tomas
Quoted 6 lines

Update the driver to the pci_alloc_irq_vectors API, this allows to get rid of legacy calls like pci_enable_msi(). Another benefit is that no driver change would be needed in case the hardware starts supporting MSI-X.

Sorry, we are losing the ONE_SHOT flag here, In spite that pci_enable_msi is marked as deprecated,

ONE_SHOT flag isn't needed here. See commit f7368a550275 ("PCI: Use IRQF_ONESHOT if pci_request_irq() called with no handler") and also following comment in __setup_irq():

* Drivers are often written to work w/o knowledge about the
* underlying irq chip implementation, so a request for a
* threaded irq without a primary hard irq context handler
* requires the ONESHOT flag to be set. Some irq chips like
* MSI based interrupts are per se one shot safe. Check the
* chip flags, so we can avoid the unmask dance at the end of
* the threaded handler for those.

Quoted 2 lines

I don't see overall action on LKML to actually deprecate it.
For this change I would need to extensice testing on future and legacy devices, frankly I prefer not to dig into it right now.

Sure, up to you.

Quoted 3 lines

Thanks
Tomas

Rgds, Heiner

Quoted 159 lines
Quoted 158 lines
---
 drivers/misc/mei/pci-me.c  | 25 +++++++++++--------------
drivers/misc/mei/pci-txe.c | 30 ++++++++++++++----------------
 2 files changed, 25 insertions(+), 30 deletions(-)
drivers/misc/mei/pci-me.c index renamed from drivers/misc/mei/pci-me.c +0 -0

55ba1c41..a60376f0 100644

drivers/misc/mei/pci-me.c +0 -1
@@ -149,7 +149,6 @@ static int mei_me_probe(struct pci_dev *pdev, const
 struct pci_device_id *ent)
 	const struct mei_cfg *cfg;
 	struct mei_device *dev;
 	struct mei_me_hw *hw;
-	unsigned int irqflags;
 	int err;
 

cfg = mei_me_get_cfg(ent->driver_data); @@ -196,18 +195,16 @@
static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

drivers/misc/mei/pci-me.c +0 -4
 	hw = to_me_hw(dev);
 	hw->mem_addr = pcim_iomap_table(pdev)[0];
 
-	pci_enable_msi(pdev);
-
-	 /* request and enable interrupt */
-	irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT :

IRQF_SHARED;

drivers/misc/mei/pci-me.c +6 -4
+	err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
+	if (err < 0)
+		goto end;
 
-	err = request_threaded_irq(pdev->irq,
-			mei_me_irq_quick_handler,
-			mei_me_irq_thread_handler,
-			irqflags, KBUILD_MODNAME, dev);
+	/* request and enable interrupt */
+	err = pci_request_irq(pdev, 0, mei_me_irq_quick_handler,
+			      mei_me_irq_thread_handler, dev,

KBUILD_MODNAME);

drivers/misc/mei/pci-me.c +0 -1
 	if (err) {
-		dev_err(&pdev->dev, "request_threaded_irq failure. irq =

%d\n",

drivers/misc/mei/pci-me.c +3 -2
-		       pdev->irq);
+		pci_err(pdev, "pci_request_irq failure. irq = %d\n",
+			pci_irq_vector(pdev, 0));
 		goto end;
 	}
@@ -258,7 +255,7 @@ static int mei_me_probe(struct pci_dev *pdev, const
 struct pci_device_id *ent)
 release_irq:
 	mei_cancel_work(dev);
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 end:
 	dev_err(&pdev->dev, "initialization failed.\n");
drivers/misc/mei/pci-me.c +2 -2
 	return err;
@@ -287,7 +284,7 @@ static void mei_me_shutdown(struct pci_dev *pdev)
 	mei_me_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 }
 
 /**
@@ -316,7 +313,7 @@ static void mei_me_remove(struct pci_dev *pdev)
 
 	mei_disable_interrupts(dev);
 
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 
 	mei_deregister(dev);
 }
drivers/misc/mei/pci-txe.c index renamed from drivers/misc/mei/pci-txe.c +0 -0

b8a49581..3ea2b8f6 100644

drivers/misc/mei/pci-txe.c +11 -13
@@ -64,6 +64,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const
 struct pci_device_id *ent)  {
 	struct mei_device *dev;
 	struct mei_txe_hw *hw;
+	irq_handler_t qh = NULL;
 	const int mask = BIT(SEC_BAR) | BIT(BRIDGE_BAR);
 	int err;
 
@@ -100,25 +101,22 @@ static int mei_txe_probe(struct pci_dev *pdev,
 const struct pci_device_id *ent)
 	hw = to_txe_hw(dev);
 	hw->mem_addr = pcim_iomap_table(pdev);
 
-	pci_enable_msi(pdev);
+	err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
+	if (err < 0)
+		goto end;
 
 	/* clear spurious interrupts */
 	mei_clear_interrupts(dev);
 
+	if (!pci_dev_msi_enabled(pdev))
+		qh = mei_txe_irq_quick_handler;
+
 	/* request and enable interrupt  */
-	if (pci_dev_msi_enabled(pdev))
-		err = request_threaded_irq(pdev->irq,
-			NULL,
-			mei_txe_irq_thread_handler,
-			IRQF_ONESHOT, KBUILD_MODNAME, dev);
-	else
-		err = request_threaded_irq(pdev->irq,
-			mei_txe_irq_quick_handler,
-			mei_txe_irq_thread_handler,
-			IRQF_SHARED, KBUILD_MODNAME, dev);
+	err = pci_request_irq(pdev, 0, qh, mei_txe_irq_thread_handler,
+			      dev, KBUILD_MODNAME);
 	if (err) {
-		dev_err(&pdev->dev, "mei: request_threaded_irq failure. irq
 = %d\n",
-			pdev->irq);
+		pci_err(pdev, "mei: pci_request_irq failure. irq = %d\n",
+			pci_irq_vector(pdev, 0));
 		goto end;
drivers/misc/mei/pci-txe.c +1 -1
 	}
@@ -162,7 +160,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const
 struct pci_device_id *ent)
 release_irq:
 	mei_cancel_work(dev);
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 end:
 	dev_err(&pdev->dev, "initialization failed.\n");
drivers/misc/mei/pci-txe.c +2 -3
 	return err;
@@ -191,7 +189,7 @@ static void mei_txe_shutdown(struct pci_dev *pdev)
 	mei_txe_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 }
 
 /**
@@ -219,7 +217,7 @@ static void mei_txe_remove(struct pci_dev *pdev)
 	mei_txe_unset_pm_domain(dev);
 
 	mei_disable_interrupts(dev);
-	free_irq(pdev->irq, dev);
+	pci_free_irq(pdev, 0, dev);
 
 	mei_deregister(dev);
 }
--

2.18.0

#5 lore raw

PATCH 3/3 mei: Improve usage of mei_start

In reply to Heiner Kallweit

mei_start() prints an error message and returns -ENODEV on failure, so we don't have to duplicate this in the caller.

---
 drivers/misc/mei/pci-me.c  | 6 ++----
 drivers/misc/mei/pci-txe.c | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/misc/mei/pci-me.c +2 -4
index a60376f0..02ba830a 100644
@@ -208,11 +208,9 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		goto end;
 	}
 
-	if (mei_start(dev)) {
-		dev_err(&pdev->dev, "init hw failure.\n");
-		err = -ENODEV;
+	err = mei_start(dev);
+	if (err)
 		goto release_irq;
-	}
 
 	pm_runtime_set_autosuspend_delay(&pdev->dev, MEI_ME_RPM_TIMEOUT);
 	pm_runtime_use_autosuspend(&pdev->dev);
drivers/misc/mei/pci-txe.c +2 -4
index 3ea2b8f6..901574be 100644
@@ -120,11 +120,9 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		goto end;
 	}
 
-	if (mei_start(dev)) {
-		dev_err(&pdev->dev, "init hw failure.\n");
-		err = -ENODEV;
+	err = mei_start(dev);
+	if (err)
 		goto release_irq;
-	}
 
 	pm_runtime_set_autosuspend_delay(&pdev->dev, MEI_TXI_RPM_TIMEOUT);
 	pm_runtime_use_autosuspend(&pdev->dev);
Signature · 1 line
2.18.0