Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932306Ab0FGHhn (ORCPT ); Mon, 7 Jun 2010 03:37:43 -0400 Received: from smtprelay04.ispgateway.de ([80.67.31.42]:51180 "EHLO smtprelay04.ispgateway.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932194Ab0FGHhm (ORCPT ); Mon, 7 Jun 2010 03:37:42 -0400 Message-ID: <4C0CA170.70003@ladisch.de> Date: Mon, 07 Jun 2010 09:36:16 +0200 From: Clemens Ladisch User-Agent: Thunderbird 2.0.0.24 (Windows/20100228) MIME-Version: 1.0 To: Neela Syam Kolli CC: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] megaraid_sas: enable message-signaled interrupts Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Df-Sender: linux-kernel@cl.domainfactory-kunde.de Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2603 Lines: 84 To avoid sharing interrupts, enable message-signaled interrupts, if possible. Tested with LSI 9260-8i/8e, where sharing the interrupt with the nvidia driver would reduce the RAID performance. Signed-off-by: Clemens Ladisch Tested-by: Bert dd --- drivers/scsi/megaraid/megaraid_sas.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c @@ -3169,10 +3169,14 @@ megasas_probe_one(struct pci_dev *pdev, if (megasas_init_mfi(instance)) goto fail_init_mfi; + pci_enable_msi(pdev); + /* * Register IRQ */ - if (request_irq(pdev->irq, megasas_isr, IRQF_SHARED, "megasas", instance)) { + if (request_irq(pdev->irq, megasas_isr, + pci_dev_msi_enabled(pdev) ? 0 : IRQF_SHARED, + "megasas", instance)) { printk(KERN_DEBUG "megasas: Failed to register IRQ\n"); goto fail_irq; } @@ -3222,6 +3226,8 @@ megasas_probe_one(struct pci_dev *pdev, megasas_release_mfi(instance); fail_irq: + pci_disable_msi(pdev); + fail_init_mfi: fail_alloc_dma_buf: if (instance->evt_detail) @@ -3354,6 +3360,7 @@ megasas_suspend(struct pci_dev *pdev, pm pci_set_drvdata(instance->pdev, instance); instance->instancet->disable_intr(instance->reg_set); free_irq(instance->pdev->irq, instance); + pci_disable_msi(pdev); pci_save_state(pdev); pci_disable_device(pdev); @@ -3416,10 +3423,13 @@ megasas_resume(struct pci_dev *pdev) tasklet_init(&instance->isr_tasklet, megasas_complete_cmd_dpc, (unsigned long)instance); + pci_enable_msi(pdev); + /* * Register IRQ */ - if (request_irq(pdev->irq, megasas_isr, IRQF_SHARED, + if (request_irq(pdev->irq, megasas_isr, + pci_dev_msi_enabled(pdev) ? 0 : IRQF_SHARED, "megasas", instance)) { printk(KERN_ERR "megasas: Failed to register IRQ\n"); goto fail_irq; @@ -3443,6 +3453,8 @@ megasas_resume(struct pci_dev *pdev) return 0; fail_irq: + pci_disable_msi(pdev); + fail_init_mfi: if (instance->evt_detail) pci_free_consistent(pdev, sizeof(struct megasas_evt_detail), @@ -3519,6 +3531,7 @@ static void __devexit megasas_detach_one instance->instancet->disable_intr(instance->reg_set); free_irq(instance->pdev->irq, instance); + pci_disable_msi(pdev); megasas_release_mfi(instance); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/