Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3389267pxj; Mon, 7 Jun 2021 09:24:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjvNu22tP0/EHO+NNUq8IUzMg2dHlkH6XnwY3e64U3t07Gn7NxG15vpWZJxBBrtlS63hC1 X-Received: by 2002:a17:906:c245:: with SMTP id bl5mr18189151ejb.394.1623083086918; Mon, 07 Jun 2021 09:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623083086; cv=none; d=google.com; s=arc-20160816; b=Bf8pd4S0o9MMqUF3f7qxV11kKY8SH9sIAm1qdTuvXLFUvQKWAS0KDVzTR4J4FWk/B8 iO9NscRbKuojwUQoCClVpSVBkb1qcAncnXZ42rjLkpovZubELCPgRaUxiRZn3WuSGuU2 mt1N9xqyHYyT6FCSXXnxp2zmH+sDh9o8r8leYTfQ3He4BrmaZOGO8YgQ/OGZe26xtkp8 in7KbpAIw2g7+kBB86BZ0DOl/xUQfwfTEHiUrjFpHuSkRQtuX7odunocxSVjeLoBZavE zRJ//iYnkJxW4FnnLIJzYj9mojzPdsA1VnpIfhG/w2ct7/WAisubFet7wFUaTs9206Z0 avlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:organization:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :ironport-sdr:ironport-sdr; bh=/n0G4RcQhn2SUzH0T52e5ef7+QNMRKUGXMv+E7MJYJk=; b=XVOiPIIzSQeQBG81asT0aYBKixdz/p/f+khp1YmWuPXbCjxxFBhrlq4/baPt26hxVl wmJ+HYK/6KVAuiHoYgop3tqqiFg/4K+JjFZdkGO1SIW3kQn2+TpRb0kX8e5rb662k7kX rd1YAIOSWRwtakVMNA1Bpo6pu1d7exiYdrJA5bOC5fudHSmcLWYIXoE45Pgk3tIPhoDw em3ThcF5FglY/QHEYKfZQWZlLx8vAFNNyi4x+NshLxhbr71ZjOs/3RnHalTk13fjy6r7 RpsCmwsQYtz8k7CKDTNuNI4vFmrvTcpnrVFo1VsD1ZPDCgaf6z+je70Wci8+9RMuIE3V i1UA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k9si14079875edv.565.2021.06.07.09.24.22; Mon, 07 Jun 2021 09:24:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232624AbhFGQVo (ORCPT + 99 others); Mon, 7 Jun 2021 12:21:44 -0400 Received: from mga02.intel.com ([134.134.136.20]:54783 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232854AbhFGQSm (ORCPT ); Mon, 7 Jun 2021 12:18:42 -0400 IronPort-SDR: 2w+2UHEFNX+hK7Tsj6O84T+0Rbu9b7HzkHWozpDYCzWXxpg4HzSpShY3VscSdV7bQ7FNVe7Gd/ 2sPaAGk7CKIg== X-IronPort-AV: E=McAfee;i="6200,9189,10008"; a="191762789" X-IronPort-AV: E=Sophos;i="5.83,255,1616482800"; d="scan'208";a="191762789" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2021 09:12:41 -0700 IronPort-SDR: hwTF/d0PSJzT8DaJop5ijgP34ZODvolJBQ1e/CpKvcxfagopM1M8baCGk4Ga6c3vhyxTnRv1fy 015MpZ9v1d+g== X-IronPort-AV: E=Sophos;i="5.83,255,1616482800"; d="scan'208";a="469137294" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2021 09:12:38 -0700 Received: from andy by smile with local (Exim 4.94) (envelope-from ) id 1lqHre-000Iba-Oq; Mon, 07 Jun 2021 19:12:34 +0300 Date: Mon, 7 Jun 2021 19:12:34 +0300 From: Andy Shevchenko To: Dejin Zheng Cc: helgaas@kernel.org, corbet@lwn.net, jarkko.nikula@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, linux-kernel@vger.kernel.org, kernel test robot Subject: Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors() Message-ID: References: <20210607153916.1021016-1-zhengdejin5@gmail.com> <20210607153916.1021016-2-zhengdejin5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210607153916.1021016-2-zhengdejin5@gmail.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 07, 2021 at 11:39:13PM +0800, Dejin Zheng wrote: > 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)) > | ^~~~~~~~~~~~~~ This is rather changelog related material. No need to pollute commit message with this. ... > Reported-by: kernel test robot It's new functionality. Why this tag is here? Use comments (similar location than changelog) to give a credit if you wish. > 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 > -- > 2.30.1 > -- With Best Regards, Andy Shevchenko