From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CDDC35899 for ; Wed, 18 Oct 2023 16:43:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MNN5hNPI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41024C433C8; Wed, 18 Oct 2023 16:43:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697647432; bh=d67uV+BllceyhKdsOiV7ZjO5K/tS29uNGEyZpm++1DA=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=MNN5hNPIwR4Q8y059KhxJqtmdzZ1xk9TOBsB3MLl05THByS1iIQpDTHlvm4H6MjWH wtSrVuPF0m8KA92Hudi+QeW4IXX/LSQ53sG0pnQbs/CnXFTNb85DBNxTRJhEZJMwIv rriT3Zs5zdfq1rLie3kt5ZiLil6rCti0mpjRWAqkIHCWqtbOjVxpnjWK8TIwcp/EBU ObjHNgrxB0mQxKgM9xdqHf8YlNxEzNxyEvixFtNdbOeS/Cu+SrpTBNhW/xBsn75Url 8o2w/gn9EwHWoZhCEiuu61QjaQ0lB32PLW/lVwg02uvkt0hALOLUKugr5yER4dhU0e oTmX6ZzduguAA== Date: Wed, 18 Oct 2023 11:43:51 -0500 From: Bjorn Helgaas To: Reinette Chatre Cc: bhelgaas@google.com, nathan@kernel.org, ndesaulniers@google.com, trix@redhat.com, tglx@linutronix.de, kevin.tian@intel.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: Re: [PATCH] PCI/MSI: Provide stubs for IMS functions Message-ID: <20231018164351.GA1365452@bhelgaas> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <14ff656899a3757453f8584c1109d7a9b98fa258.1697564731.git.reinette.chatre@intel.com> On Tue, Oct 17, 2023 at 10:56:38AM -0700, Reinette Chatre wrote: > The IMS related functions (pci_create_ims_domain(), > pci_ims_alloc_irq(), and pci_ims_free_irq()) are not declared > when CONFIG_PCI_MSI is disabled. > > Provide definitions of these functions for use when callers > are compiled with CONFIG_PCI_MSI disabled. > > Fixes: 0194425af0c8 ("PCI/MSI: Provide IMS (Interrupt Message Store) support") > Fixes: c9e5bea27383 ("PCI/MSI: Provide pci_ims_alloc/free_irq()") > Signed-off-by: Reinette Chatre > Cc: stable@vger.kernel.org # v6.2+ Applied to pci/misc for v6.7, thanks! > --- > > This is a preparatory patch for the first caller of these > functions (VFIO) for which work is in progress: > https://lore.kernel.org/lkml/cover.1696609476.git.reinette.chatre@intel.com/ > > checkpatch.pl complains about the usage of ENOSYS but > it does appear to be the custom. > > include/linux/pci.h | 34 ++++++++++++++++++++++++++-------- > 1 file changed, 26 insertions(+), 8 deletions(-) > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 8c7c2c3c6c65..b56417276042 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1624,6 +1624,8 @@ struct msix_entry { > u16 entry; /* Driver uses to specify entry, OS writes */ > }; > > +struct msi_domain_template; > + > #ifdef CONFIG_PCI_MSI > int pci_msi_vec_count(struct pci_dev *dev); > void pci_disable_msi(struct pci_dev *dev); > @@ -1656,6 +1658,11 @@ void pci_msix_free_irq(struct pci_dev *pdev, struct msi_map map); > void pci_free_irq_vectors(struct pci_dev *dev); > int pci_irq_vector(struct pci_dev *dev, unsigned int nr); > const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec); > +bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template, > + unsigned int hwsize, void *data); > +struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie, > + const struct irq_affinity_desc *affdesc); > +void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map); > > #else > static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; } > @@ -1719,6 +1726,25 @@ static inline const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, > { > return cpu_possible_mask; > } > + > +static inline bool pci_create_ims_domain(struct pci_dev *pdev, > + const struct msi_domain_template *template, > + unsigned int hwsize, void *data) > +{ return false; } > + > +static inline struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, > + union msi_instance_cookie *icookie, > + const struct irq_affinity_desc *affdesc) > +{ > + struct msi_map map = { .index = -ENOSYS, }; > + > + return map; > +} > + > +static inline void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map) > +{ > +} > + > #endif > > /** > @@ -2616,14 +2642,6 @@ static inline bool pci_is_thunderbolt_attached(struct pci_dev *pdev) > void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type); > #endif > > -struct msi_domain_template; > - > -bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template, > - unsigned int hwsize, void *data); > -struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie, > - const struct irq_affinity_desc *affdesc); > -void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map); > - > #include > > #define pci_printk(level, pdev, fmt, arg...) \ > -- > 2.34.1 >