From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752225AbdJFNdh (ORCPT ); Fri, 6 Oct 2017 09:33:37 -0400 Received: from mx-relay08-hz1.antispameurope.com ([94.100.132.208]:52798 "EHLO mx-relay08-hz1.antispameurope.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751663AbdJFNdg (ORCPT ); Fri, 6 Oct 2017 09:33:36 -0400 From: "Stahl, Manuel" To: "linux-kernel@vger.kernel.org" CC: "hjk@linutronix.de" , "devel@driverdev.osuosl.org" , "gregkh@linuxfoundation.org" , "sojkam1@fel.cvut.cz" Subject: [PATCH 2/2] uio: Prefer MSI(X) interrupts in PCI drivers Thread-Topic: [PATCH 2/2] uio: Prefer MSI(X) interrupts in PCI drivers Thread-Index: AQHTPqezaJBRWyTusUqDHzT7+nTxIQ== Date: Fri, 6 Oct 2017 13:33:32 +0000 Message-ID: <1507296804.2915.16.camel@iis-extern.fraunhofer.de> References: <1507296707.2915.14.camel@iis-extern.fraunhofer.de> In-Reply-To: <1507296707.2915.14.camel@iis-extern.fraunhofer.de> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [153.96.171.210] Content-Type: text/plain; charset="utf-8" Content-ID: <2EC510F1BFB20044B3A1CAAE327123F0@iis.fhg.de> MIME-Version: 1.0 X-cloud-security-sender: manuel.stahl@iis-extern.fraunhofer.de X-cloud-security-recipient: linux-kernel@vger.kernel.org X-cloud-security-crypt: load encryption module X-cloud-security-Virusscan: CLEAN X-cloud-security-disclaimer: This E-Mail was scanned by E-Mailservice on mx-relay08-hz1.antispameurope.com with CC652100578 X-cloud-security-connect: mailgw1.iis.fraunhofer.de[153.96.172.4], TLS=1, IP=153.96.172.4 X-cloud-security: scantime:.1195 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by nfs id v96DXhSh027318 Signed-off-by: Manuel Stahl ---  drivers/uio/uio_pci_dmem_genirq.c | 27 ++++++++++++++++++++-------  drivers/uio/uio_pci_generic.c     | 24 ++++++++++++++++++------  2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/drivers/uio/uio_pci_dmem_genirq.c b/drivers/uio/uio_pci_dmem_genirq.c index d1dfd8002c6d..ebb3f9012cd8 100644 --- a/drivers/uio/uio_pci_dmem_genirq.c +++ b/drivers/uio/uio_pci_dmem_genirq.c @@ -173,11 +173,13 @@ static irqreturn_t irqhandler(int irq, struct uio_info *info)  {   struct uio_pci_dmem_dev *gdev = to_uio_pci_dmem_dev(info);   - if (!pci_check_and_mask_intx(gdev->pdev)) - return IRQ_NONE; + if (gdev->pdev->msi_enabled || gdev->pdev->msix_enabled) + return IRQ_HANDLED;   - /* UIO core will signal the user process. */ - return IRQ_HANDLED; + if (pci_check_and_mask_intx(gdev->pdev)) + return IRQ_HANDLED; + + return IRQ_NONE;  }    static unsigned int uio_dmem_dma_bits = 32; @@ -269,11 +271,19 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *id)   }   pci_set_master(pdev);   - dev_info(&pdev->dev, "Legacy IRQ: %i", pdev->irq); - if (pdev->irq && !pci_intx_mask_supported(pdev)) { - err = -ENODEV; + /* Try to use MSI interrupts */ + err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES); + if (err) { + dev_err(&pdev->dev, "%s: pci_alloc_irq_vectors failed: %d\n", + __func__, err);   goto err_disable_pci;   } + if (!pdev->msi_enabled && !pdev->msix_enabled && +     !pci_intx_mask_supported(pdev)) { + err = -ENODEV; + goto err_free_irq_vectors; + } + dev_info(&pdev->dev, "IRQ: %i", pdev->irq);     gdev = kzalloc(sizeof(*gdev), GFP_KERNEL);   if (!gdev) { @@ -316,6 +326,8 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *id)   return 0;  err_free_gdev:   kfree(gdev); +err_free_irq_vectors: + pci_free_irq_vectors(pdev);  err_disable_pci:   pci_clear_master(pdev);   pci_disable_device(pdev); @@ -327,6 +339,7 @@ static void remove(struct pci_dev *pdev)   struct uio_pci_dmem_dev *gdev = pci_get_drvdata(pdev);     uio_unregister_device(&gdev->info); + pci_free_irq_vectors(pdev);   pci_clear_master(pdev);   pci_disable_device(pdev);   kfree(gdev); diff --git a/drivers/uio/uio_pci_generic.c b/drivers/uio/uio_pci_generic.c index a56fdf972dbe..23a800e76303 100644 --- a/drivers/uio/uio_pci_generic.c +++ b/drivers/uio/uio_pci_generic.c @@ -46,11 +46,13 @@ static irqreturn_t irqhandler(int irq, struct uio_info *info)  {   struct uio_pci_generic_dev *gdev = to_uio_pci_generic_dev(info);   - if (!pci_check_and_mask_intx(gdev->pdev)) - return IRQ_NONE; + if (gdev->pdev->msi_enabled || gdev->pdev->msix_enabled) + return IRQ_HANDLED;   - /* UIO core will signal the user process. */ - return IRQ_HANDLED; + if (pci_check_and_mask_intx(gdev->pdev)) + return IRQ_HANDLED; + + return IRQ_NONE;  }    static int probe(struct pci_dev *pdev, @@ -66,10 +68,18 @@ static int probe(struct pci_dev *pdev,   return err;   }   - if (pdev->irq && !pci_intx_mask_supported(pdev)) { - err = -ENODEV; + /* Try to use MSI interrupts */ + err = pci_alloc_irq_vectors(pdev, 0, 1, PCI_IRQ_ALL_TYPES); + if (err) { + dev_err(&pdev->dev, "%s: pci_alloc_irq_vectors failed: %d\n", + __func__, err);   goto err_verify;   } + if (pdev->irq && !pdev->msi_enabled && !pdev->msix_enabled && +     !pci_intx_mask_supported(pdev)) { + err = -ENODEV; + goto err_alloc; + }     gdev = kzalloc(sizeof(struct uio_pci_generic_dev), GFP_KERNEL);   if (!gdev) { @@ -98,6 +108,7 @@ static int probe(struct pci_dev *pdev,  err_register:   kfree(gdev);  err_alloc: + pci_free_irq_vectors(pdev);  err_verify:   pci_disable_device(pdev);   return err; @@ -108,6 +119,7 @@ static void remove(struct pci_dev *pdev)   struct uio_pci_generic_dev *gdev = pci_get_drvdata(pdev);     uio_unregister_device(&gdev->info); + pci_free_irq_vectors(pdev);   pci_disable_device(pdev);   kfree(gdev);  } --  2.11.0