From patchwork Tue Jun 9 09:19:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Stankiewicz, Piotr" X-Patchwork-Id: 1305738 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49h4Mb71Nwz9sT6 for ; Tue, 9 Jun 2020 19:19:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728505AbgFIJTx (ORCPT ); Tue, 9 Jun 2020 05:19:53 -0400 Received: from mga18.intel.com ([134.134.136.126]:53795 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728104AbgFIJTw (ORCPT ); Tue, 9 Jun 2020 05:19:52 -0400 IronPort-SDR: CCCyd6ge4JTct5mqBCco3IEyVY/O3OE0GCmNqFHl17jxdmdgtljzuFUOqicd64rd6SDZx3qbwG 67Y/ORGcyU+Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2020 02:19:50 -0700 IronPort-SDR: nKC6WcbWsw8TySdN5S4WHT+U3YQ4/B27fMHIrG8Ln/pRt5+fQNR3Xb6pko33juIgZ8JQdhQwW1 g457lWNzuuLg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,491,1583222400"; d="scan'208";a="349462010" Received: from gklab-125-110.igk.intel.com ([10.91.125.110]) by orsmga001.jf.intel.com with ESMTP; 09 Jun 2020 02:19:47 -0700 From: Piotr Stankiewicz To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: Piotr Stankiewicz , Tom Lendacky , "David S. Miller" , Jakub Kicinski , Andy Shevchenko , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 12/15] amd-xgbe: Use PCI_IRQ_MSI_TYPES where appropriate Date: Tue, 9 Jun 2020 11:19:42 +0200 Message-Id: <20200609091944.1764-1-piotr.stankiewicz@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200609091148.32749-1-piotr.stankiewicz@intel.com> References: <20200609091148.32749-1-piotr.stankiewicz@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Seeing as there is shorthand available to use when asking for any type of interrupt, or any type of message signalled interrupt, leverage it. Signed-off-by: Piotr Stankiewicz Reviewed-by: Andy Shevchenko --- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c index 7b86240ecd5f..903bc5ef2518 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c @@ -133,7 +133,7 @@ static int xgbe_config_multi_msi(struct xgbe_prv_data *pdata) pdata->tx_ring_count); ret = pci_alloc_irq_vectors(pdata->pcidev, XGBE_MSI_MIN_COUNT, - vector_count, PCI_IRQ_MSI | PCI_IRQ_MSIX); + vector_count, PCI_IRQ_MSI_TYPES); if (ret < 0) { dev_info(pdata->dev, "multi MSI/MSI-X enablement failed\n"); return ret; From patchwork Tue Jun 9 09:19:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Stankiewicz, Piotr" X-Patchwork-Id: 1305741 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49h4Mv4zp4z9sTG for ; Tue, 9 Jun 2020 19:20:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728532AbgFIJUI (ORCPT ); Tue, 9 Jun 2020 05:20:08 -0400 Received: from mga03.intel.com ([134.134.136.65]:4211 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728366AbgFIJUG (ORCPT ); Tue, 9 Jun 2020 05:20:06 -0400 IronPort-SDR: eSzPCfAw95JgzxfNEMqpUVKAi/1wlTzgsW98wFkvK6XPy/bJJVd0xne+8IE2YzjM0tnP+Iocp1 0GWsxaYbZ4eA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2020 02:20:05 -0700 IronPort-SDR: tH4aESQr2kjh3PumuZ2O4pBFFXpYcCtUDsaeyIMleu7QYvVlCAiYJvMdkRL7VE+EhbM91smRfY MeRa8BLORonA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,491,1583222400"; d="scan'208";a="379687004" Received: from gklab-125-110.igk.intel.com ([10.91.125.110]) by fmsmga001.fm.intel.com with ESMTP; 09 Jun 2020 02:20:02 -0700 From: Piotr Stankiewicz To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: Piotr Stankiewicz , Igor Russkikh , "David S. Miller" , Jakub Kicinski , Nikita Danilov , Mark Starovoytov , Dmitry Bogdanov , Richard Clark , zhengbin , Pavel Belous , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 13/15] aquantia: atlantic: Use PCI_IRQ_ALL_TYPES where appropriate Date: Tue, 9 Jun 2020 11:19:59 +0200 Message-Id: <20200609092000.1850-1-piotr.stankiewicz@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200609091148.32749-1-piotr.stankiewicz@intel.com> References: <20200609091148.32749-1-piotr.stankiewicz@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Seeing as there is shorthand available to use when asking for any type of interrupt, or any type of message signalled interrupt, leverage it. Signed-off-by: Piotr Stankiewicz Reviewed-by: Andy Shevchenko --- drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c index 41c0f560f95b..bc228be9f0a3 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c @@ -299,9 +299,7 @@ static int aq_pci_probe(struct pci_dev *pdev, numvecs += AQ_HW_SERVICE_IRQS; /*enable interrupts */ #if !AQ_CFG_FORCE_LEGACY_INT - err = pci_alloc_irq_vectors(self->pdev, 1, numvecs, - PCI_IRQ_MSIX | PCI_IRQ_MSI | - PCI_IRQ_LEGACY); + err = pci_alloc_irq_vectors(self->pdev, 1, numvecs, PCI_IRQ_ALL_TYPES); if (err < 0) goto err_hwinit; From patchwork Tue Jun 9 09:20:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Stankiewicz, Piotr" X-Patchwork-Id: 1305743 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49h4NY00Pqz9sT5 for ; Tue, 9 Jun 2020 19:20:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728549AbgFIJUk (ORCPT ); Tue, 9 Jun 2020 05:20:40 -0400 Received: from mga09.intel.com ([134.134.136.24]:23910 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728366AbgFIJUi (ORCPT ); Tue, 9 Jun 2020 05:20:38 -0400 IronPort-SDR: 8PVx+Od/G2YqBsmUsCnrFBVcpEXbK9Oq367CVfjxRWMUg6bwprzo8l5qVyfc3C4JDiZbkSIDqq KCh/GrTjf57g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2020 02:20:38 -0700 IronPort-SDR: ujF+fLce9SfdyD/evCQB6C/gD70o//xldOuQ1v7euwcjTLiJVaRuJr8VDfdx3GBfc2hoaEm6i8 EkaGqXWSjAYw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,491,1583222400"; d="scan'208";a="295775952" Received: from gklab-125-110.igk.intel.com ([10.91.125.110]) by fmsmga004.fm.intel.com with ESMTP; 09 Jun 2020 02:20:34 -0700 From: Piotr Stankiewicz To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: Piotr Stankiewicz , Yisen Zhuang , Salil Mehta , "David S. Miller" , Jakub Kicinski , Huazhong Tan , Peng Li , Jian Shen , Guojia Liao , Yufeng Mo , Yonglong Liu , Guangbin Huang , Yunsheng Lin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 14/15] net: hns3: Use PCI_IRQ_MSI_TYPES where appropriate Date: Tue, 9 Jun 2020 11:20:29 +0200 Message-Id: <20200609092033.1944-1-piotr.stankiewicz@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200609091148.32749-1-piotr.stankiewicz@intel.com> References: <20200609091148.32749-1-piotr.stankiewicz@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Seeing as there is shorthand available to use when asking for any type of interrupt, or any type of message signalled interrupt, leverage it. Signed-off-by: Piotr Stankiewicz Reviewed-by: Andy Shevchenko --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +-- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 96bfad52630d..535d9f4a31f5 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -2327,8 +2327,7 @@ static int hclge_init_msi(struct hclge_dev *hdev) int i; vectors = pci_alloc_irq_vectors(pdev, HNAE3_MIN_VECTOR_NUM, - hdev->num_msi, - PCI_IRQ_MSI | PCI_IRQ_MSIX); + hdev->num_msi, PCI_IRQ_MSI_TYPES); if (vectors < 0) { dev_err(&pdev->dev, "failed(%d) to allocate MSI/MSI-X vectors\n", diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index 1b9578d0bd80..fbfd4e7b2817 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -2608,8 +2608,7 @@ static int hclgevf_init_msi(struct hclgevf_dev *hdev) PCI_IRQ_MSIX); else vectors = pci_alloc_irq_vectors(pdev, HNAE3_MIN_VECTOR_NUM, - hdev->num_msi, - PCI_IRQ_MSI | PCI_IRQ_MSIX); + hdev->num_msi, PCI_IRQ_MSI_TYPES); if (vectors < 0) { dev_err(&pdev->dev,