From patchwork Mon Jun 7 15:39:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 12303921 X-Patchwork-Delegate: bhelgaas@google.com 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 D5E20C47094 for ; Mon, 7 Jun 2021 15:39:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B407F6102A for ; Mon, 7 Jun 2021 15:39:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230444AbhFGPlT (ORCPT ); Mon, 7 Jun 2021 11:41:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230288AbhFGPlQ (ORCPT ); Mon, 7 Jun 2021 11:41:16 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1C64C061766; Mon, 7 Jun 2021 08:39:25 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id q25so13370577pfh.7; Mon, 07 Jun 2021 08:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1qWmsBn3DHLWFicfHvWSdPqQJ4x1w0Cu4gQfUXued6o=; b=sOkr7iBNjE+vz91eEF/rhlqAaOH6eyHAGwjf//QS+VLNukkUUC9vTtZsyYLP2SDFGt 7H+N3IGdudDHIiBwaBBO+nSA7HO47sgYJmg/hhAmrfgqspauPTQDhMb3LpZszlZ5MwGo 1hJdZiC5BA8riPfLwKgyv/UxUzhKwcGXm/J6zki8JkeGJJKQqT1BpROhJMK04jmPwVOy K4MzHMv4AU/6TqS/ICGb/Cv+3v62HS+AN3CbM0xpAiSp1Indk0qarLKipPbgHXDkn4yy rNyUOJnxLxZ7bL7QFf/CCYQE8tdXQepv4huenrxH+pSlI56nRF9ikd+cikC5I5B8Dvow VHEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1qWmsBn3DHLWFicfHvWSdPqQJ4x1w0Cu4gQfUXued6o=; b=lkK/ztMMihDtpkksjTs7F+4WAg79ESyXXrtCXbRdtz+GYEnaBGkawMkZZ2a983Ecp9 I8Y3kvhWboEJ+u7ckIrrhtRaQXq4y2e9oopp05qLYWib111LeLGTIzKCoI6wM0VNoQqC 2rctj4UbOHx4N+mvV/y1VJQx1HW0Ue7JK6yK1rRO1TryWP0oqjAOq00a7VQ6tuytDMEg xeMYBBrUmgABHoFep7UgQSCJ6vrVdqNwIm8EyNKR0gz8XJCK2JCpNiP4NIfHPJfKzBQN J4+uTAMPLC56qBoNjPJSTHEPJhyAfMf3L3Ssdcmt7oDCcwtu+w+CQqXGbJk7m1obMt7s E7JA== X-Gm-Message-State: AOAM533mkgvjJ6XclybePZlYsk4eWgCt++HPqJoiFz9fsr23JOa6SvbY ZFhuzK4vvCtZcdU+jXIQi3s= X-Google-Smtp-Source: ABdhPJywk0ki2Mf7M8gkjyeC+mZH2KJFnVW7YhWrUtaPbwW8nSbJaNWHUR3mGoGsw7F4R69wIEg6fg== X-Received: by 2002:a63:d452:: with SMTP id i18mr18584942pgj.0.1623080365259; Mon, 07 Jun 2021 08:39:25 -0700 (PDT) Received: from localhost (185.212.56.112.16clouds.com. [185.212.56.112]) by smtp.gmail.com with ESMTPSA id u10sm2292154pfh.123.2021.06.07.08.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 08:39:24 -0700 (PDT) From: Dejin Zheng To: helgaas@kernel.org, corbet@lwn.net, jarkko.nikula@linux.intel.com, andriy.shevchenko@linux.intel.com, mika.westerberg@linux.intel.com, rric@kernel.org, bhelgaas@google.com, wsa@kernel.org, Sanket.Goswami@amd.com, linux-doc@vger.kernel.org, linux-i2c@vger.kernel.org, linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng , kernel test robot Subject: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors() Date: Mon, 7 Jun 2021 23:39:13 +0800 Message-Id: <20210607153916.1021016-2-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210607153916.1021016-1-zhengdejin5@gmail.com> References: <20210607153916.1021016-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Introduce pcim_alloc_irq_vectors(), a device-managed version of pci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers. And use pci_free_irq_vectors() to replace some code in pcim_release(), they are equivalent, and no functional change. It is more explicit that pcim_alloc_irq_vectors() is a device-managed function. When CONFIG_PCI=n, there is no stub for pci_is_managed(), but pcim_alloc_irq_vectors() will use it, so add one like other similar stubs. Otherwise there can be build errors, as here by kernel test robot reported: include/linux/pci.h: In function 'pcim_alloc_irq_vectors': >> include/linux/pci.h:1847:7: error: implicit declaration of function 'pci_is_managed' [-Werror=implicit-function-declaration] 1847 | if (!pci_is_managed(dev)) | ^~~~~~~~~~~~~~ Reported-by: kernel test robot Suggested-by: Andy Shevchenko Reviewed-by: Robert Richter Reviewed-by: Andy Shevchenko Acked-by: Bjorn Helgaas Signed-off-by: Dejin Zheng --- v6 -> v7: - rebase to PCI next branch - add a stub for pci_is_managed() when disable PCI for fix build error in sparc architecture. v5 -> v6: - rebase to 5.13-rc4 v4 -> v5: - Remove the check of enable device in pcim_alloc_irq_vectors() and make it as a static line function. v3 -> v4: - No change v2 -> v3: - Add some commit comments for replace some codes in pcim_release() by pci_free_irq_vectors(). v1 -> v2: - Use pci_free_irq_vectors() to replace some code in pcim_release(). - Modify some commit messages. drivers/pci/pci.c | 5 +---- include/linux/pci.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 452351025a09..e3b3fc59bd35 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res) struct pci_devres *this = res; int i; - if (dev->msi_enabled) - pci_disable_msi(dev); - if (dev->msix_enabled) - pci_disable_msix(dev); + pci_free_irq_vectors(dev); for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) if (this->region_mask & (1 << i)) diff --git a/include/linux/pci.h b/include/linux/pci.h index c20211e59a57..5783262c4643 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1730,6 +1730,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class, static inline void pci_set_master(struct pci_dev *dev) { } static inline int pci_enable_device(struct pci_dev *dev) { return -EIO; } +static inline int pci_is_managed(struct pci_dev *pdev) { return 0; } static inline void pci_disable_device(struct pci_dev *dev) { } static inline int pcim_enable_device(struct pci_dev *pdev) { return -EIO; } static inline int pci_assign_resource(struct pci_dev *dev, int i) @@ -1825,6 +1826,30 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, NULL); } +/** + * pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() + * @dev: PCI device to operate on + * @min_vecs: minimum number of vectors required (must be >= 1) + * @max_vecs: maximum (desired) number of vectors + * @flags: flags or quirks for the allocation + * + * Return the number of vectors allocated, (which might be smaller than + * @max_vecs) if successful, or a negative error code on error. If less + * than @min_vecs interrupt vectors are available for @dev the function + * will fail with -ENOSPC. + * + * It depends on calling pcim_enable_device() to make IRQ resources + * manageable. + */ +static inline int +pcim_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, + unsigned int max_vecs, unsigned int flags) +{ + if (!pci_is_managed(dev)) + return -EINVAL; + return pci_alloc_irq_vectors(dev, min_vecs, max_vecs, flags); +} + /* Include architecture-dependent settings and functions */ #include From patchwork Mon Jun 7 15:39:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 12303923 X-Patchwork-Delegate: bhelgaas@google.com 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 009D7C4743F for ; Mon, 7 Jun 2021 15:39:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E27D66102A for ; Mon, 7 Jun 2021 15:39:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230353AbhFGPlg (ORCPT ); Mon, 7 Jun 2021 11:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230231AbhFGPlf (ORCPT ); Mon, 7 Jun 2021 11:41:35 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCB06C061766; Mon, 7 Jun 2021 08:39:29 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id k22-20020a17090aef16b0290163512accedso150579pjz.0; Mon, 07 Jun 2021 08:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UIGdwCdkkWqLBRFSq2kkHALz5xEueOvwNTx/1skELWk=; b=Gh1Lqwrk85otYcFMpOHUUFANaF7P9the3majQO82pmQM3swDLWsO2uYcx5v/p8gJBj G8dSS/sYFc3clqgzVIOM2gsjcUTdzpYgOOuvNq2EJPUK0pB8YsTInAkGdA1dGBEhYhhq 3DXHDNmEj53DlIxernqM6PLQaljlYB1DBrjOoi+LT70hdm5Du0A0bG24YY6OzlEH7QcE e5hD2OtfLUzMweGtCxQrAJgsbQzZkWcH5SCs/fDTTB0l6oXdvHZaExjDVTK6PjGtunBv kF0xx6DeGTcZ5MlQmoW79oy7Twf0TPME1UjIi2sr0BJtOFl2VzEVVdxTkuy4gVgezsih PTsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UIGdwCdkkWqLBRFSq2kkHALz5xEueOvwNTx/1skELWk=; b=tokEupuq0D1C7+RItdcDLbq4ue2t3X6g+yBXvhkbU6KsuT8dLpD2thsaLd9rwP5TEZ 39d7grQt2N7IIfbG178baQGc1PXRbKmrK6JkcnmdXIbgcOQk2cIVVRnybdnc6pBfKouD 9iR5UmtskTwSBo5KCG1Zq7pDD6QnWpDpqaS9tRdAnRfyUOjlxtTaGe3Gj+gLlrWeX2Zy ru5jTt7Vrt3ERAA2D1/HHCQOrNVUD5THalol+U/w4Qtx73WXmiUcF/6OjPE+lHhmCBRS qLGhITFyA6UJRPtBiOiNiWt/TEBdeBG6vtfsbM7i5SJ//MH94QAJYWXNJd4b0V222b+C RH4g== X-Gm-Message-State: AOAM531yVS9RFaljyagXDKK6yDpASfdbmFiMPvrA5Y3uFPi6x1Ao9C+z 0JxsazU2+SiDzep1MV1R7CqiZAEl2xT6aLr1 X-Google-Smtp-Source: ABdhPJyoitZZCcuUdMntNQbBh3XXRqe7w4Fg+NetaZ4Scj9yIyG3xtFmlBtRV4b7J3HwvAi8FkAVoQ== X-Received: by 2002:a17:90b:901:: with SMTP id bo1mr17611331pjb.0.1623080369472; Mon, 07 Jun 2021 08:39:29 -0700 (PDT) Received: from localhost (185.212.56.112.16clouds.com. [185.212.56.112]) by smtp.gmail.com with ESMTPSA id x13sm14211295pja.3.2021.06.07.08.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 08:39:29 -0700 (PDT) From: Dejin Zheng To: helgaas@kernel.org, corbet@lwn.net, jarkko.nikula@linux.intel.com, andriy.shevchenko@linux.intel.com, mika.westerberg@linux.intel.com, rric@kernel.org, bhelgaas@google.com, wsa@kernel.org, Sanket.Goswami@amd.com, linux-doc@vger.kernel.org, linux-i2c@vger.kernel.org, linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH v7 2/4] Documentation: devres: Add pcim_alloc_irq_vectors() Date: Mon, 7 Jun 2021 23:39:14 +0800 Message-Id: <20210607153916.1021016-3-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210607153916.1021016-1-zhengdejin5@gmail.com> References: <20210607153916.1021016-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add pcim_alloc_irq_vectors(), a device-managed version of pci_alloc_irq_vectors(). introducing this function can simplify the error handling path in many drivers. Reviewed-by: Robert Richter Signed-off-by: Dejin Zheng Reviewed-by: Andy Shevchenko --- v6 -> v7: - rebase to PCI next branch v5 -> v6: - rebase to 5.13-rc4 v4 -> v5: - No change v3 -> v4: - No change v2 -> v3: - No change v1 -> v2: - Modify some commit messages. Documentation/driver-api/driver-model/devres.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index e0814d214048..fad7d26ccf35 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -382,6 +382,7 @@ PCI devm_pci_alloc_host_bridge() : managed PCI host bridge allocation devm_pci_remap_cfgspace() : ioremap PCI configuration space devm_pci_remap_cfg_resource() : ioremap PCI configuration space resource + pcim_alloc_irq_vectors() : managed IRQ vectors allocation pcim_enable_device() : after success, all PCI ops become managed pcim_pin_device() : keep PCI device enabled after release From patchwork Mon Jun 7 15:39:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 12303925 X-Patchwork-Delegate: bhelgaas@google.com 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 6ED87C48BCD for ; Mon, 7 Jun 2021 15:40:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5007A611AD for ; Mon, 7 Jun 2021 15:40:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231321AbhFGPm2 (ORCPT ); Mon, 7 Jun 2021 11:42:28 -0400 Received: from mail-pg1-f180.google.com ([209.85.215.180]:43816 "EHLO mail-pg1-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231312AbhFGPmY (ORCPT ); Mon, 7 Jun 2021 11:42:24 -0400 Received: by mail-pg1-f180.google.com with SMTP id e22so14073276pgv.10; Mon, 07 Jun 2021 08:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z5R1tQR+LCn1Yz4++ikaigGAZJL9L+hwgmejnmiO7PY=; b=alkJhnxL5hO4h5FBS9dCnaIPR54BPfnhzzLzIVfRDNCMwVMx78kQMtxEy4hd4OjaaX Pkmdme/7oY5wytyjwc8FGhwVNV+cQX1FZIqjBV0N/c/2VYJvzG2ac98Dwr0I7Nx0+rEv qK8lhLi/h1gO20wO2Dtr0+Z9JzhUhnreZUdzoXi+lYizuKpmgPlNQJZZYGlDLuHZWnBM ezvD12IDtdT4BaMD1/ZYpSooRMBVDFSsrAFZ6+b0HQWycDDWbR1hled2tNAnVq/+FCgN xdEAj7vCEOTfDrriwV2m+lIqs5V+P6LCH79Y74KQx+QccjflAVbKtCnIUkNP11wSznce /xhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z5R1tQR+LCn1Yz4++ikaigGAZJL9L+hwgmejnmiO7PY=; b=WEYFPr8rAHtR8IAEvVExeWEQEy2cZaTf7MrhqK+V0p+KJxHYwGlFKjhO1SJIwGPlIO SxC0XNfrm5EoJ8Whn9kDWFRifTNbfQ/WDKMy/b70jxIoUj8FORRHFeTb8lIp/4tuLiqT QfIEqWC3JqsvOScsfxj1bVOSBYcySbW8TomkvpZ3dqY1YHFAWAGcrn8JLyk9zxNF/urs z3CSzBygfs5o3sSDKMyU9TcPUYQS3omvlgE9ZEh525khoDEhppQIsj2BJLRmoVpOeCra dR2J7OAUXLkDoVR9FuXT/JNbB+gsymKM9xl6l2pqc/DJY3F/dpfzXRxsTkIFIW5Haa3W HRzQ== X-Gm-Message-State: AOAM530HtHhcHS34THpYqq8NYICU615hsg4KMT135LzBY4lzmhst+Q35 N2g6zH98OQRzDW0wzFx9gGM= X-Google-Smtp-Source: ABdhPJyuLpvzy90YwTzlJ2Sv2qCtEINPz1Dpk1pb0oEfLEomcaAl6+CvAu+J7QnwjSM0fx2CFU2n4Q== X-Received: by 2002:aa7:92c6:0:b029:2f1:3fbb:3171 with SMTP id k6-20020aa792c60000b02902f13fbb3171mr2968517pfa.0.1623080373547; Mon, 07 Jun 2021 08:39:33 -0700 (PDT) Received: from localhost (185.212.56.112.16clouds.com. [185.212.56.112]) by smtp.gmail.com with ESMTPSA id y138sm8955071pfc.11.2021.06.07.08.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 08:39:33 -0700 (PDT) From: Dejin Zheng To: helgaas@kernel.org, corbet@lwn.net, jarkko.nikula@linux.intel.com, andriy.shevchenko@linux.intel.com, mika.westerberg@linux.intel.com, rric@kernel.org, bhelgaas@google.com, wsa@kernel.org, Sanket.Goswami@amd.com, linux-doc@vger.kernel.org, linux-i2c@vger.kernel.org, linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH v7 3/4] i2c: designware: Use pcim_alloc_irq_vectors() to allocate IRQ vectors Date: Mon, 7 Jun 2021 23:39:15 +0800 Message-Id: <20210607153916.1021016-4-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210607153916.1021016-1-zhengdejin5@gmail.com> References: <20210607153916.1021016-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The pcim_alloc_irq_vectors() function, an explicit device-managed version of pci_alloc_irq_vectors(). If pcim_enable_device() has been called before, then pci_alloc_irq_vectors() is actually a device-managed function. It is used here as a device-managed function, So replace it with pcim_alloc_irq_vectors(). At the same time, Remove the pci_free_irq_vectors() function to simplify the error handling path. the freeing resources will take automatically when device is gone. Reviewed-by: Robert Richter Acked-by: Andy Shevchenko Acked-by: Jarkko Nikula Signed-off-by: Dejin Zheng Acked-by: Wolfram Sang # for I2C --- v6 -> v7: - rebase to PCI next branch v5 -> v6: - rebase to 5.13-rc4 v4 -> v5: - Modify the subject name. v3 -> v4: - add some commit comments. v2 -> v3: - simplify the error handling path. v1 -> v2: - Modify some commit messages. drivers/i2c/busses/i2c-designware-pcidrv.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c index 0f409a4c2da0..2b1ef0934445 100644 --- a/drivers/i2c/busses/i2c-designware-pcidrv.c +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c @@ -268,7 +268,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, if (!dev) return -ENOMEM; - r = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES); + r = pcim_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES); if (r < 0) return r; @@ -283,10 +283,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, if (controller->setup) { r = controller->setup(pdev, controller); - if (r) { - pci_free_irq_vectors(pdev); + if (r) return r; - } } i2c_dw_adjust_bus_speed(dev); @@ -295,10 +293,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, i2c_dw_acpi_configure(&pdev->dev); r = i2c_dw_validate_speed(dev); - if (r) { - pci_free_irq_vectors(pdev); + if (r) return r; - } i2c_dw_configure(dev); @@ -318,10 +314,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, adap->nr = controller->bus_num; r = i2c_dw_probe(dev); - if (r) { - pci_free_irq_vectors(pdev); + if (r) return r; - } if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) { r = navi_amd_register_client(dev); @@ -349,7 +343,6 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev) i2c_del_adapter(&dev->adapter); devm_free_irq(&pdev->dev, dev->irq, dev); - pci_free_irq_vectors(pdev); } /* work with hotplug and coldplug */ From patchwork Mon Jun 7 15:39:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 12303927 X-Patchwork-Delegate: bhelgaas@google.com 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 A5349C4743F for ; Mon, 7 Jun 2021 15:40:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8746361185 for ; Mon, 7 Jun 2021 15:40:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231459AbhFGPme (ORCPT ); Mon, 7 Jun 2021 11:42:34 -0400 Received: from mail-pj1-f41.google.com ([209.85.216.41]:53780 "EHLO mail-pj1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231384AbhFGPm3 (ORCPT ); Mon, 7 Jun 2021 11:42:29 -0400 Received: by mail-pj1-f41.google.com with SMTP id ei4so10093418pjb.3; Mon, 07 Jun 2021 08:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NCCUVu48/YxKe+76n8oOpi5HhiU1MccRKkRryIWRGrY=; b=OS4EcGoksInG36ZFqUT7ibl0i7seCqXy34Y1Yaqw4UU6mQnLyBhyO4oxgvwaV757eO 3OOVg7Etfn6Ovn5a/wyGap4jFt3oQA3YF2kBfNhNi6BzLu77XttKckkx2ww85i1apfhQ ekuhbXt/9/gRFTG9/z7PmOPeVdjAZMSK9sfxC5/zv2NK7nIIQGGeorVw0T+W8sM1Vazf PSiDe0Oc9zru+52WAzgE+xrwkqxcwvcCcvGYkyCeO7uLpD0B3/BWirwS1VN2DF/puR0T 7s4mIxBw+X+t9IRUAA9Lbdef5ch4WVMffx7hQSSIycfuyA3cG85MH9ZIPY9aGRqGsvUh Z5EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NCCUVu48/YxKe+76n8oOpi5HhiU1MccRKkRryIWRGrY=; b=gtzmYWu6qeFSxqEELrP3O2AD8vaGH+F5A5etAnejBILMvD4he2mTHpnCPRy/I+ETMI SkNWFWPU2N9u5X97dYKW0UKFpqqXYeHNCtzzxkJF7NC8AKLJcvKr5AB8LbGKcMdP9Pci ijI1OtRPii7Xrrioce/heCZBRQUfI/hUNm0lqG0aMHdnTm1ZzHqA51Tdx/SfsJXEciMm 5V4ylHMBJnzx8rnzp7X45xPBhVvTe9qHq7GXaZXmxA64GjvRaaReskvjNO36OqnCuPQ4 cVAvsBBvIff19UHdVi3n9gVhiFil5sY4rJDiF2IQf0hvJHA9oBMb3UkoG1P4GLvx9NRs qzYA== X-Gm-Message-State: AOAM530Qdqlcl3LmnW/sWCoQIK9pGcJl2H4XIzRbyoVkV4vI+vhZ4glA PqEFN7LVl/FGCrMfdpzAQlBLkAa+wKbrN3j/ X-Google-Smtp-Source: ABdhPJwMNKP15oGyesPtOeAnFeRGAZFrCrotHvaDZsVsbwycnY7O+X2WS5POBmPAdxJocubb2Bu3KQ== X-Received: by 2002:a17:90a:db4e:: with SMTP id u14mr20775908pjx.43.1623080377825; Mon, 07 Jun 2021 08:39:37 -0700 (PDT) Received: from localhost (185.212.56.112.16clouds.com. [185.212.56.112]) by smtp.gmail.com with ESMTPSA id j3sm8696259pfe.98.2021.06.07.08.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 08:39:37 -0700 (PDT) From: Dejin Zheng To: helgaas@kernel.org, corbet@lwn.net, jarkko.nikula@linux.intel.com, andriy.shevchenko@linux.intel.com, mika.westerberg@linux.intel.com, rric@kernel.org, bhelgaas@google.com, wsa@kernel.org, Sanket.Goswami@amd.com, linux-doc@vger.kernel.org, linux-i2c@vger.kernel.org, linux-pci@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH v7 4/4] i2c: thunderx: Use pcim_alloc_irq_vectors() to allocate IRQ vectors Date: Mon, 7 Jun 2021 23:39:16 +0800 Message-Id: <20210607153916.1021016-5-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210607153916.1021016-1-zhengdejin5@gmail.com> References: <20210607153916.1021016-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The pcim_alloc_irq_vectors() function, an explicit device-managed version of pci_alloc_irq_vectors(). If pcim_enable_device() has been called before, then pci_alloc_irq_vectors() is actually a device-managed function. It is used here as a device-managed function, So replace it with pcim_alloc_irq_vectors(). Acked-by: Robert Richter Signed-off-by: Dejin Zheng Acked-by: Wolfram Sang # for I2C --- v6 -> v7: - rebase to PCI next branch v5 -> v6: - rebase to 5.13-rc4 v4 -> v5: - Modify the subject name. v3 -> v4: - No change. v2 -> v3: - No change. v1 -> v2: - Modify some commit messages. drivers/i2c/busses/i2c-thunderx-pcidrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c index 12c90aa0900e..63354e9fb726 100644 --- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c +++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c @@ -192,7 +192,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, i2c->hlc_int_enable = thunder_i2c_hlc_int_enable; i2c->hlc_int_disable = thunder_i2c_hlc_int_disable; - ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX); + ret = pcim_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX); if (ret < 0) goto error;