From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 7AAD0101B for ; Mon, 4 Sep 2017 23:32:56 +0200 (CEST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP; 04 Sep 2017 14:32:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,476,1498546800"; d="scan'208";a="125510442" Received: from ewright1-mobl3.ger.corp.intel.com (HELO [10.252.24.105]) ([10.252.24.105]) by orsmga004.jf.intel.com with ESMTP; 04 Sep 2017 14:32:54 -0700 To: Markus Theil , dev@dpdk.org Cc: stephen@networkplumber.org, nicolas.dichtel@6wind.com References: <1503336825-7700-1-git-send-email-markus.theil@tu-ilmenau.de> <1504549066-11067-1-git-send-email-markus.theil@tu-ilmenau.de> <1504549066-11067-2-git-send-email-markus.theil@tu-ilmenau.de> From: Ferruh Yigit Message-ID: <4bfac191-103f-54c8-3ffc-f094ec6f8f44@intel.com> Date: Mon, 4 Sep 2017 22:32:53 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <1504549066-11067-2-git-send-email-markus.theil@tu-ilmenau.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v6 2/5] igb_uio: fix irq disable on recent kernels X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2017 21:32:56 -0000 On 9/4/2017 7:17 PM, Markus Theil wrote: > igb_uio already allocates irqs using pci_alloc_irq_vectors on > recent kernels >= 4.8. The interrupt disable code was not > using the corresponding pci_free_irq_vectors, but the also > deprecated pci_disable_msix, before this fix. > > Fixes: 99bb58f3adc7 ("igb_uio: switch to new irq function for MSI-X") > Cc: nicolas.dichtel@6wind.com > > Signed-off-by: Markus Theil <...> > -#ifdef HAVE_PCI_ENABLE_MSIX > +#ifndef HAVE_ALLOC_IRQ_VECTORS > msix_entry.entry = 0; > if (pci_enable_msix(udev->pdev, &msix_entry, 1) == 0) { > dev_dbg(&udev->pdev->dev, "using MSI-X"); > - udev->info.irq_flags = IRQF_NO_THREAD; This and below one [1] seems merge artifact, needs to be removed from this patch. > udev->info.irq = msix_entry.vector; > udev->mode = RTE_INTR_MODE_MSIX; > break; > @@ -331,6 +330,7 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) > #else > if (pci_alloc_irq_vectors(udev->pdev, 1, 1, PCI_IRQ_MSIX) == 1) { > dev_dbg(&udev->pdev->dev, "using MSI-X"); > + udev->info.irq_flags = IRQF_NO_THREAD; [1] > udev->info.irq = pci_irq_vector(udev->pdev, 0); > udev->mode = RTE_INTR_MODE_MSIX; > break; <...>