From patchwork Wed Jun 3 11:49:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Stankiewicz X-Patchwork-Id: 218019 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF2A7C433E0 for ; Wed, 3 Jun 2020 11:49:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A7E220674 for ; Wed, 3 Jun 2020 11:49:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726295AbgFCLtg (ORCPT ); Wed, 3 Jun 2020 07:49:36 -0400 Received: from mga14.intel.com ([192.55.52.115]:5555 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726084AbgFCLtd (ORCPT ); Wed, 3 Jun 2020 07:49:33 -0400 IronPort-SDR: pkBmDH6Lh5c/BfbK372q975zKEn3O0EGP358uofZZElXzQG0fHmVtiU8VwVq1vA+6WDgyVaEnm Av7dn1nGdaog== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 04:49:33 -0700 IronPort-SDR: nPxzuBUZbHQWLxtcEGnSgrGBDV8wzTM/pV+RSw0f7UOv6UpMkpEV8ogLbXHQYHkq5lpCK00hqS Wlq7vc1r/Z3A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,467,1583222400"; d="scan'208";a="304582926" Received: from gklab-125-110.igk.intel.com ([10.91.125.110]) by orsmga008.jf.intel.com with ESMTP; 03 Jun 2020 04:49:30 -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 v2 12/15] amd-xgbe: Use PCI_IRQ_MSI_TYPES where appropriate Date: Wed, 3 Jun 2020 13:49:24 +0200 Message-Id: <20200603114925.13706-1-piotr.stankiewicz@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200603114212.12525-1-piotr.stankiewicz@intel.com> References: <20200603114212.12525-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 Wed Jun 3 11:49:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Stankiewicz X-Patchwork-Id: 218018 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0EB5C433E1 for ; Wed, 3 Jun 2020 11:50:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C969420738 for ; Wed, 3 Jun 2020 11:50:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726364AbgFCLuK (ORCPT ); Wed, 3 Jun 2020 07:50:10 -0400 Received: from mga14.intel.com ([192.55.52.115]:5625 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725959AbgFCLuJ (ORCPT ); Wed, 3 Jun 2020 07:50:09 -0400 IronPort-SDR: 5n0TzM5hZlLd+qoq2uDEZn6zW0GFs9BYAfnQyufdqc5byc7DcETsNiJkGidmTXO6TGLJRPWHmi 3GNlMhlCbo5g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2020 04:50:09 -0700 IronPort-SDR: rjz6sjJuksB3FUZFHwtSPCFgTQNaTjuyYCffhA9Yy2klRAHJrhXomb/NmttnOhBsQYTp+FpgPr R1Bs52peKK2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,467,1583222400"; d="scan'208";a="416538253" Received: from gklab-125-110.igk.intel.com ([10.91.125.110]) by orsmga004.jf.intel.com with ESMTP; 03 Jun 2020 04:50:05 -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 , Yunsheng Lin , Guojia Liao , Yufeng Mo , Yonglong Liu , Guangbin Huang , Weihang Li , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 14/15] net: hns3: Use PCI_IRQ_MSI_TYPES where appropriate Date: Wed, 3 Jun 2020 13:49:59 +0200 Message-Id: <20200603115002.13874-1-piotr.stankiewicz@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200603114212.12525-1-piotr.stankiewicz@intel.com> References: <20200603114212.12525-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 a758f9ae32be..c49313e87170 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -2334,8 +2334,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 e02d427131ee..2b02024bd00a 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -2341,8 +2341,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,